From a458dab7990cf8f9d9f834a19db4f2d8b549b467 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 14:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 b9f6f90..76c3f2c 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,16 +11,56 @@
@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 deductionMoney;
+ /** 鍓╀綑鎶垫墸閲戦 */
+ private BigDecimal surplusDeductionTotal;
+
+ /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */
+ private String refundNumberNo;
+ /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundNumberName;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal money;
+
+ /** 澶囨敞 */
+ private String remarks;
+
public OrderPayMethodDto() {
}
- public OrderPayMethodDto(String payMethodNo, BigDecimal money) {
+ public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
this.payMethodNo = payMethodNo;
- this.money = money;
+ 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) {
+ this.payMethodNo = payMethodNo;
+ this.payMethodName = payMethodName;
+ this.payTotal = payTotal;
+ this.isMoneyPay = isMoneyPay;
+ this.isExecute = isExecute;
+ this.deductionType = deductionType;
+ this.deductionMoney = deductionMoney;
+ this.surplusDeductionTotal = surplusDeductionTotal;
}
}
--
Gitblit v1.8.0