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/CardItemInfoDto.java | 19 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 2
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 8 +
phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java | 33 ++++++
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 6 +
phis-feign/src/main/java/com/hz/phis/dt/dcp/UserTagInfoDt.java | 46 +++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 7 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 11 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java | 17 ++-
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 10 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6 +
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java | 25 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 24 ++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 6
phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 36 +++---
17 files changed, 234 insertions(+), 32 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index f0aa39c..7bc4cb5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @author fwq
* 鍛樺伐鎵╁睍
@@ -11,4 +13,8 @@
public class EmployeeDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
+ /**鍛樺伐浼佷笟userId*/
+ private String userId;
+ /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
+ private List<String> roleList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
new file mode 100644
index 0000000..5b7716f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CardItemInfoDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.order;
+
+/**
+ * 鍗￠」缁勫悎椤圭洰(card_item_info)
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/08/31/11:18
+ * @Description:
+ */
+public class CardItemInfoDto {
+ /**
+ * 浣跨敤娆℃暟
+ */
+ private Integer userNum;
+ /**
+ * 瀹㈡埛鍗″寘閫夊畾椤圭洰:(鍗￠」鐨勭粍鍚堥」鐩爣璇�)
+ */
+ private String id;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 9723a3f..53ec72a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -23,11 +23,11 @@
private String activityId;
/** 娲诲姩瑙勫垯鍚嶇О */
private String activityName;
- /** 鏄惁鏁村崟鎶樻墸 */
+ /** 鏄惁鏁村崟鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isWholeDiscount;
- /** 鏄惁鍛樺伐鎶樻墸 */
+ /** 鏄惁鍛樺伐鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isEmployeeDiscount;
- /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) */
+ /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) 蹇呭～锛岄粯璁�100*/
private BigDecimal discount;
/** 鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁＄畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�) */
private BigDecimal snapPayTotal=BigDecimal.ZERO;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
index b8a3c95..b412caf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* 璁㈠崟淇℃伅
@@ -16,7 +17,7 @@
/** 璁㈠崟缂栧彿锛屼互SO锛夊紑澶�, SOyyyyMMdd0000000 */
private String orderNo;
- /** 鍟嗗搧绫诲瀷(OrderItemConstants) */
+ /** 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
private String type;
/** 椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜 */
@@ -51,24 +52,27 @@
/** 椤圭洰/鍟嗗搧鐤楃▼鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
private Integer single;
- /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) */
+ /** 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
private BigDecimal discount;
/** 鎬绘鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛� */
private Integer usedTotal;
- /** 璐拱鏁伴噺 */
+ /** 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
/** 瀛愰」璁㈠崟澶囨敞 */
private String remarks;
- /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 */
+ /** 椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級 蹇呭～*/
private String commonId;
/** 鎵ц鏉＄洰ID */
private String performId;
/** 璁㈠崟id锛圤rdersTotal锛� */
private String orderId;
+
+ /** 鍗″寘鏍囪瘑锛圲serCard锛� */
+ private String userCardId;
/** 杞叆闂ㄥ簵id */
private String transferIntoShopId;
@@ -83,9 +87,12 @@
private Integer isTurn;
/** 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,crm榛樿crm) */
private String platformType=TYPE_PLATFORM_CRM;
- /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id */
+ /** 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /** 鍗″寘鏍囪瘑 */
+ private List<CardItemInfoDto> cardItemInfoIds;
+
/**骞冲彴绫诲瀷-CRM*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
new file mode 100644
index 0000000..fdd9d01
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * Created with IntelliJ IDEA.
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/08/31/10:32
+ * @Description:
+ */
+@Data
+public class OrderPHisDto extends PageDto {
+ //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉�
+ private String type;
+ //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭～
+ private String operatorId;
+ //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭～
+ private String shopId;
+ private OrdersTotalDto ordersTotal;
+ private OrderItemDto orderItem;
+ private OrderDeveloperDto orderDeveloper;
+}
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 9ab54ce..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
@@ -19,7 +19,7 @@
private String id;
/** 璁㈠崟缂栧彿锛屼互S寮�澶�, SyyyyMMdd0000000(鍓嶇紑浠庡瓧鍏歌幏鍙�) */
private String orderNo;
- /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛� */
+ /** 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, 蹇呭～*/
private String type;
/** 鐘舵��(OrderTotalConstants) */
private Integer status;
@@ -77,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;
/** 绉戝缂栫爜 */
@@ -124,7 +126,7 @@
/** 鍖荤敓鍚嶇О */
private String doctorName;
- /** 鍚屾鐘舵��0鍚�1鏄� */
+ /** 鍚屾鐘舵��0鍚�1鏄� ,蹇呭～锛屽鏋滆鍚屾鍒伴寤哄繀濉�1锛屽惁鍒�0*/
private int hisSynStatus;
/** 鍚屾his璁㈠崟鍙� */
private String hisOrderId;
@@ -149,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) */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 9bfb10e..8e69929 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -10,7 +10,14 @@
private String id;
private String userId;
+ /**ciq*/
private String CIQ;
+ /**鍚嶇О*/
private String name;
+ /**鎵嬫満鍙�*/
private String tel;
+ /**鎵�灞為棬搴楁爣璇�*/
+ private String shopId;
+ /**鎵�灞為【闂悕绉�*/
+ private String beCorpUser;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 3e16eff..9462bd1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -53,4 +53,11 @@
*/
@PostMapping(value = "/emp/medical/info")
Result getEmpMedicalInfo(@RequestBody(required = false) String empId);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪浼佷笟userId,鏄惁瀛樺湪浼犻�掔殑瑙掕壊
+ */
+ @PostMapping(value = "/emp/userId/role/check")
+ Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index d0d44b7..7c8fe90 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -33,6 +33,12 @@
Result userList(@RequestBody UserDto userDto);
/**
+ * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃
+ * */
+ @PostMapping(value = "/user/list/ids")
+ Result userIdList(@RequestBody UserDto userDto);
+
+ /**
* 鑾峰彇鍒扮敤鎴疯鎯�
* @param userId 鐢ㄦ埛鏍囪瘑
* @return 杞寲浣跨敤UserDt
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index a7bc22f..5f4993b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -1,10 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.order.OrderCreateDto;
-import com.hz.his.dto.order.OrderPayDto;
-import com.hz.his.dto.order.OrderRefundDto;
-import com.hz.his.dto.order.OrdersTotalDto;
+import com.hz.his.dto.order.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,4 +48,10 @@
*/
@PostMapping(value = "/refund/syn/refund")
Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+ /**
+ * 寮�鏀惧钩鍙�-寮�鍗曞苟涓旂粨璐︽帴鍙�
+ */
+ @PostMapping(value = "/create/pay/order")
+ Result createPayOrder(@RequestBody OrderPHisDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 60a3929..0b773ba 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -18,12 +18,14 @@
/**
* 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
*/
@PostMapping(value = "/user/list")
Result userList(@RequestBody UserListDto userListDto);
/**
* 寮�鏀惧钩鍙�-绮剧‘鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
*/
@PostMapping(value = "/user/appoint_user")
Result appointUser(@RequestBody UserListDto userListDto);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
new file mode 100644
index 0000000..1bdab13
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.sync;
+
+/**
+ * @Author
+ */
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-order")
+public interface SyncOrderService {
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇棰嗗仴璁㈠崟淇℃伅
+ * @param orderId
+ * @return
+ */
+ @PostMapping(value = "/sync/order/getOrderById")
+ Result getOrderById(@RequestParam("orderId") String orderId);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java
index 256188b..06104e6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncPromotionService.java
@@ -8,6 +8,7 @@
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -23,5 +24,5 @@
* @return
*/
@PostMapping(value = "/sync/project/promotion")
- Result syncHisPromotion(JSONObject jsonObject);
+ Result syncHisPromotion(@RequestBody JSONObject jsonObject);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
index ba8af0c..97f2c91 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
@@ -4,10 +4,11 @@
* @Author
*/
-import org.springframework.cloud.openfeign.FeignClient;
import com.hx.resultTool.Result;
-import org.springframework.http.MediaType;
+import net.sf.json.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -30,4 +31,9 @@
*/
@PostMapping(value = "/sync/user/syncUserById")
Result syncUserById(@RequestParam("userId") String userId);
+
+ /** 涓诲姩鍚屾鍒涘缓椤惧鍒癶is - 淇敼鐢ㄦ埛ciq鍜屼細鍛樼瓑绾�*/
+ @PostMapping("/sync/user/updateMembership")
+ Result updateMembership(@RequestBody JSONObject jsonObject);
+
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/dcp/UserTagInfoDt.java b/phis-feign/src/main/java/com/hz/phis/dt/dcp/UserTagInfoDt.java
new file mode 100644
index 0000000..583fdfe
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/dcp/UserTagInfoDt.java
@@ -0,0 +1,46 @@
+package com.hz.phis.dt.dcp;
+
+import com.hz.phis.dt.BaseDt;
+import lombok.Data;
+
+@Data
+public class UserTagInfoDt extends BaseDt {
+ /**鏄惁鑷畾涔夛細0鍚�1鏄�*/
+ private Integer isCustom;
+ /**phisId*/
+ private String phisId;
+ /**phisLabelInfoId*/
+ private String phisLabelInfoId;
+ /**phisLabelTypeId*/
+ private String phisLabelTypeId;
+ /**骞冲彴*/
+ private String platformCode;
+ /**闂ㄥ簵id*/
+ private String shopId;
+ /**闂ㄥ簵鍚嶇О*/
+ private String shopName;
+ /**鏉ユ簮鎿嶄綔鐨勫钩鍙板悕绉�*/
+ private String sourceType;
+ /**鏍囩棰滆壊*/
+ private String tagColor;
+ /**鏍囩鍚嶇О*/
+ private String tagName;
+ /**鏍囩缂栧彿*/
+ private String tagNo;
+ /***/
+ private String tagRangeValue;
+ /**鏍囩绫诲瀷*/
+ private Integer tagType;
+ /**鏍囩鍊�*/
+ private String tagValue;
+ /**鍒嗙被鍚嶇О*/
+ private String typeName;
+ /**鍒嗙被缂栧彿*/
+ private String typeNo;
+ /**鐢ㄦ埛id*/
+ private String userId;
+ /**鐢ㄦ埛鍚嶇О*/
+ private String userName;
+ /**鐢ㄦ埛缂栧彿*/
+ private String userNo;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index b4437c1..daa96e5 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -49,8 +49,16 @@
private String channelCategory;
/**鎵�灞為棬搴�*/
private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
/**鐢ㄦ埛瑙掕壊*/
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
private String userType;
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
+ private String hisCorpUserId;
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
+ private String hisCorpUser;
+ /**鎬у埆*/
+ private Integer gender;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java
new file mode 100644
index 0000000..f189d3f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java
@@ -0,0 +1,33 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 寮�鏀惧钩鍙板垪琛ㄨ繑鍥炲疄浣�
+ * */
+@Data
+public class UserPhipDt {
+ /**鏍囪瘑*/
+ private String id;
+ /**ciq浼氬憳鍙�*/
+ private String CIQ;
+ /**鍚嶇О*/
+ private String name;
+ /**鎵嬫満鍙�*/
+ private String tel;
+
+ /**棰嗗缓绯荤粺鐨刬d*/
+ private String apiId;
+ /**鐢ㄦ埛浼氬憳鍚嶇О*/
+ private String imgUrl;
+
+ /**鐢ㄦ埛鎬у埆*/
+ private Integer gender;
+ /**unionId*/
+ private String unionId;
+ /**鍒涘缓鏃堕棿*/
+ private String createTime;
+
+}
--
Gitblit v1.8.0