Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -1,5 +1,6 @@
package com.hz.his.dto.order;

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

import java.math.BigDecimal;
@@ -22,16 +23,39 @@
    private Integer refundNum;
    /** 实退金额 （客户填写）*/
    private BigDecimal refundMoney;
    /** 实退抵扣值(积分，前端根据填写的实退金额(抵扣金额)填写换算) */
    private BigDecimal refundDeductTotal;

    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /////用于系统返回参数计算
    /** 可退总金额*/
    private BigDecimal approveRefundTotal = BigDecimal.ZERO;

    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
    /** 需要作废的划扣记录*/
    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;

}