From 45f8aca8f80c325447d5deeec98d35fd4fb0ede3 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 17 八月 2023 18:15:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-顾问打分' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

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 864c027..6309cc7 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
@@ -19,6 +19,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
@@ -255,6 +257,13 @@
     @PostMapping(value = "/user/crowd/import")
     Result userCrowdImport(@RequestBody UserDto userDto);
 
+    /**
+     * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+     * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+     */
+    @PostMapping(value = "/user/crowd/import/new")
+    Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
 
     /**
      * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -269,6 +278,12 @@
      */
     @PostMapping(value = "/user/info/baseInfo")
     Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+    /**
+     * 鑾峰彇鍒扮敤鎴�
+     */
+    @PostMapping(value = "/user/sync/by/idList")
+    Result userSyncList(@RequestBody List<String> hisIdList);
 
     /**
      *  鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
@@ -313,4 +328,16 @@
      * */
     @PostMapping(value = "/user/check/consumption")
     Result checkConsumption(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绱杩斾剑
+     * */
+    @PostMapping(value = "/user/rebate/userId")
+    Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绱杩斾剑
+     * */
+    @PostMapping(value = "/user/query/oldNewPerformance")
+    Result queryOldNewPerformance(@RequestBody UserDto userDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0