From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 3008621..35d06f0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -22,15 +22,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
+import java.rmi.server.ServerCloneException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -93,7 +91,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -104,7 +107,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -135,7 +142,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -146,12 +158,23 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
}
}
+ if(null != mgtShopPageDto.getDeptId()){
+ R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
+ List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
+ List<Shop> shops = shopService.getShopBySysUserIds(collect);
+ scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
+ }
+
Page<MgtShopPageVo> page = new Page<>();
page.setSize(mgtShopPageDto.getPageSize());
page.setCurrent(mgtShopPageDto.getPageNum());
@@ -204,6 +227,12 @@
}
}
}
+ }
+ if(null != mgtShopPageDto.getDeptId()){
+ R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
+ List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
+ List<Shop> shops = shopService.getShopBySysUserIds(collect);
+ scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
}
List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto,scope);
ExcelUtil<MgtShopPageVo> util = new ExcelUtil<MgtShopPageVo>(MgtShopPageVo.class);
@@ -412,7 +441,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -423,7 +457,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -490,7 +528,11 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -501,7 +543,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -584,4 +630,11 @@
List<Map<String, String>> bankBranchCode = bankBranchCodeService.getBankBranchCode(dto.getBankNumber());
return R.ok(bankBranchCode);
}
+
+ @RequestMapping(value = "/changeShopType", method = RequestMethod.GET)
+ @ApiOperation(value = "修改商户类型（转为经销商，转为加盟商）【2.0】")
+ public R<Void> changeShopType(@RequestParam Long shopId){
+ return shopService.changeShopType(shopId);
+ }
+
}
--
Gitblit v1.7.1