From 7b2467a59d3a663fc3d004c852a843f363251029 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 02 八月 2024 17:22:02 +0800
Subject: [PATCH] Merge branch 'master-0729-功能优化' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 e53423d..389c14b 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
@@ -16,12 +16,26 @@
public class OrderItemPHisDto {
/**蹇呭～ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, */
private String type;
- /**蹇呭～ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級*/
+ /**蹇呭～ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal total;
- /**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎*/
+ /**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
- /**蹇呭～ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
+ /**蹇呭～ 鎶樻墸绠楁硶*/
+ private Integer discountAlgorithm = DISCOUNT_ALGORITHM_PRICE;
+ /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal couponTotal;
+ /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal preferentialTotal;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
+ /**鎶垫墸鐜伴噾閲戦*/
+ private BigDecimal cash = BigDecimal.ZERO;
+ /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
+ private BigDecimal integralCash = BigDecimal.ZERO;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
/**蹇呭～ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭～*/
@@ -29,6 +43,8 @@
/**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
private String commonItemId;
+ /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+ private String commonItemGoodsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
private String bodyPartsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
@@ -37,8 +53,28 @@
private String userCardId;
/**闈炲繀濉� 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /**闈炲繀濉� 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
+ private String platformType;
+ /**闈炲繀濉� 鏄惁闄愯喘(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;
+
+ /**鎶樻墸绠楁硶-鍗曚环绠楋紙鍗曚环涔樹互鎶樻墸锛�*/
+ public static final int DISCOUNT_ALGORITHM_PRICE = 0;
+ /**鎶樻墸绠楁硶-鎬讳环绠楋紙鎬讳环涔樹互鎶樻墸锛�*/
+ public static final int DISCOUNT_ALGORITHM_TOTAL = 1;
+
}
--
Gitblit v1.8.0