From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 14 ++++++++++++++
1 files changed, 14 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 cef0e81..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,10 +22,16 @@
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;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -63,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