合并代码

puzhibing

2024-12-27 a323bb6fbfdd9fa7bc03465b7fbed2baf6d0fa84

 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)
@@ -71,8 +71,9 @@
        if (!shopService.cheUserByPhone(phone)) {
            return R.fail("该手机号未注册");
        }
        AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
        shop.setShopAllPoint(0);
        shop.setShopPoint(0);
        shop.setLowerLevelSharePoint(0);
        shop.setSharePoint(0);
        shop.setServerPoint(0);
        shop.setUsePoint(0);
@@ -85,14 +86,20 @@
        shop.setOrderNumber(0);
        shop.setServerOrderNumber(0);
        shop.setCustomOrderNumber(0);
        shop.setAppUserId(appUser.getId());
        shopService.save(shop);

        LoginUser loginUserApplet = tokenService.getLoginUser();

        AppUserShop appUserShop = new AppUserShop();
        appUserShop.setAppUserId(loginUserApplet.getUserid());
        appUserShop.setAppUserId(appUser.getId());
        appUserShop.setShopId(shop.getId());
        R<Void> r = appUserClient.addAppUserShop(appUserShop);
        if (R.isError(r)){
            throw new RuntimeException("添加失败");
        }
        appUser.setUserType(2);
        R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
        if (R.isError(editAppUserR)){
            throw new RuntimeException("添加失败");
        }
        return R.ok();
@@ -101,7 +108,7 @@

    @GetMapping("/getDetailById")
    @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
    public R<Shop> getDetailById(@RequestParam("id") Long id){
    public R<Shop> getDetailById(@RequestParam("id") Integer id){
        Shop byId = shopService.getById(id);
        return R.ok(byId);
    }
@@ -128,6 +135,9 @@
    @ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
    public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
        IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
        for (Shop record : shopIPage.getRecords()) {
            record.setLaveUsePoint(record.getLavePoint());
        }
        return R.ok(shopIPage);
    }

@@ -201,6 +211,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);
@@ -213,7 +226,7 @@
     */
    @GetMapping("/bindShop")
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
    public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
    public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
        AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
        appUser.setShopId(shopId);
        return appUserClient.editAppUserById(appUser);
@@ -249,7 +262,7 @@

    @ResponseBody
    @PostMapping("/getShopByUserId")
    public R<List<Shop>> getShopByUserId(@RequestParam("id") Integer id){
    public R<List<Shop>> getShopByUserId(@RequestParam("id") Long id){
        List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list();
        return R.ok(list);
    }
@@ -289,6 +302,15 @@
        ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
        return R.ok(shopStatistics);
    }

    
    
    /**
     * 编辑门店
     * @param shop
     */
    @PostMapping("/updateShop")
    public void updateShop(@RequestBody Shop shop){
        shopService.updateById(shop);
    }
}