From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 8 ++++++++
1 files changed, 8 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 71f9bdb..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,12 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal couponTotal;
+ /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal preferentialTotal;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -35,6 +41,8 @@
/**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
private String commonItemId;
+ /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+ private String commonItemGoodsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
private String bodyPartsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
--
Gitblit v1.8.0