From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |   48 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 36 insertions(+), 12 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 6fd69ed..50a7ae6 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,12 +14,17 @@
  */
 @Data
 public class OrdersPHisTotalDto {
+
+    /**蹇呭~ 璁㈠崟鍒嗙被锛圤rderTotalConstants锛�,榛樿鏍囧噯璁㈠崟*/
+    private Integer orderClassify;
     /**蹇呭~ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭*/
     private String type;
 
-    /**蹇呭~ 骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+    /**浣跨敤浼犲�肩殑骞冲彴鏉ユ簮:0鍚�1鏄紝榛樿鍚�*/
+    private Integer usedTransmitApp = 0;
+    /**骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭~ */
     private String appId;
-    /**蹇呭~ 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~) */
+    /**鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠g爜蹇呭~),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭~ */
     private String appIdCode;
 
     /*蹇呭~ 閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨
@@ -27,21 +32,21 @@
     *      閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭~,crm榛樿濉玞rm
     * */
     private String sourceCode;
-    /**蹇呭~ 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm*/
+    /**闈炲繀濉� 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm,(鍚庡彴澶勭悊)*/
     private String sourceName;
     /**crm蹇呭~ 绗笁鏂硅鍗曞彿,濉玞rm鐨勮鍗曞彿*/
     private String sourceOrderNo;
-    /** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
+    /**闈炲繀濉� 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
     private String conversionCode;
 
-    /**蹇呭~ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+    /**蹇呭~ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
     private String developerShopId;
     /**crm蹇呭~ 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 涓夊皯璇达細crm灏卞~鐢ㄦ埛*/
     private String developerId;
-    /**crm蹇呭~ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞~鐢ㄦ埛*/
+    /**闈炲繀濉� 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞~鐢ㄦ埛锛屼笉浼�,鍚庡彴澶勭悊*/
     private String developerName;
 
-    /**蹇呭~ 鐢ㄦ埛Id */
+    /**蹇呭~ 璁㈠崟鎵�灞炵敤鎴稩d */
     private String userId;
 
     /**crm蹇呭~ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭~ */
@@ -49,19 +54,24 @@
     /**闈炲繀濉� 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
     private String commonName;
 
+    /**璁㈠崟鎺ㄨ崘浜虹被鍨�(UserChannelType)鍛樺伐鎴栬�呯敤鎴�,榛樿鐢ㄦ埛*/
+    private String inviteeType;
     /**crm蹇呭~ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭~ */
     private String inviteeId;
-    /**crm蹇呭~ 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ */
+    /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ 涓嶄紶,鍚庡彴澶勭悊*/
     private String inviteeName;
 
     /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0*/
     private int hisSynStatus;
 
-    /**蹇呭~ 璁㈠崟鍏朵粬淇℃伅*/
-    private OrderInfoDto orderInfo;
-
-    /**鍏呭�艰鍗曞繀濉� 璁㈠崟鎬婚噾棰� */
+    /**蹇呭~ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
     private BigDecimal total;
+
+    /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+    private BigDecimal totalPoints;
+
+    /**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
+    private OrderInfoDto orderInfo;
 
     /**闈炲繀濉� 璧犻�侀噾棰� */
     private BigDecimal givingAmount;
@@ -88,4 +98,18 @@
 
     /**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
     private List<String> activityIds;
+
+    /** 娌荤枟鍗昳d(鐩墠娌$敤) */
+    private String treatSingleId;
+    /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+    private String addWay;
+    /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
+
+    /**娲诲姩椤甸潰绫诲瀷锛�0榛樿鏍囧噯锛夛紝濡傛灉闇�瑕佺壒闇�澶勭悊锛屽~鍐欒繖涓紝榛樿0*/
+    private Integer activityPageType = 0;
+    /**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/
+    private String activityPageCode;
+    /**娲诲姩鍖哄垎鏍囬*/
+    private String activityPageName;
 }

--
Gitblit v1.8.0