Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -3,6 +3,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author wzh
@@ -11,32 +12,57 @@
@Data
public class OrderPayMethodDto {

    /** 支付方式编码 */
    /** 可退支付方式编码 */
    private String payMethodNo;
    /** 支付方式名称 */
    /** 可退支付方式名称 */
    private String payMethodName;
    /** 支付金额 */
    /** 可退支付金额 */
    private BigDecimal payTotal;
    /**是否现金支付 0否1是*/
    private Integer isMoneyPay;
    /**是否划扣计算：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;

    /** 其他退款方式 */
    private List<OrderPayMethodDto> otherRefundMethodList;


    public OrderPayMethodDto() {
    }

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