From bc61bb4cfa52619a7364a14886ac9560c8f86e73 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 13 八月 2024 10:11:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-xlk-test
---
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 053da40..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
@@ -19,6 +20,8 @@
private String payMethodName;
/** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /** 鍙��鏀粯閲戦 -鎶垫墸閲戦*/
+ private BigDecimal payDeductionTotal;
/**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
private Integer isMoneyPay;
/**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
@@ -32,9 +35,12 @@
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