From 23f491fce092e67c093d7f8ed89aa6a0b1e940e0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 24 十一月 2023 11:15:34 +0800
Subject: [PATCH] tmk业绩汇总列表补充搜索条件

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java |   18 +++++++++++-------
 1 files changed, 11 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..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,12 +36,11 @@
     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.refundNumberNo = refundNumberNo;
-        this.refundNumberName = refundNumberName;
-        this.money = money;
+        this.isMoneyPay = isMoneyPay;
+        this.isExecute = isExecute;
     }
 }

--
Gitblit v1.8.0