Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

puzhibing

2025-01-14 fce5370b809076bab5c787af98ff5cfa0ce63ee9

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -45,6 +45,8 @@
import java.util.*;
import java.util.stream.Collectors;

import static javax.swing.UIManager.get;

/**
 * <p>
 * 前端控制器
@@ -214,7 +216,6 @@
        }
        Shop shop = shopService.getById(id);
        shop.setDelFlag(1);

        shopService.updateById(shop);
        // 查询有没有门店绑定这个被删除的门店
        List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
@@ -293,6 +294,7 @@
            appUser.setUserType(1);
            appUserClient.editAppUserById(appUser);
        }
        //删除原店长关系数据
        AppUserShop appUserShop = new AppUserShop();
        appUserShop.setAppUserId(appUser.getId());
        appUserShop.setShopId(shop.getId());
@@ -309,29 +311,38 @@
        appUser.setUserType(2);
        appUserClient.editAppUserById(appUser);
        

        //修改管理员
        shop.setAppUserId(appUser.getId());
        shopService.updateById(shop);

    
    
        //删除门店用户店铺关系数据
        UserShop userShop = new UserShop();
        userShop.setShopId(shop.getId());
        userShop.setRoleType(1);
        List<UserShop> data = userShopClient.getUserShop(userShop).getData();
        if(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());
            }
        }
        //添加门店后台账号和门店关系数据
        SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
        if(null != sysUser){
            UserShop userShop = new UserShop();
            userShop = new UserShop();
            userShop.setUserId(sysUser.getUserId());
            userShop.setShopId(shop.getId());
            userShop.setRoleType(1);
            List<UserShop> 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);
            }
            userShop.setRoleId(2L);
            userShop.setNickName(sysUser.getNickName());
            userShop.setCreateTime(LocalDateTime.now());
            userShopClient.saveUserShop(userShop);
        }else{
            //添加管理后台账号
            SysUser user = new SysUser();
@@ -349,7 +360,7 @@
            user.setCreateTime(new Date());
            Long userId = sysUserClient.saveShopUser(user).getData();

            UserShop userShop = new UserShop();
            userShop = new UserShop();
            userShop.setUserId(userId);
            userShop.setShopId(shop.getId());
            userShop.setRoleType(1);