Merge branch 'fhx-prod-智能导诊' into master-test

fhx

2024-04-19 1b5fc79dd03377f95459878417514c1429336641

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

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

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

import java.math.BigDecimal;
@@ -19,9 +19,9 @@
    private String type;
    /** 商品名称 */
    private String goodsName;
    /** 实退数 */
    /** 实退数（客户填写） */
    private Integer refundNum;
    /** 实退金额 */
    /** 实退金额 （客户填写）*/
    private BigDecimal refundMoney;
    /** 退款原因（员工） */
    private String remarks;
@@ -30,8 +30,18 @@

    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;

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

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

}