From 899277d8fba239727875201ee6a060b6c535f743 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 30 九月 2024 18:01:39 +0800
Subject: [PATCH] 1.修改会员来访明细工具逻辑 2.新增查询权限工具类

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 2e6e1ac..3372d50 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
@@ -22,8 +22,20 @@
     private BigDecimal totalIntegral;
     /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
     private BigDecimal totalPoints;
+    /**蹇呭~ 鎶樻墸绠楁硶*/
+    private Integer discountAlgorithm = DISCOUNT_ALGORITHM_PRICE;
     /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭~锛岄粯璁�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 +43,8 @@
 
     /**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
     private String commonItemId;
+    /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+    private String commonItemGoodsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
     private String bodyPartsId;
     /**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
@@ -44,6 +58,8 @@
     /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
     private String isLimitBug;
 
+    /**杩囨浮鍟嗗搧绫诲瀷蹇呭~淇℃伅*/
+    private OrderTransitionGoodsVo orderTransitionGoods;
     /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
     private OrderItemIntegralVo orderItemIntegral;
 
@@ -53,4 +69,12 @@
     /** 璇夋眰鍒嗙被idList */
     private List<String> appealTypeIdList;
 
+    /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
+    private List<OrderItemPreferentialDto> orderItemPreferentialList;
+
+    /**鎶樻墸绠楁硶-鍗曚环绠楋紙鍗曚环涔樹互鎶樻墸锛�*/
+    public static final int DISCOUNT_ALGORITHM_PRICE = 0;
+    /**鎶樻墸绠楁硶-鎬讳环绠楋紙鎬讳环涔樹互鎶樻墸锛�*/
+    public static final int DISCOUNT_ALGORITHM_TOTAL = 1;
+
 }

--
Gitblit v1.8.0