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

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -22,12 +22,19 @@
    /**是否划扣计算：0否1是*/
    private Integer isExecute;

    /** 抵扣类型 */
    private String deductionType;
    /** 抵扣退款总值(积分) */
    private BigDecimal refundDeductionTotal;

    /** 转换方式编码 （实际退款方式编码） */
    private String refundNumberNo;
    /** 转换方式名称 （实际退款方式编码）*/
    private String refundNumberName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal money;
    /** 转换实退抵扣值 （实际退款积分）*/
    private BigDecimal deductionTotal;

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

    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer 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 refundDeductionTotal) {
        this.payMethodNo = payMethodNo;
        this.payMethodName = payMethodName;
        this.payTotal = payTotal;
        this.isMoneyPay = isMoneyPay;
        this.isExecute = isExecute;
        this.deductionType = deductionType;
        this.refundDeductionTotal = refundDeductionTotal;
    }
}