From 73a2cf061124327ac7977c006c144fe2da6b5360 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期四, 19 十月 2023 14:36:45 +0800 Subject: [PATCH] 1.新增接口 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java index b8a3c95..802a33c 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java @@ -3,6 +3,7 @@ import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * 璁㈠崟淇℃伅 @@ -16,7 +17,7 @@ /** 璁㈠崟缂栧彿锛屼互SO锛夊紑澶�, SOyyyyMMdd0000000 */ private String orderNo; - /** 鍟嗗搧绫诲瀷(OrderItemConstants) */ + /** 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭, 蹇呭~*/ private String type; /** 椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜 */ @@ -51,24 +52,27 @@ /** 椤圭洰/鍟嗗搧鐤楃▼鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */ private Integer single; - /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) */ + /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100*/ private BigDecimal discount; /** 鎬绘鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */ private Integer usedTotal; - /** 璐拱鏁伴噺 */ + /** 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/ private Integer buyNum; /** 瀛愰」璁㈠崟澶囨敞 */ private String remarks; - /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 */ + /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭~*/ private String commonId; /** 鎵ц鏉$洰ID */ private String performId; /** 璁㈠崟id锛圤rdersTotal锛� */ private String orderId; + + /** 鍗″寘鏍囪瘑锛圲serCard锛� */ + private String userCardId; /** 杞叆闂ㄥ簵id */ private String transferIntoShopId; @@ -83,9 +87,15 @@ private Integer isTurn; /** 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,crm榛樿crm) */ private String platformType=TYPE_PLATFORM_CRM; - /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id */ + /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭~*/ private String platformTypeId; + /** 鍗″寘鏍囪瘑 */ + private List<CardItemInfoDto> cardItemInfoIds; + + /** 绗笁鏂筰tem鏍囪瘑 */ + private String commonItemId; + /**骞冲彴绫诲瀷-CRM*/ -- Gitblit v1.8.0