Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-08-21 e4d3ecfa8d4e81e1b71df7cbfa0c18fcfbc3e82c

Merge branch 'master' into master-test

 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;
@@ -27,11 +28,13 @@
    /** 退款原因（用户） */
    private String refundReason;

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

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


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

}

 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
@@ -26,8 +28,10 @@
    /** 退款原因（用户） */
    private String refundReason;

    /////用于系统返回参数计算
    /** 可退总金额*/
    /** 需要作废的划扣记录*/
    private List<RefundDeductionCancelVo> refundDeductionCancelList;

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

}

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -33,4 +33,6 @@
    private Integer isNewUser;
    /**是否首天*/
    private Integer isBothOne;
    /**工作日*/
    private Integer workDayNum;
}

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

New file
@@ -0,0 +1,19 @@
package com.hz.his.vo.order.refund;

import lombok.Data;

/**
 * 退款-作废划扣
 * @author CJH
 */
@Data
public class RefundDeductionCancelVo {

    /**Y-划扣项目记录标识*/
    private String deductionProjectId;
    /**Y-划扣总记录标识*/
    private String deductionSingleId;

    /**划扣数量（系统传值使用）*/
    private Integer num;
}