From e1990fe2cb0db1db3df9d000d4a6eacfbd2b1c57 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 10 五月 2024 17:34:16 +0800 Subject: [PATCH] 1.修改订单dto --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java index ae6779a..71f9bdb 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java @@ -24,6 +24,10 @@ private BigDecimal totalPoints; /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/ private BigDecimal discount; + /**鎶垫墸鐜伴噾閲戦*/ + private BigDecimal cash = BigDecimal.ZERO; + /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/ + private BigDecimal integralCash = BigDecimal.ZERO; /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/ private Integer buyNum; /**蹇呭~ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭~*/ @@ -44,10 +48,17 @@ /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/ private String isLimitBug; + /**杩囨浮鍟嗗搧绫诲瀷蹇呭~淇℃伅*/ + private OrderTransitionGoodsVo orderTransitionGoods; + /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/ + private OrderItemIntegralVo orderItemIntegral; + /**闈炲繀濉� 鍗″寘鏍囪瘑 */ private List<CardItemInfoDto> cardItemInfoIds; /** 璇夋眰鍒嗙被idList */ private List<String> appealTypeIdList; + /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */ + private List<OrderItemPreferentialDto> orderItemPreferentialList; } -- Gitblit v1.8.0