Merge branch 'master-prod-new' into master-test

fwq

2024-05-17 2a28984276e51d5f6635f3ae62b982b30c442bfd

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

@@ -16,16 +16,28 @@
    private String cardItemInfoName;
    /**退款数量（抵扣次数）*/
    private Integer refundQuantity;
    /**是否最后的抵扣次数*/
    private boolean lastNum = false;

    //---用于系统返回参数计算
    /** 可退总金额*/
    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;

}