Merge branch 'master' into master-prod-new

chenjiahe

2023-11-20 b249df80d95dd998ee93bcce2a6307b023f8cd0c

 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
@@ -15,10 +17,26 @@
    private String orderItemSonId;
    /** 子订单类型 */
    private String type;
    /** 商品名称 */
    private String goodsName;
    /** 实退数 */
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    /** 退款原因（员工） */
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

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

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

    /** 平摊积分（用于系统返回参数计算）*/
    private BigDecimal averageIntegral = BigDecimal.ZERO;

}