From 4f115ae0b211e839ca0079f3d7d5f8882fc650f3 Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:28:43 +0800
Subject: [PATCH] 切修丽可分支

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java |   19 +++++++++++++++++++
 1 files changed, 19 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..79d8a0e 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,16 @@
     private BigDecimal totalPoints;
     /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
     private BigDecimal discount;
+    /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+    private Boolean isCanUseIntegralCash = false;
+    /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭~锛屼笉浼犲垯榛樿0 */
+    private BigDecimal couponTotal;
+    /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭~锛屼笉浼犲垯榛樿0 */
+    private BigDecimal preferentialTotal;
+    /**鎶垫墸鐜伴噾閲戦*/
+    private BigDecimal cash = BigDecimal.ZERO;
+    /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
+    private BigDecimal integralCash = BigDecimal.ZERO;
     /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/
     private Integer buyNum;
     /**蹇呭~ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭~*/
@@ -31,6 +41,8 @@
 
     /**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
     private String commonItemId;
+    /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+    private String commonItemGoodsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
     private String bodyPartsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
@@ -44,10 +56,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