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

fwq

2024-07-31 5fa87c35ad1c15b990d08e36a6c21471a4ab0c72

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

@@ -1,8 +1,10 @@
package com.hz.his.dto.order;

import com.hz.his.vo.order.refund.RefundDeductionCancelVo;
import lombok.Data;

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

/**
 * @Author
@@ -25,4 +27,28 @@
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;

    /** 可退总金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
    /** 可退总积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
    /** 可退总抵扣现金金额（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO;
    /** 可退总抵扣积分（用于系统返回参数计算）*/
    private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO;


    /**分配可退金额*/
    private List<OrderPayMethodDto> refundPayMethodList;

    /** 平摊积分（用于系统返回参数计算）*/
    private BigDecimal averageIntegral = BigDecimal.ZERO;
    /** 平摊的抵扣现金（用于系统返回参数计算）*/
    private BigDecimal averageDeductAmount = BigDecimal.ZERO;
    /** 平摊的抵扣积分（用于系统返回参数计算）*/
    private BigDecimal averageDeductIntegral = BigDecimal.ZERO;

}