From 1a4b636cae41fdd15199beb1ea5df45b31de5b7d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:27:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 3f278db..81e9e45 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;
@@ -45,4 +48,28 @@
/**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
private String orderOCRImageUrl;
+
+ /**绗笁鏂硅鍗曠紪鍙�*/
+ 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;
+
}
--
Gitblit v1.8.0