From b999b74b81f5a344835e6be6690ae0328a6158aa Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 17:07:56 +0800
Subject: [PATCH] 1.后台管理-商品管理
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 36196c8..fc73323 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.AppUserShop;
@@ -27,6 +28,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -54,7 +56,7 @@
@PostMapping
- @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理-新增门店"})
+ @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理"})
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
shop.setShopAllPoint(0);
@@ -78,37 +80,40 @@
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")
- @ApiOperation(value = "门店详情", tags = {"后台管理-门店管理-门店详情"})
+ @GetMapping("/getDetailById")
+ @ApiOperation(value = "门店详情", tags = {"后台管理-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Long id){
Shop byId = shopService.getById(id);
return R.ok(byId);
}
@DeleteMapping("/deleteShop")
- @ApiOperation(value = "删除门店", tags = {"后台管理-门店管理-删除门店"})
+ @ApiOperation(value = "删除门店", tags = {"后台管理-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
shopService.removeById(id);
return R.ok();
}
@PutMapping("/editShop")
- @ApiOperation(value = "编辑门店", tags = {"后台管理-门店管理-编辑门店"})
+ @ApiOperation(value = "编辑门店", tags = {"后台管理-门店管理"})
public R<Void> editShop(@RequestBody Shop shop){
shopService.updateById(shop);
return R.ok();
}
@GetMapping("/list")
- @ApiOperation(value = "门店列表", tags = {"后台管理-门店管理-门店列表"})
- public R<List<Shop>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
- List<Shop> list = shopService.list();
- return null;
+ @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);
+ return R.ok(shopIPage);
}
@@ -205,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