From 268f264a612e142783422ae45eb8b64d7d133d4f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 09:24:28 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 936e3bd..ff9f10e 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
@@ -525,8 +525,13 @@
return R.ok(list);
}
- @GetMapping("/getShopIdByName")
- R<Set<Integer>> getShopIdByName(@RequestParam String shopName){
+ /**
+ * 根据名称查询门店id
+ * @param shopName
+ * @return
+ */
+ @PostMapping("/getShopIdByName")
+ public R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName){
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
.like(Shop::getName, shopName));
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
@@ -615,7 +620,9 @@
userShop.setUserId(userid);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
List<Integer> collect = data.stream().map(UserShop::getShopId).collect(Collectors.toList());
- List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getId, collect).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>()
+ .in(!CollectionUtils.isEmpty(collect),Shop::getId, collect)
+ .eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
List<VerifiableShopVo> list = new ArrayList<>();
for (Shop shop : shops) {
VerifiableShopVo vo = new VerifiableShopVo();
--
Gitblit v1.7.1