From b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 24 五月 2024 16:33:49 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 30 ++++++++++++++----------------
1 files changed, 14 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..7dbb7a3 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
@@ -24,10 +24,8 @@
/** 鎶垫墸绫诲瀷 */
private String deductionType;
- /** 鎶垫墸閲戦 */
- private BigDecimal deductionMoney;
- /** 鍓╀綑鎶垫墸閲戦 */
- private BigDecimal surplusDeductionTotal;
+ /** 鎶垫墸閫�娆炬�诲��(绉垎) */
+ private BigDecimal refundDeductionTotal;
/** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
private String refundNumberNo;
@@ -35,6 +33,8 @@
private String refundNumberName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal money;
+ /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/
+ private BigDecimal deductionTotal;
/** 澶囨敞 */
private String remarks;
@@ -43,24 +43,22 @@
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