From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 42e3f43..c789dff 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -14,6 +14,9 @@
  */
 @Data
 public class OrdersPHisTotalDto {
+
+    /**蹇呭~ 璁㈠崟鍒嗙被锛圤rderTotalConstants锛�,榛樿鏍囧噯璁㈠崟*/
+    private Integer orderClassify;
     /**蹇呭~ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭*/
     private String type;
 
@@ -41,7 +44,7 @@
     /**闈炲繀濉� 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞~鐢ㄦ埛锛屼笉浼�,鍚庡彴澶勭悊*/
     private String developerName;
 
-    /**蹇呭~ 鐢ㄦ埛Id */
+    /**蹇呭~ 璁㈠崟鎵�灞炵敤鎴稩d */
     private String userId;
 
     /**crm蹇呭~ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭~ */
@@ -49,16 +52,21 @@
     /**闈炲繀濉� 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
     private String commonName;
 
+    /**璁㈠崟鎺ㄨ崘浜虹被鍨�(UserChannelType)鍛樺伐鎴栬�呯敤鎴�,榛樿鐢ㄦ埛*/
+    private String inviteeType;
     /**crm蹇呭~ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭~ */
     private String inviteeId;
     /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ 涓嶄紶,鍚庡彴澶勭悊*/
     private String inviteeName;
 
-    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0(涓嶄紶,鍚庡彴绾夸笂榛樿鍚屾,娴嬭瘯鐜榛樿涓嶅悓姝�)*/
+    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0*/
     private int hisSynStatus;
 
     /**蹇呭~ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
     private BigDecimal total;
+
+    /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+    private BigDecimal totalPoints;
 
     /**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
     private OrderInfoDto orderInfo;
@@ -88,4 +96,11 @@
 
     /**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
     private List<String> activityIds;
+
+    /** 娌荤枟鍗昳d(鐩墠娌$敤) */
+    private String treatSingleId;
+    /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+    private String addWay;
+    /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
 }

--
Gitblit v1.8.0