From bc5b433028879348a63fd7f2b5845ae17df896a6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 08 八月 2024 16:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index 4630bf6..c7c7507 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -7,12 +7,14 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.other.api.domain.TCompany;
 import com.ruoyi.other.api.domain.TUserTag;
-import com.ruoyi.other.api.factory.GoodsFallbackFactory;
 import com.ruoyi.other.api.factory.OtherFallbackFactory;
 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;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 商品服务
@@ -38,6 +40,26 @@
     //用户新增标签
     @PostMapping(value = "/t-user-tag/addorUpdateTag")
     R addorUpdateTag(@RequestBody TUserTag tUserTag);
+    //删除用户标签
     @PostMapping(value = "/t-user-tag/delete")
     R deleteTag(@RequestParam Integer id);
+
+    //获取标签Map
+    @PostMapping(value = "/t-user-tag/getTagMap")
+    R<Map<Integer, String>> getTagMap(@RequestBody List<Integer> ids);
+    //获取标签
+    @PostMapping(value = "/t-user-tag/getById")
+    R<TUserTag> getByIdTag(@RequestParam Integer id);
+
+    @PostMapping(value = "/vip/getVipMap")
+    R<Map<Integer, String>> getVipMap(@RequestBody List<Integer> ids);
+
+
+
+
+
+
+
+
+
 }

--
Gitblit v1.7.1