Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2024-04-23 b2d9fdab193e24d83dd5e59c22594a2b8e0dafbc

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

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

    /** 抵扣类型 */
    private String deductionType;
    /** 抵扣金额 */
    private BigDecimal deductionMoney;
    /** 剩余抵扣金额 */
    private BigDecimal surplusDeductionTotal;

    /** 转换方式编码 （实际退款方式编码） */
    private String refundNumberNo;
    /** 转换方式名称 （实际退款方式编码）*/
@@ -43,4 +50,17 @@
        this.isMoneyPay = isMoneyPay;
        this.isExecute = isExecute;
    }

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