From 223fa13a364a6b8d86df4bba54563cefe09fedde Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期五, 18 八月 2023 19:22:59 +0800 Subject: [PATCH] 退款-自动作废划扣 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 11 +++++++---- phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java | 19 +++++++++++++++++++ phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 8 ++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java index d1ffe6b..8c63637 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java +++ b/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; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java index bb27487..db2ccce 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java +++ b/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; } diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java new file mode 100644 index 0000000..387815e --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundDeductionCancelVo.java @@ -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; +} -- Gitblit v1.8.0