From b240f579f8850915cbcfeda9806db61269d13a79 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 26 三月 2024 16:26:41 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 20 +++++++++++++++++++-
1 files changed, 19 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..28f4219 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,13 @@
public class OrderItemPHisDto {
/**蹇呭～ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, */
private String type;
- /**蹇呭～ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
+ /**蹇呭～ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal total;
+ /**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
+ /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
@@ -33,8 +39,20 @@
private String userCardId;
/**闈炲繀濉� 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /**闈炲繀濉� 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
+ private String platformType;
+ /**闈炲繀濉� 鏄惁闄愯喘(0:鍚�,1:鏄�),榛樿:1*/
+ private String isLimitBug;
+
+ /**杩囨浮鍟嗗搧绫诲瀷蹇呭～淇℃伅*/
+ private OrderTransitionGoodsVo orderTransitionGoods;
+ /**鍟嗗搧绉垎淇℃伅锛岃繖閲屼笉涓虹┖灏变互杩欓噷涓轰富*/
+ private OrderItemIntegralVo orderItemIntegral;
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
+ /** 璇夋眰鍒嗙被idList */
+ private List<String> appealTypeIdList;
+
}
--
Gitblit v1.8.0