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 |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 6057910..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,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,11 @@
 
     /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
     private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+    /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/
+    private List<RefundDeductionCancelVo> refundDeductionCancelList;
 
-    /**鍒嗛厤鐨勯��娆炬柟寮忛噾棰�-鍐呴儴浼犲弬浣跨敤锛屾帴鍙f殏鏃舵棤鐢�*/
-    private List<RefundPaymentMethodVo> distributionPayList;
+
+    /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/
+    private BigDecimal approveRefundTotal = BigDecimal.ZERO;
 
 }

--
Gitblit v1.8.0