From af495911ed2b8bbc65ca45e70e74681cad2e648b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 18:36:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index a5f04a0..83021b4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
@@ -25,7 +26,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -50,6 +53,14 @@
@Resource
private TokenService tokenService;
+
+
+ @PostMapping
+ @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理-新增门店"})
+ public R<Void> add(@RequestBody Shop shop){
+ shopService.save(shop);
+ return R.ok();
+ }
@PostMapping("/getDetailById")
@@ -84,10 +95,14 @@
@GetMapping("/shopByUser")
@ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
public R<List<Shop>> shopByUser() {
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
- .eq(Shop::getAppUserId, SecurityUtils.getUserId())
- .eq(Shop::getStatus, ShopStatus.SHOP_STATUS_NORMAL.getCode()));
- return R.ok(list);
+ R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
+ if (R.isSuccess(r)){
+ List<AppUserShop> appUserShopList = r.getData();
+ List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
+ List<Shop> shopList = shopService.listByIds(shopIds);
+ return R.ok(shopList);
+ }
+ return R.ok(new ArrayList<>());
}
/**
--
Gitblit v1.7.1