From 562a1a393bd3e57aa6c959549dd3553a7e46edac Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期四, 09 二月 2023 14:48:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 12 ++++++------ phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 25 +++++++++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java index 9e8f49c..bc5dfb3 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java @@ -14,16 +14,16 @@ */ @Data public class OrderPHisDto extends PageDto { - //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉� + /**0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�*/ private String type; - //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~ + /**鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~*/ private String operatorId; - //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~ + /**鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~*/ private String shopId; - //鎬昏鍗曚俊鎭紝蹇呭~ + /**鎬昏鍗曚俊鎭紝蹇呭~*/ private OrdersPHisTotalDto orderTotal; - //涓�绾у瓙璁㈠崟锛屽繀濉� + /**涓�绾у瓙璁㈠崟锛屽繀濉�*/ private List<OrderItemPHisDto> orderItem; - //寮�鍙戜汉闆嗗悎 闈炲繀濉� + /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/ private List<OrderDeveloperDto> orderDeveloper; } 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 37efc53..3610f04 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,26 +13,31 @@ */ @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 + /**闈炲繀濉� 鏀堕摱鍛榠d*/ private String cashier; - //闈炲繀濉� 鏀堕摱鍛橀棬搴� + + /**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/ private String cashierShopId; - //闈炲繀濉� 浼樻儬鍒竔d闆嗗悎 + /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/ private List<String> userCouponIds; } -- Gitblit v1.8.0