From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 1744607..3a33e74 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -24,6 +25,8 @@
     private List<PayAmountDto> amount;
     /**蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
     private String operatorId;
+    /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭~锛岄��娆句娇鐢�) */
+    private String opRoleId;
 
     /**鏀粯鐢ㄦ埛*/
     private String payUserId;
@@ -48,7 +51,27 @@
 
     /**绗笁鏂硅鍗曠紪鍙�*/
     private String otherOrderNo;
-
     /**绗笁鏂瑰厬鎹㈢爜*/
     private String redemptionCode;
+
+    /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+    private Integer directDeduction = 0;
+    /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+    private Integer cardPass = 0;
+
+    /**璧犻�佸埌璐︾敤鎴�-锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
+    private String giveIncreaseUserId;
+    /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
+    private BigDecimal giveIncrease;
+    /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
+    private String giveIncreaseId;
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
+    private String giveIncreaseTitle;
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
+    private String giveIncreaseInfo;
+    /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+    private List<String> canIntegralCashIdList;
+    /**闈炲繀濉� 鍏朵粬鎴浘鎴栬�呮枃浠朵笂浼� **/
+    private List<OrderOtherFilesDto> otherInfoFiles;
+
 }

--
Gitblit v1.8.0