From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期四, 01 八月 2024 22:30:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 79d8a0e..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 @@ -22,14 +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 Boolean isCanUseIntegralCash = false; /**鎶垫墸鐜伴噾閲戦*/ private BigDecimal cash = BigDecimal.ZERO; /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/ @@ -69,4 +71,10 @@ /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */ private List<OrderItemPreferentialDto> orderItemPreferentialList; + + /**鎶樻墸绠楁硶-鍗曚环绠楋紙鍗曚环涔樹互鎶樻墸锛�*/ + public static final int DISCOUNT_ALGORITHM_PRICE = 0; + /**鎶樻墸绠楁硶-鎬讳环绠楋紙鎬讳环涔樹互鎶樻墸锛�*/ + public static final int DISCOUNT_ALGORITHM_TOTAL = 1; + } -- Gitblit v1.8.0