Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475

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

@@ -56,7 +56,7 @@


    @PostMapping
    @ApiOperation(value = "门店管理-新增门店", tags = {"管理后台"})
    @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
    @Transactional(rollbackFor = Exception.class)
    public R<Void> add(@RequestBody Shop shop){
        String phone = shop.getPhone();
@@ -80,7 +80,7 @@
        shop.setCustomOrderNumber(0);
        shopService.save(shop);

        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        LoginUser loginUserApplet = tokenService.getLoginUser();
        AppUserShop appUserShop = new AppUserShop();
        appUserShop.setAppUserId(loginUserApplet.getUserid());
        appUserShop.setShopId(shop.getId());
@@ -93,28 +93,28 @@


    @GetMapping("/getDetailById")
    @ApiOperation(value = "门店管理-门店详情", tags = {"管理后台"})
    @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
    public R<Shop> getDetailById(@RequestParam("id") Long id){
        Shop byId = shopService.getById(id);
        return R.ok(byId);
    }

    @DeleteMapping("/deleteShop")
    @ApiOperation(value = "门店管理-删除门店", tags = {"管理后台"})
    @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
    public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
        shopService.removeById(id);
        return R.ok();
    }

    @PutMapping("/editShop")
    @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台"})
    @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
    public R<Void> editShop(@RequestBody Shop shop){
        shopService.updateById(shop);
        return R.ok();
    }

    @GetMapping("/list")
    @ApiOperation(value = "门店管理-门店列表", tags = {"管理后台"})
    @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);
        return R.ok(shopIPage);
@@ -124,7 +124,7 @@
     * 通过手机号校验店长
     */
    @PostMapping("/cheUserByPhone")
    @ApiOperation(value = "门店管理-通过手机号校验店长", tags = {"管理后台"})
    @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
    public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
        return R.ok(shopService.cheUserByPhone(phone));
    }
@@ -203,6 +203,13 @@
        Shop shop = shopService.getById(id);
        return R.ok(shop);
    }

    @ResponseBody
    @PostMapping("/getShopByUserId")
    public R<List<Shop>> getShopByUserId(@RequestParam("id") Integer id){
        List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list();
        return R.ok(list);
    }
    
    
    /**