From 04aaeba45a2b178caa748284b4e0942cee7fcfcc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 21 三月 2023 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号
---
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 5 +++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java | 23 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java | 30 ++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
new file mode 100644
index 0000000..2b28995
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.user.project;
+
+import lombok.Data;
+
+@Data
+public class DirectCannelVo {
+
+ /**鐢ㄦ埛椤圭洰鏍囪瘑*/
+ private String id;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer operateType;
+ /**鎿嶄綔鐤楃▼鏁�*/
+ private Integer operateNum;
+
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**鎿嶄綔鍛樺伐*/
+ private String employeeId;
+ /**鎿嶄綔鍛樺伐瑙掕壊*/
+ private String employeeRoleId;
+
+ /**鎿嶄綔鍘熷洜*/
+ private String remarkInfo;
+
+ /**鎿嶄綔绫诲瀷-鍑忓皯/浣滃簾*/
+ public static final int OPERATE_TYPE_CANNEL = 0;
+ /**鎿嶄綔绫诲瀷-娣诲姞*/
+ public static final int OPERATE_TYPE_ADD = 1;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index a14eee3..267103d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -63,4 +64,8 @@
/**鏍囩鍒嗙被鏁版嵁鍒楄〃*/
@PostMapping("/tag/rule/info/list")
Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);
+
+ /**鍚屾鐢ㄦ埛鏍囩鏁版嵁*/
+ @PostMapping("/test/handlerSyncUserLabelInfo")
+ Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
new file mode 100644
index 0000000..0801c5e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserProjectService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.user.project.DirectCannelVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "userProject")
+public interface SUserProjectService {
+
+ /**
+ * 鐩存帴鎿嶄綔鐢ㄦ埛椤圭洰
+ * 鍛樺伐鐩存帴鎿嶄綔
+ * @param directCannelVo 灏佽瀵硅薄
+ * @return
+ */
+ @PostMapping(value = "/user/getUserLabel")
+ Result directCancel(@RequestBody DirectCannelVo directCannelVo);
+}
\ No newline at end of file
--
Gitblit v1.8.0