From 79e82d188a24ad92395ac4b39c1a49266a647c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 15:44:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 0e95dad..85d2b62 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -2,11 +2,16 @@
import com.ruoyi.account.api.factory.AppUserClientFallbackFactory;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -32,6 +37,19 @@
@PostMapping("/app-user/getCouponCount")
R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId );
+ /**
+ * 根据用户id查询用户门店信息
+ */
+ @GetMapping("/appUserShop/shop/{userId}")
+ R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);
+
+ /**
+ * 根据用户id获取用户的祖籍列表
+ */
+ @GetMapping("/appletLogin/getUserAncestorList")
+ R<List<AppUser>> getUserAncestorList(@RequestParam("id") Long id);
+
+
@PostMapping("/app-user/getVipCount")
R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );
--
Gitblit v1.7.1