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

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -11,22 +11,34 @@
@Data
public class RefundMethodVo {

    /** 可退支付方式标识 */
    private String payMethodId;
    /** 可退支付方式编码 */
    private String payMethodNo;
    /** 可退支付方式名称 */
    private String payMethodName;
    /** 可退支付金额 */
    private BigDecimal payTotal;
    /** 可退支付金额 -抵扣金额*/
    private BigDecimal payDeductionTotal;
    /**是否现金支付 0否1是*/
    private Integer isMoneyPay;
    /**是否划扣计算：0否1是*/
    private Integer isExecute;

    /** 转换方式标识 （实际退款方式标识）*/
    private String refundMethodId;
    /** 转换方式编码 （实际退款方式编码）*/
    private String refundNumberNo;
    private String refundMethodNo;
    /** 转换方式名称 （实际退款方式编码）*/
    private String refundNumberName;
    private String refundMethodName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal refundTotal;
    /** 转换实退金额 （实际退款金额-抵扣金额）*/
    private BigDecimal refundDeductionTotal;
    /**转换是否现金支付 0否1是*/
    private Integer isMoneyPayRefund;
    /**转换是否划扣计算：0否1是*/
    private Integer isExecuteRefund;

}