From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 19 +++++++++++++++----
1 files changed, 15 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 28337a9..e5932dc 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
@@ -28,6 +28,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -79,12 +80,15 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(loginUserApplet.getUserid());
appUserShop.setShopId(shop.getId());
- appUserClient.addAppUserShop(appUserShop);
+ R<Void> r = appUserClient.addAppUserShop(appUserShop);
+ if (R.isError(r)){
+ throw new RuntimeException("添加失败");
+ }
return R.ok();
}
- @PostMapping("/getDetailById")
+ @GetMapping("/getDetailById")
@ApiOperation(value = "门店详情", tags = {"后台管理-门店管理-门店详情"})
public R<Shop> getDetailById(@RequestParam("id") Long id){
Shop byId = shopService.getById(id);
@@ -107,8 +111,8 @@
@GetMapping("/list")
@ApiOperation(value = "门店列表", tags = {"后台管理-门店管理-门店列表"})
- public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
- IPage<Shop> shopIPage = shopService.getShopList(PageNum, pageSize, shop);
+ public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
+ IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
return R.ok(shopIPage);
}
@@ -206,5 +210,12 @@
return R.ok(list);
}
+ @GetMapping("/getShopIdByName")
+ R<Set<Integer>> getShopIdByName(@RequestParam 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()));
+ }
+
}
--
Gitblit v1.7.1