修改bug

puzhibing

2025-01-02 2baa90c11d0ee7284d127f3a96c0f8452292d150

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

@@ -63,7 +63,6 @@




    @PostMapping
    @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
    @Transactional(rollbackFor = Exception.class)
@@ -72,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);
@@ -86,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();
@@ -102,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);
    }
@@ -110,7 +116,9 @@
    @DeleteMapping("/deleteShop")
    @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
    public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
        shopService.removeById(id);
        Shop shop = shopService.getById(id);
        shop.setDelFlag(1);
        shopService.updateById(shop);
        return R.ok();
    }

@@ -129,6 +137,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);
    }

@@ -217,7 +228,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);
@@ -253,7 +264,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,10 +300,19 @@
     */
    @GetMapping("/shopStatistics")
    @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
    public R<ShopStatistics> shopStatistics(@ApiParam("门店名称") String shopName) {
        ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
    public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
        ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
        return R.ok(shopStatistics);
    }

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