From 93e2629252f8ccaf94fe571a1496acfb3087a058 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 03 四月 2023 19:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 820864b..a03f7ad 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,12 +11,17 @@
@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 refundNumberNo;
/** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
@@ -31,8 +36,11 @@
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;
}
}
--
Gitblit v1.8.0