From fc21ab0f288823a22a05b13d33f07362b5c6b91c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 13:13:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 1a01bec..ee2356d 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
@@ -138,6 +138,7 @@
userShop.setUserId(sysUser.getUserId());
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
+ userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
@@ -145,6 +146,7 @@
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -185,6 +187,14 @@
@DeleteMapping("/deleteShop")
@ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
+ List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
+ if(list1.size() > 0){
+ Set<Integer> collect1 = list1.stream().map(Goods::getId).collect(Collectors.toSet());
+ long count = goodsShopService.count(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getShopId, id).in(GoodsShop::getGoodsId, collect1));
+ if(0 < count){
+ return R.fail("门店已被商品使用，不能删除");
+ }
+ }
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
@@ -234,6 +244,12 @@
String phone = shop.getPhone();
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
+ }
+ if (shop.getPid()!=null){
+ Shop shopP = shopService.getById(shop.getPid());
+ if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
+ return R.fail("门店之间不能互相作为上级门店");
+ }
}
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
shop.setProvinceCode(city.substring(0, 2) + "0000");
@@ -413,7 +429,7 @@
return R.ok(new ArrayList<>());
}
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
- List<Shop> shopList = shopService.listByIds(shopIds);
+ List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
if(null != appUser.getShopId()){
Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
if(first.isPresent()){
@@ -451,6 +467,13 @@
@GetMapping("/bindShop")
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
+ Shop shop = shopService.getById(shopId);
+ if(null == shop || shop.getDelFlag() == 1){
+ return R.fail("绑定店铺不存在");
+ }
+ if(2 == shop.getStatus()){
+ return R.fail("绑定店铺已被冻结");
+ }
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -510,8 +533,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()));
@@ -557,7 +585,7 @@
city = "510100";
}
city = city.substring(0, 4) + "00";
- LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getCityCode, city);
+ LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1).eq(Shop::getCityCode, city);
if(null != goodsId){
Goods goods = goodsService.getById(goodsId);
if(1 == goods.getType() && 1 == goods.getAppointStore()){
@@ -600,7 +628,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.listByIds(collect);
+ 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();
@@ -650,7 +680,8 @@
@GetMapping("/getBankSerialNumber")
@ApiOperation(value = "获取行联号", tags = {"门店后台-财务管理-提现明细"})
public R<List<ReceiverBankChannel>> getBankSerialNumber(String name){
- List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>().like(ReceiverBankChannel::getName, name));
+ List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>()
+ .like(ReceiverBankChannel::getName, name));
return R.ok(list);
}
--
Gitblit v1.7.1