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/vo/order/refund/RefundMethodVo.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
index 9da7033..a855185 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author CJH
@@ -11,22 +12,35 @@
 @Data
 public class RefundMethodVo {
 
+    /** 鍙��鏀粯鏂瑰紡鏍囪瘑 */
+    private String payMethodId;
     /** 鍙��鏀粯鏂瑰紡缂栫爜 */
     private String payMethodNo;
     /** 鍙��鏀粯鏂瑰紡鍚嶇О */
     private String payMethodName;
     /** 鍙��鏀粯閲戦 */
     private BigDecimal payTotal;
+    /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+    private BigDecimal payDeductionTotal;
     /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
     private Integer isMoneyPay;
     /**鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/
     private Integer isExecute;
 
+    /** 杞崲鏂瑰紡鏍囪瘑 锛堝疄闄呴��娆炬柟寮忔爣璇嗭級*/
+    private String refundMethodId;
     /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
-    private String refundNumberNo;
+    private String refundMethodNo;
     /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
-    private String refundNumberName;
+    private String refundMethodName;
     /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
     private BigDecimal refundTotal;
-
+    /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰�-鎶垫墸閲戦锛�*/
+    private BigDecimal refundDeductionTotal;
+    /**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+    private Integer isMoneyPayRefund;
+    /**杞崲鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/
+    private Integer isExecuteRefund;
+    /** 鍏朵粬閫�娆炬柟寮� */
+    private List<RefundMethodVo> otherRefundMethodList;
 }

--
Gitblit v1.8.0