Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-24 1b6aaa7d6c379ccdb0870a36f848c1f811577bf0

Merge branch 'master-fwq-积分抵扣现金' into master-test

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java

@@ -23,6 +23,9 @@
    private Integer refundNum;
    /** 实退金额 （客户填写）*/
    private BigDecimal refundMoney;
    /** 实退抵扣值(积分，前端根据填写的实退金额(抵扣金额)填写换算) */
    private BigDecimal refundDeductTotal;

    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
@@ -38,10 +41,21 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /** 可退总抵扣现金金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
    /** 可退总抵扣积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;



    /**分配可退金额*/
    private List<OrderPayMethodDto> refundPayMethodList;

    /** 平摊积分（用于系统返回参数计算）*/
    private BigDecimal averageIntegral = BigDecimal.ZERO;
    /** 平摊的抵扣现金（用于系统返回参数计算）*/
    private BigDecimal averageDeductAmount = BigDecimal.ZERO;
    /** 平摊的抵扣积分（用于系统返回参数计算）*/
    private BigDecimal averageDeductIntegral = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java

@@ -35,10 +35,20 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /** 可退总抵扣现金金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
    /** 可退总抵扣积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;


    /**分配可退金额*/
    private List<OrderPayMethodDto> refundPayMethodList;

    /** 平摊积分（用于系统返回参数计算）*/
    private BigDecimal averageIntegral = BigDecimal.ZERO;
    /** 平摊的抵扣现金（用于系统返回参数计算）*/
    private BigDecimal averageDeductAmount = BigDecimal.ZERO;
    /** 平摊的抵扣积分（用于系统返回参数计算）*/
    private BigDecimal averageDeductIntegral = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java

@@ -24,10 +24,8 @@

    /** 抵扣类型 */
    private String deductionType;
    /** 抵扣金额 */
    private BigDecimal deductionMoney;
    /** 剩余抵扣金额 */
    private BigDecimal surplusDeductionTotal;
    /** 抵扣退款总值(积分) */
    private BigDecimal refundDeductionTotal;

    /** 转换方式编码 （实际退款方式编码） */
    private String refundNumberNo;
@@ -35,6 +33,8 @@
    private String refundNumberName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal money;
    /** 转换实退抵扣值 （实际退款积分）*/
    private BigDecimal deductionTotal;

    /** 备注 */
    private String remarks;
@@ -43,24 +43,22 @@
    public OrderPayMethodDto() {
    }

    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
        this.payMethodNo = payMethodNo;
        this.payMethodName = payMethodName;
        this.payTotal = payTotal;
        this.isMoneyPay = isMoneyPay;
        this.isExecute = isExecute;
    }
//    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
//        this.payMethodNo = payMethodNo;
//        this.payMethodName = payMethodName;
//        this.payTotal = payTotal;
//        this.isMoneyPay = isMoneyPay;
//        this.isExecute = isExecute;
//    }

    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal, Integer isMoneyPay,
                             Integer isExecute, String deductionType, BigDecimal deductionMoney,
                             BigDecimal surplusDeductionTotal) {
    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal
            , Integer isMoneyPay, Integer isExecute, String deductionType, BigDecimal refundDeductionTotal) {
        this.payMethodNo = payMethodNo;
        this.payMethodName = payMethodName;
        this.payTotal = payTotal;
        this.isMoneyPay = isMoneyPay;
        this.isExecute = isExecute;
        this.deductionType = deductionType;
        this.deductionMoney = deductionMoney;
        this.surplusDeductionTotal = surplusDeductionTotal;
        this.refundDeductionTotal = refundDeductionTotal;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -48,6 +48,16 @@
    private BigDecimal refundTotal;
    /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundIntegral;

    /** 可退款被积分抵扣的现金数量,parameterVerification方法校验的时候赋值  */
    private BigDecimal totalDeductAmount;
    /** 可退款抵扣现金的积分数量,parameterVerification方法校验的时候赋值  */
    private BigDecimal totalDeductIntegral;
    /** 填写的退款被积分抵扣的现金数量,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundDeductAmount;
    /** 填写的退款抵扣现金的积分数量,parameterVerification方法校验的时候赋值  */
    private BigDecimal refundDeductIntegral;

    /** 可退款方式集合 */
    private List<OrderPayMethodDto> payMethodList;
    /** 可退款优惠券信息集合 */

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java

@@ -14,6 +14,8 @@

    //支付总金额  必填
    private BigDecimal paymentTotal;
    //支付抵扣金额  必填
    private BigDecimal paymentDeductionTotal;
    // 支付方式编号 必填
    private String paymentNumberNo;
    //支付方式名称 必填

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java

@@ -19,6 +19,8 @@
    private String payMethodName;
    /** 可退支付金额 */
    private BigDecimal payTotal;
    /** 可退支付金额 -抵扣金额*/
    private BigDecimal payDeductionTotal;
    /**是否现金支付 0否1是*/
    private Integer isMoneyPay;
    /**是否划扣计算：0否1是*/
@@ -32,6 +34,8 @@
    private String refundMethodName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal refundTotal;
    /** 转换实退金额 （实际退款金额-抵扣金额）*/
    private BigDecimal refundDeductionTotal;
    /**转换是否现金支付 0否1是*/
    private Integer isMoneyPayRefund;
    /**转换是否划扣计算：0否1是*/

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java

@@ -23,9 +23,17 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /** 可退 抵扣现金的积分*/
    private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
    /** 可退积分抵扣的现金*/
    private BigDecimal approveIntegralCash = BigDecimal.ZERO;
    /**分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
    /**分配抵扣现金的积分*/
    private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
    /**分配积分抵扣的现金*/
    private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java

@@ -24,10 +24,20 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /** 可退总抵扣现金的积分*/
    private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
    /** 可退总积分抵扣的现金*/
    private BigDecimal approveIntegralCash = BigDecimal.ZERO;


    /**分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;

    /**分配抵扣现金的积分*/
    private BigDecimal occupyIntegralDeduction = BigDecimal.ZERO;
    /**分配积分抵扣的金额*/
    private BigDecimal occupyIntegralCash = BigDecimal.ZERO;

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java

@@ -47,14 +47,28 @@
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-可退总积分*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-可退抵扣现金的积分*/
    private BigDecimal approveIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-可退积分抵扣的现金*/
    private BigDecimal approveIntegralCash = BigDecimal.ZERO;

    /**系统计算赋值-分配金额*/
    private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
    /**系统计算赋值-分配积分*/
    private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-分配抵扣现金的积分*/
    private BigDecimal occupyRefundIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-分配积分抵扣的现金*/
    private BigDecimal occupyRefundIntegralCash = BigDecimal.ZERO;

    /**系统计算赋值-退款金额*/
    private BigDecimal refundTotal = BigDecimal.ZERO;
    /**系统计算赋值-退款积分*/
    private BigDecimal refundIntegral = BigDecimal.ZERO;
    /**系统计算赋值-退款抵扣的现金的积分*/
    private BigDecimal refundIntegralDeduction = BigDecimal.ZERO;
    /**系统计算赋值-退款积分抵扣的现金*/
    private BigDecimal refundIntegralCash = BigDecimal.ZERO;

    /**操作类型-系统*/
    public static final String OP_TYPE_SYSTEM = "system";