From 1b5fc79dd03377f95459878417514c1429336641 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 19 四月 2024 18:33:44 +0800
Subject: [PATCH] Merge branch 'fhx-prod-智能导诊' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 24 ++++++++++++++++++++----
1 files changed, 20 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 62000aa..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,9 +11,22 @@
@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;
+ /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundNumberName;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
private BigDecimal money;
/** 澶囨敞 */
@@ -23,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