From 3009976f78b2a54536c85cc1c900ff0603e9bb24 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 31 八月 2022 14:17:41 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-he
---
phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
index 69c8bcf..87a9b9d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 鎬昏鍗�
@@ -18,7 +19,7 @@
private String id;
/** 璁㈠崟缂栧彿锛屼互S寮�澶�, SyyyyMMdd0000000(鍓嶇紑浠庡瓧鍏歌幏鍙�) */
private String orderNo;
- /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛� */
+ /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
private String type;
/** 鐘舵��(OrderTotalConstants) */
private Integer status;
@@ -76,36 +77,38 @@
/** 涓嬪崟鎿嶄綔浜哄悕绉� */
private String operatorName;
- /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+ /** 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) 蹇呭～*/
private String developerShopId;
/** 寮�鍙戜汉闂ㄥ簵鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopName;
- /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) */
+ /** 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
private String developerId;
- /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) */
+ /** 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 蹇呭～锛屼笁灏戣锛宑rm灏卞～鐢ㄦ埛*/
private String developerName;
/*骞冲彴鏉ユ簮**/
- /** 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+ /** 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) 蹇呭～*/
private String appId;
- /** 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) */
+ /** 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) 蹇呭～*/
private String appIdCode;
/*閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨*/
- /** 璁㈠崟鏉ユ簮浠ｇ爜锛堥粯璁�:搴旂敤appId锛� */
+ /** 璁㈠崟鏉ユ簮浠ｇ爜锛堥粯璁�:搴旂敤appId锛�
+ * 閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭～,crm榛樿濉玞rm
+ * */
private String sourceCode;
- /** 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) */
+ /** 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,蹇呭～锛宺m榛樿濉玞rm*/
private String sourceName;
- /** 绗笁鏂硅鍗曞彿 */
+ /** 绗笁鏂硅鍗曞彿 crm蹇呭～锛屽～crm鐨勮鍗曞彿*/
private String sourceOrderNo;
/** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
private String conversionCode;
- /** 娓犻亾鏉ユ簮绫诲瀷锛圤rderTotalConstants锛� */
+ /** 璁㈠崟娓犻亾鏉ユ簮绫诲瀷锛圤rderTotalConstants锛� */
private String channelType;
- /** 娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛� */
+ /** 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛� crm蹇呭～锛屼笁灏戣 */
private String commonId;
- /** 娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
+ /** 璁㈠崟娓犻亾鏉ユ簮鍚嶇О(娓犻亾/鐢ㄦ埛) */
private String commonName;
/** 绉戝缂栫爜 */
@@ -123,7 +126,7 @@
/** 鍖荤敓鍚嶇О */
private String doctorName;
- /** 鍚屾鐘舵��0鍚�1鏄� */
+ /** 鍚屾鐘舵��0鍚�1鏄� ,蹇呭～锛屽鏋滆鍚屾鍒伴寤哄繀濉�1锛屽惁鍒�0*/
private int hisSynStatus;
/** 鍚屾his璁㈠崟鍙� */
private String hisOrderId;
@@ -148,16 +151,16 @@
/** 璁㈠崟澶囨敞 */
private String remarks;
- /** 鎺ㄨ崘浜烘爣璇� */
+ /** 璁㈠崟鎺ㄨ崘浜烘爣璇� crm蹇呭～锛屼笁灏戣*/
private String inviteeId;
- /** 鎺ㄨ崘浜哄悕绉�(鍐椾綑) */
+ /** 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑) crm蹇呭～锛屼笁灏戣*/
private String inviteeName;
- /** 鎺ㄨ崘浜烘墍灞炵被鍨�(UserChannelType) */
+ /** 璁㈠崟鎺ㄨ崘浜烘墍灞炵被鍨�(UserChannelType) */
private String userBelongingType;
- /** 鐢ㄦ埛Id */
+ /** 鐢ㄦ埛Id 蹇呭～*/
private String userId;
/** 鍚屾鐘舵��(OrderTotalConstants) */
@@ -167,4 +170,6 @@
private String koapOrderId;
private OrderInfoDto orderInfo;
+
+ private List<String> activityIds;
}
--
Gitblit v1.8.0