From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期三, 22 五月 2024 11:37:15 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊 --- 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 28f4219..cef0e81 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; + /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/ + private Boolean isCanUseIntegralCash = false; + /**鎶垫墸鐜伴噾閲戦*/ + private BigDecimal cash = BigDecimal.ZERO; + /**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/ + private BigDecimal integralCash = BigDecimal.ZERO; /**蹇呭~ 璐拱鏁伴噺 蹇呭~锛岄粯璁�0*/ private Integer buyNum; /**蹇呭~ 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭~*/ @@ -31,6 +37,8 @@ /**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */ private String commonItemId; + /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */ + private String commonItemGoodsId; /**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */ private String bodyPartsId; /**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */ -- Gitblit v1.8.0