From d2b04d07ed1f35b4a50bfbbf21217923a9a97068 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期四, 09 五月 2024 14:28:04 +0800 Subject: [PATCH] 字段增加 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 22 ++++++++++++++++------ 1 files changed, 16 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 9e8f49c..b5177f2 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 @@ -1,6 +1,7 @@ package com.hz.his.dto.order; import com.hz.his.dto.PageDto; +import com.hz.his.vo.order.DeliveryAddressVo; import lombok.Data; import java.util.List; @@ -14,16 +15,25 @@ */ @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; + /**鏀惰揣鍦板潃*/ + private DeliveryAddressVo deliveryAddress; + + /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/ + private Integer cardPass = 0; + + /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */ + private List<OrderRiseDto> orderRiseList; + } -- Gitblit v1.8.0