From 09f35ed2fd2adb0ea412ac3bd707945bc35b6812 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 05 七月 2023 10:08:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 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 ef3061c..543ace4 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 @@ -13,19 +13,46 @@ */ @Data public class PayDto { - //蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0 + + /**蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0*/ private Integer type; - //蹇呭~ 璁㈠崟id + /**蹇呭~ 璁㈠崟id*/ private String orderId; - //蹇呭~ 搴斾粯鎬婚噾棰� + /**蹇呭~ 搴斾粯鎬婚噾棰�*/ private String total; - //蹇呭~ 缁撹处鍙傛暟 + /**蹇呭~ 缁撹处鍙傛暟*/ private List<PayAmountDto> amount; - //蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴� + /**蹇呭~ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/ private String operatorId; - //闈炲繀濉� 浼樻儬鍒竔d + /**鏀粯鐢ㄦ埛*/ + private String payUserId; + + /**闈炲繀濉� 浼樻儬鍒竔d*/ private String userCouponId; - //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑 + + /**闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑*/ private String hisOrderId; + /**闈炲繀濉� 鏀堕摱鍛榠d*/ + private String cashier; + + /**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/ + 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; } -- Gitblit v1.8.0