修改bug

无关风月

2025-01-11 ec73339e08669dc5a0d4ff93e6640f51473c08cd

 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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserShopClient;
@@ -13,15 +14,9 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.service.GoodsShopService;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.*;
import com.ruoyi.other.util.GeodesyUtil;
import com.ruoyi.other.util.tencentMap.TencentMapUtil;
import com.ruoyi.other.vo.NearbyShopVO;
@@ -80,6 +75,11 @@
    private GoodsShopService goodsShopService;
    @Resource
    private OrderClient orderClient;
    @Resource
    private TechnicianSubscribeService technicianSubscribeService;
    @Resource
    private TechnicianService technicianService;




@@ -132,6 +132,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();
@@ -139,6 +140,7 @@
                userShop.setShopId(shop.getId());
                userShop.setRoleType(1);
                userShop.setRoleId(2L);
                userShop.setCreateTime(LocalDateTime.now());
                userShopClient.saveUserShop(userShop);
            }
        }else{
@@ -182,28 +184,53 @@
        Shop shop = shopService.getById(id);
        shop.setDelFlag(1);
        shopService.updateById(shop);
        // 查询有没有门店绑定了该门店为上级门店
        List<Shop> shops = shopService.lambdaQuery()
                .eq(Shop::getPid, id).list();
        if(!shops.isEmpty()){
            for (Shop shop1 : shops) {
                shop1.setPid(0);
            }
        }
        AppUser appUserById = appUserClient.getAppUserById(shop.getAppUserId());
        appUserById.setUserType(1);
        appUserClient.editAppUserById(appUserById);
        shopService.updateBatchById(shops);
        UserShop userShop = new UserShop();
        userShop.setShopId(shop.getId());
        List<UserShop> data = userShopClient.getUserShop(userShop).getData();
        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);
        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);
            }
            //删除用户门店关系表数据
            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();
    }
@@ -214,6 +241,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");
@@ -383,8 +416,10 @@
     */
    @GetMapping("/shopByUser")
    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
    public R<List<Shop>> shopByUser() {
        R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
    public R<List<Shop>> shopByUser(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude) {
        Long userid = tokenService.getLoginUserApplet().getUserid();
        AppUser appUser = appUserClient.getAppUserById(userid);
        R<List<AppUserShop>> r = appUserClient.getAppUserShop(userid);
        if (R.isSuccess(r)){
            List<AppUserShop> appUserShopList = r.getData();
            if (CollectionUtils.isEmpty(appUserShopList)){
@@ -392,6 +427,26 @@
            }
            List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
            List<Shop> shopList = shopService.listByIds(shopIds);
            if(null != appUser.getShopId()){
                Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
                if(first.isPresent()){
                    Shop shop = first.get();
                    for (Shop shop1 : shopList) {
                        if(shop1.getId().equals(shop.getId())){
                            shopList.remove(shop1);
                            break;
                        }
                    }
                    shopList.add(0, shop);
                }
            }
            for (Shop shop : shopList) {
                Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
                shop.setDistance(wgs84);
                List<ShopScore> list = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getShopId, shop.getId()));
                double v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
                shop.setScore(v);
            }
            return R.ok(shopList);
        }
        return R.ok(new ArrayList<>());
@@ -404,9 +459,6 @@
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
    public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
        AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
        if(null != appUser.getShopId()){
            return R.fail("不能重复绑定门店");
        }
        appUser.setShopId(shopId);
        return appUserClient.editAppUserById(appUser);
    }