949cfe8208afba15b5cb25ba8ca2691766f7d1dc..c1107fe385312f9a7b1d9d84c06aaf54e01440fa
2024-05-14 cmg
Merge branch 'master-prod-new' into master-stander
c1107f 对比 | 目录
2024-04-24 fwq
积分抵扣现金退款-字段
2b5f03 对比 | 目录
2个文件已修改
6 ■■■■■ 已修改文件
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -41,6 +41,8 @@
    private BigDecimal refundIncrement;
    /**必填 退款总积分 */
    private BigDecimal refundIntegral;
    /**必填 退款总抵扣积分 */
    private BigDecimal refundIntegralDeduction;
    ////操作人信息
    /**必填 操作人类型 */
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
@@ -17,6 +17,8 @@
    private String thirdPartyNo;
    /***已退款总金额***/
    private BigDecimal refundTotal = BigDecimal.ZERO;
    /***已退款总抵扣金额***/
    private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
    /**********退款类型************/
    /**退款类型类型-微信*/
@@ -31,5 +33,7 @@
    public static final int REFUND_TYPE_INCREMENT = 6;
    /**退款类型类型--his的退款方式(所有方式代表)*/
    public static final int REFUND_TYPE_HIS = 7;
    /**退款类型类型--抵扣积分*/
    public static final int REFUND_TYPE_INTEGRAL_CASH = 8;
}