From adb4bd142071155a207724ef8b15f0bb9d4b8e9f Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 25 十二月 2023 18:36:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 cf65bc1..ded4a22 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
@@ -24,6 +24,8 @@
private List<PayAmountDto> amount;
/**蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
private String operatorId;
+ /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭～锛岄��娆句娇鐢�) */
+ private String opRoleId;
/**鏀粯鐢ㄦ埛*/
private String payUserId;
@@ -42,7 +44,17 @@
private Integer couponCheckVersion = 0;
/**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
private List<String> userCouponIds;
+
+ /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
+ private String orderOCRImageUrl;
- /**ocr 澶т紬鐐硅瘎鍥剧墖鍦板潃*/
- private String ocrImageUrl;
+ /**绗笁鏂硅鍗曠紪鍙�*/
+ private String otherOrderNo;
+ /**绗笁鏂瑰厬鎹㈢爜*/
+ private String redemptionCode;
+
+ /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
--
Gitblit v1.8.0