From 17457a80779db37013ef004d2aa232c859838b8d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 17:25:03 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-颜值规划4.0
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 3610f04..b17c67c 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;
/**
@@ -13,6 +14,7 @@
*/
@Data
public class PayDto {
+
/**蹇呭～ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0*/
private Integer type;
/**蹇呭～ 璁㈠崟id*/
@@ -23,6 +25,8 @@
private List<PayAmountDto> amount;
/**蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
private String operatorId;
+ /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭～锛岄��娆句娇鐢�) */
+ private String opRoleId;
/**鏀粯鐢ㄦ埛*/
private String payUserId;
@@ -37,7 +41,33 @@
/**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/
private String cashierShopId;
-
+ /**浼樻儬鍒告牎楠岀増鏈紙榛樿0锛夌涓�鐗堜负0,闂ㄥ簵鍔╂墜涓婄嚎鐗堟湰涓�1*/
+ private Integer couponCheckVersion = 0;
/**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
private List<String> userCouponIds;
+
+ /**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;
+
}
--
Gitblit v1.8.0