From ac770cb0b7f69231d723d6fd111697fb6df15452 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 04 六月 2024 15:34:01 +0800
Subject: [PATCH] Merge branch 'fhx-prod-秒杀日历' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 6 ++++++
1 files changed, 6 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..5e2138e 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,10 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal couponTotal;
+ /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal preferentialTotal;
/**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
private Boolean isCanUseIntegralCash = false;
/**鎶垫墸鐜伴噾閲戦*/
@@ -63,4 +67,6 @@
/** 璇夋眰鍒嗙被idList */
private List<String> appealTypeIdList;
+ /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
+ private List<OrderItemPreferentialDto> orderItemPreferentialList;
}
--
Gitblit v1.8.0