From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 fc26797..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
@@ -11,18 +11,30 @@
@Data
public class OrderPayMethodDto {
- /** 鏀粯鏂瑰紡缂栫爜 */
+ /** 鍙��鏀粯鏂瑰紡缂栫爜 */
private String payMethodNo;
- /** 鏀粯鏂瑰紡鍚嶇О */
+ /** 鍙��鏀粯鏂瑰紡鍚嶇О */
private String payMethodName;
- /** 鏀粯閲戦 */
+ /** 鍙��鏀粯閲戦 */
private BigDecimal payTotal;
+ /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPay;
+ /**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecute;
+
+ /** 鎶垫墸绫诲瀷 */
+ private String deductionType;
+ /** 鎶垫墸閫�娆炬�诲��(绉垎) */
+ private BigDecimal refundDeductionTotal;
+
/** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
private String refundNumberNo;
/** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
private String refundNumberName;
/** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal money;
+ /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/
+ private BigDecimal deductionTotal;
/** 澶囨敞 */
private String remarks;
@@ -31,12 +43,22 @@
public OrderPayMethodDto() {
}
- public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal, String refundNumberNo, String refundNumberName, BigDecimal money) {
+// 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 refundDeductionTotal) {
this.payMethodNo = payMethodNo;
this.payMethodName = payMethodName;
this.payTotal = payTotal;
- this.refundNumberNo = refundNumberNo;
- this.refundNumberName = refundNumberName;
- this.money = money;
+ this.isMoneyPay = isMoneyPay;
+ this.isExecute = isExecute;
+ this.deductionType = deductionType;
+ this.refundDeductionTotal = refundDeductionTotal;
}
}
--
Gitblit v1.8.0