合并代码

puzhibing

2024-12-20 32b3913cb2a475ac2d6ff3fdca69059ae9f107c2

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

@@ -25,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -62,7 +63,6 @@




    @PostMapping
    @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
    @Transactional(rollbackFor = Exception.class)
@@ -93,6 +93,15 @@
        appUserShop.setShopId(shop.getId());
        R<Void> r = appUserClient.addAppUserShop(appUserShop);
        if (R.isError(r)){
            throw new RuntimeException("添加失败");
        }
        AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
        if (appUser == null){
            throw new RuntimeException("添加失败");
        }
        appUser.setUserType(2);
        R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
        if (R.isError(editAppUserR)){
            throw new RuntimeException("添加失败");
        }
        return R.ok();
@@ -201,6 +210,9 @@
        R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
        if (R.isSuccess(r)){
            List<AppUserShop> appUserShopList = r.getData();
            if (CollectionUtils.isEmpty(appUserShopList)){
                return R.ok(new ArrayList<>());
            }
            List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
            List<Shop> shopList = shopService.listByIds(shopIds);
            return R.ok(shopList);