From 23f822a32e39114dfcffd073c516ac3b39f03b16 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期四, 08 十二月 2022 18:10:33 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 e69c4b6..caca455 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
@@ -16,7 +16,11 @@
public class OrderItemPHisDto {
/**蹇呭～ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, */
private String type;
- /**蹇呭～ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
+ /**蹇呭～ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal total;
+ /**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal totalIntegral;
+ /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
@@ -33,6 +37,10 @@
private String userCardId;
/**闈炲繀濉� 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /**闈炲繀濉� 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
+ private String platformType;
+ /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
+ private String isLimitBug;
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
--
Gitblit v1.8.0