From 8b6a5d0c48cf6508f44723aa872f0b1b71e55da8 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期三, 11 十月 2023 16:43:01 +0800 Subject: [PATCH] 1.营销活动新增接口 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 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 34efcb5..d6eed8b 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,23 @@ */ @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; + + /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/ + private Integer cardPass = 0; + + /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */ + private List<OrderRiseDto> orderRiseList; + } -- Gitblit v1.8.0