From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index 76c3f2c..c4a3f06 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author wzh
@@ -24,10 +25,8 @@
 
     /** 鎶垫墸绫诲瀷 */
     private String deductionType;
-    /** 鎶垫墸閲戦 */
-    private BigDecimal deductionMoney;
-    /** 鍓╀綑鎶垫墸閲戦 */
-    private BigDecimal surplusDeductionTotal;
+    /** 鎶垫墸閫�娆炬�诲��(绉垎) */
+    private BigDecimal refundDeductionTotal;
 
     /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
     private String refundNumberNo;
@@ -35,32 +34,35 @@
     private String refundNumberName;
     /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
     private BigDecimal money;
+    /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/
+    private BigDecimal deductionTotal;
 
     /** 澶囨敞 */
     private String remarks;
+
+    /** 鍏朵粬閫�娆炬柟寮� */
+    private List<OrderPayMethodDto> otherRefundMethodList;
 
 
     public OrderPayMethodDto() {
     }
 
-    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
-        this.payMethodNo = payMethodNo;
-        this.payMethodName = payMethodName;
-        this.payTotal = payTotal;
-        this.isMoneyPay = isMoneyPay;
-        this.isExecute = isExecute;
-    }
+//    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
+//        this.payMethodNo = payMethodNo;
+//        this.payMethodName = payMethodName;
+//        this.payTotal = payTotal;
+//        this.isMoneyPay = isMoneyPay;
+//        this.isExecute = isExecute;
+//    }
 
-    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal, Integer isMoneyPay,
-                             Integer isExecute, String deductionType, BigDecimal deductionMoney,
-                             BigDecimal surplusDeductionTotal) {
+    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal
+            , Integer isMoneyPay, Integer isExecute, String deductionType, BigDecimal refundDeductionTotal) {
         this.payMethodNo = payMethodNo;
         this.payMethodName = payMethodName;
         this.payTotal = payTotal;
         this.isMoneyPay = isMoneyPay;
         this.isExecute = isExecute;
         this.deductionType = deductionType;
-        this.deductionMoney = deductionMoney;
-        this.surplusDeductionTotal = surplusDeductionTotal;
+        this.refundDeductionTotal = refundDeductionTotal;
     }
 }

--
Gitblit v1.8.0