From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 460 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 311 insertions(+), 149 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 bb34e23..23a591e 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.MD5Generator;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.vo.VerifiableShopVo;
@@ -44,6 +45,8 @@
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
+
+import static javax.swing.UIManager.get;
/**
* <p>
@@ -94,10 +97,10 @@
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
String phone = shop.getPhone();
- if (!shopService.cheUserByPhone(phone)) {
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
return R.fail("该手机号未注册");
}
- AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
shop.setShopAllPoint(0);
shop.setLowerLevelSharePoint(0);
shop.setSharePoint(0);
@@ -114,14 +117,20 @@
shop.setCustomOrderNumber(0);
shop.setAppUserId(appUser.getId());
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ if(!StringUtils.hasLength(city)){
+ city = "510100";
+ }
shop.setProvinceCode(city.substring(0, 2) + "0000");
shop.setCityCode(city.substring(0, 4) + "00");
shop.setDistrictCode(city);
shopService.save(shop);
+ Integer shopId = shop.getId();
+
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
+ appUserShop.setShopId(shopId);
+ appUserShop.setRoleType(1);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -132,20 +141,234 @@
throw new RuntimeException("添加失败");
}
//添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
if(null != sysUser){
+ sysUser.setAppUserId(appUser.getId());
+ sysUserClient.updateUser(sysUser);
+
UserShop userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
- userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShop.setNickName(sysUser.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopClient.saveUserShop(userShop);
+ }
+ }else{
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getPhone());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shopId);
+ user.setAppUserId(appUser.getId());
+ String s = MD5Generator.generateMD5(phone.substring(5));
+ user.setPassword(s);
+ user.setCreateTime(new Date());
+ Long userId = sysUserClient.saveShopUser(user).getData();
+
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopClient.saveUserShop(userShop);
+ }
+ }
+
+ // 更换下级会员绑定门店
+ R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
+ if (R.isError(lowerShopR)){
+ throw new RuntimeException("更换下级会员绑定门店失败");
+ }
+ return R.ok();
+ }
+
+
+ @GetMapping("/getDetailById")
+ @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
+ public R<Shop> getDetailById(@RequestParam("id") Integer id){
+ Shop shop = shopService.getById(id);
+ if (null != shop.getPid() && shop.getPid()==0){
+ shop.setPid(null);
+ }
+ return R.ok(shop);
+ }
+
+ @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);
+ // 查询有没有门店绑定这个被删除的门店
+ List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
+ for (Shop shop1 : shops) {
+ LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
+ .eq(Shop::getId,shop1.getId());
+ shopService.update(set);
+ }
+ //清除用户绑定当前门店
+ appUserClient.clearBindShop(shop.getId());
+ //查询门店绑定的平台账号
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(data.size() > 0){
+ //删除门店后台账号和关系数据
+ sysUserClient.delShopUser(shop.getId(), 2);
+
+ //修改小程序用户类型和门店数据
+ List<Integer> collect = data.stream().map(UserShop::getUserId).collect(Collectors.toList()).stream().map(Long::intValue).collect(Collectors.toList());
+ List<SysUser> sysUserList = sysUserClient.getUserList(collect).getData();
+ for (SysUser sysUser : sysUserList) {
+ //通过电话号码查询小程序用户和门店关系数据
+ AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).getData();
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ //删除用户门店关系数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShopClient.delAppUserShop(appUserShop);
+ }
+ }
+ //取消预约的订单
+ List<Technician> list = technicianService.list(new LambdaQueryWrapper<Technician>().eq(Technician::getShopId, shop.getId()).eq(Technician::getDelFlag, 0));
+ if(list.size() > 0){
+ for (Technician technician : list) {
+ technician.setDelFlag(1);
+ }
+ technicianService.updateBatchById(list);
+ //删除技师和门店关系数据
+ //删除用户门店关系数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(3);
+ appUserShopClient.delAppUserShop(appUserShop);
+
+ //取消门店预约技师数据
+ Set<Integer> collect = list.stream().map(Technician::getId).collect(Collectors.toSet());
+ technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>().in(TechnicianSubscribe::getTechnicianId, collect).eq(TechnicianSubscribe::getDelFlag, 0)
+ .eq(TechnicianSubscribe::getStatus, 0).set(TechnicianSubscribe::getStatus, 2));
+ }
+ return R.ok();
+ }
+
+ @PutMapping("/editShop")
+ @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
+ public R<Void> editShop(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
+ if (shop.getPid() != null && shop.getPid() != 0){
+ 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);
+ if(!StringUtils.hasLength(city)){
+ city = "510100";
+ }
+ shop.setProvinceCode(city.substring(0, 2) + "0000");
+ shop.setCityCode(city.substring(0, 4) + "00");
+ shop.setDistrictCode(city);
+ Shop old_shop = shopService.getById(shop.getId());
+ shopService.updateById(shop);
+ //修改管理员
+ AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ //当前小程序账号如果关联的店铺是最后一个，则将其修改为普通用户
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ //删除原店长关系数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
+ appUserShopClient.delAppUserShop(appUserShop);
+ //删除后台用户和店铺关系数据
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null != data && data.size() > 0){
+ UserShop userShop1 = data.get(0);
+ userShopClient.delUserShop(userShop1);
+ //如果当前后台账户关联的店铺是最后一个，删除后台账户
+ userShop = new UserShop();
+ userShop.setUserId(userShop1.getUserId());
+ data = userShopClient.getUserShop(userShop).getData();
+ if(data.size() == 0){
+ sysUserClient.delSysUserById(userShop1.getUserId());
+ }
+ }
+
+ //添加新管理员
+ appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
+ appUserClient.addAppUserShop(appUserShop);
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
+
+ //修改管理员
+ shop.setAppUserId(appUser.getId());
+ shopService.updateById(shop);
+
+ //添加门店后台账号和门店关系数据
+ SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ if(null != sysUser){
+ userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ userShop.setUserId(sysUser.getUserId());
+ data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(sysUser.getNickName());
userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
@@ -165,153 +388,21 @@
user.setPassword(phone.substring(5));
user.setCreateTime(new Date());
Long userId = sysUserClient.saveShopUser(user).getData();
-
- UserShop userShop = new UserShop();
+
+ userShop = new UserShop();
+ userShop.setShopId(shop.getId());
userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShopClient.saveUserShop(userShop);
- }
- return R.ok();
- }
-
-
- @GetMapping("/getDetailById")
- @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
- public R<Shop> getDetailById(@RequestParam("id") Integer id){
- Shop byId = shopService.getById(id);
- return R.ok(byId);
- }
-
- @DeleteMapping("/deleteShop")
- @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
- public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
- Shop shop = shopService.getById(id);
- shop.setDelFlag(1);
- shopService.updateById(shop);
- appUserClient.clearBindShop(shop.getId());
- UserShop userShop = new UserShop();
- userShop.setShopId(shop.getId());
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(data.size() > 0){
- List<Integer> collect = data.stream().map(UserShop::getUserId).collect(Collectors.toList()).stream().map(Long::intValue).collect(Collectors.toList());
- List<SysUser> sysUserList = sysUserClient.getUserList(collect).getData();
- //删除门店下的所有员工
- sysUserClient.delShopUser(shop.getId(), 2);
- //修改小程序用户类型和门店数据
- for (SysUser sysUser : sysUserList) {
- //通过电话号码查询小程序用户和门店关系数据
- AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).getData();
- //需要先判断用户是否没有关联任何门店
- List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
- if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
- appUser.setUserType(1);
- appUserClient.editAppUserById(appUser);
- }
- //删除用户门店关系表数据
- AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
- appUserShopClient.delAppUserShop(appUserShop);
- }
- }
- //取消预约的订单
- List<Technician> list = technicianService.list(new LambdaQueryWrapper<Technician>().eq(Technician::getShopId, shop.getId()).eq(Technician::getDelFlag, 0));
- if(list.size() > 0){
- for (Technician technician : list) {
- technician.setDelFlag(1);
- }
- technicianService.updateBatchById(list);
- Set<Integer> collect = list.stream().map(Technician::getId).collect(Collectors.toSet());
- technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>().in(TechnicianSubscribe::getTechnicianId, collect).eq(TechnicianSubscribe::getDelFlag, 0)
- .eq(TechnicianSubscribe::getStatus, 0).set(TechnicianSubscribe::getStatus, 2));
- }
- return R.ok();
- }
-
- @PutMapping("/editShop")
- @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
- public R<Void> editShop(@RequestBody Shop shop){
- 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");
- shop.setCityCode(city.substring(0, 4) + "00");
- shop.setDistrictCode(city);
- Shop old_shop = shopService.getById(shop.getId());
- shopService.updateById(shop);
- //修改管理员
- AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
- //需要先判断用户是否没有关联任何门店
- List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
- if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
- appUser.setUserType(1);
- appUserClient.editAppUserById(appUser);
- }
- AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
- appUserShopClient.delAppUserShop(appUserShop);
-
- //添加新管理员
- appUser = appUserClient.getAppUserByPhone1(phone).getData();
- appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
- appUserClient.addAppUserShop(appUserShop);
-
- //修改管理员
- shop.setAppUserId(appUser.getId());
- shopService.updateById(shop);
-
- //添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
- if(null != sysUser){
- UserShop userShop = new UserShop();
- userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
- userShop.setUserId(sysUser.getUserId());
+ userShop.setUserId(userId);
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(appUser.getName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
- }else{
- //添加管理后台账号
- SysUser user = new SysUser();
- user.setDeptId(1L);
- user.setUserName(appUser.getPhone());
- user.setNickName(appUser.getName());
- user.setPhonenumber(appUser.getPhone());
- user.setAvatar(appUser.getAvatar());
- user.setStatus("0");
- user.setDelFlag("0");
- user.setRoleType(2);
- user.setObjectId(shop.getId());
- user.setAppUserId(appUser.getId());
- user.setPassword(phone.substring(5));
- user.setCreateTime(new Date());
- Long userId = sysUserClient.saveShopUser(user).getData();
-
- UserShop userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShopClient.saveUserShop(userShop);
}
return R.ok();
}
@@ -326,6 +417,53 @@
}
shop.setStatus(status);
shopService.updateById(shop);
+ //处理员工等数据
+ if(status == 1){
+ UserShop userSh = new UserShop();
+ userSh.setShopId(id);
+ List<UserShop> data = userShopClient.getUserShop(userSh).getData();
+ for (UserShop datum : data) {
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus("0");
+ sysUserClient.updateUser(sysUser);
+ }
+ }else{
+ //查询门店所有关联数据
+ UserShop userSh = new UserShop();
+ userSh.setShopId(id);
+ List<UserShop> data = userShopClient.getUserShop(userSh).getData();
+ for (UserShop datum : data) {
+ //查询用户关联的其他店铺
+ UserShop userShop = new UserShop();
+ userShop.setUserId(datum.getUserId());
+ List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
+ List<UserShop> collect = data1.stream().filter(s -> !s.getShopId().equals(id)).collect(Collectors.toList());
+ if(collect.size() == 0){
+ //如果没有其他店铺，则将用户禁用
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus("1");
+ sysUserClient.updateUser(sysUser);
+ }else{
+ List<Integer> shopIds = collect.stream().map(UserShop::getShopId).collect(Collectors.toList());
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1)
+ .in(Shop::getId, shopIds));
+ //如果用户关联的其他门店都禁用了，将用户禁用
+ if(list.size() == 0){
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus("1");
+ sysUserClient.updateUser(sysUser);
+ }else{
+ //修改默认门店
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ if(sysUser.getObjectId().equals(id)){
+ sysUser.setObjectId(list.get(0).getId());
+ sysUserClient.updateUser(sysUser);
+ }
+ }
+ }
+ }
+ }
+
return R.ok();
}
@@ -365,7 +503,8 @@
userShop.setRoleType(1);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
- userData.setPassword(userData.getPhonenumber().substring(5));
+ String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
+ userData.setPassword(s);
sysUserClient.resetPassword(userData);
}
return R.ok();
@@ -421,7 +560,12 @@
return R.ok(new ArrayList<>());
}
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
- List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0));
+ long count = shopList.stream().filter(s -> s.getStatus() == 1).count();
+ if(shopList.size() > 0 && count == 0){
+ return R.fail("操作失败，当前门店已冻结");
+ }
+ shopList = shopList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
if(null != appUser.getShopId()){
Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
if(first.isPresent()){
@@ -620,7 +764,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();
@@ -635,7 +781,7 @@
@PostMapping("/saveWithdrawalAccount")
@ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
- public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ public R saveWithdrawalAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount) {
shopService.saveWithdrawalAccount(saveWithdrawalAccount);
return R.ok();
}
@@ -675,5 +821,21 @@
return R.ok(list);
}
+
+ @GetMapping("/getShopStatistics")
+ public R<Map<String, BigDecimal> > getShopStatistics(){
+ List<Shop> shopList = shopService.list();
+ BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
+ BigDecimal giveawayMoney = BigDecimal.ZERO;
+ for (Shop shop : shopList) {
+ serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
+ giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney());
+ }
+ Map<String, BigDecimal> map = new HashMap<>();
+ map.put("serverGiveawayMoney", serverGiveawayMoney);
+ map.put("giveawayMoney", giveawayMoney);
+ return R.ok(map);
+ }
+
}
--
Gitblit v1.7.1