Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475

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

@@ -41,7 +41,7 @@
 */
@RestController
@RequestMapping("/shop")
@Api(tags = "门店")
@Api("门店")
public class ShopController extends BaseController {
    @Resource
    private ShopService shopService;
@@ -56,9 +56,13 @@


    @PostMapping
    @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理"})
    @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
    @Transactional(rollbackFor = Exception.class)
    public R<Void> add(@RequestBody Shop shop){
        String phone = shop.getPhone();
        if (!shopService.cheUserByPhone(phone)) {
            return R.fail("该手机号未注册");
        }
        shop.setShopAllPoint(0);
        shop.setShopPoint(0);
        shop.setSharePoint(0);
@@ -76,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());
@@ -89,31 +93,40 @@


    @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);
    }

    /**
     * 通过手机号校验店长
     */
    @PostMapping("/cheUserByPhone")
    @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
    public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
        return R.ok(shopService.cheUserByPhone(phone));
    }


@@ -121,7 +134,7 @@
     * 附近门店列表
     */
    @GetMapping("/nearbyShopList")
    @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
    @ApiOperation(value = "附近门店列表", tags = {"小程序-首页"})
    public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam BigDecimal longitude,
                                                @ApiParam("纬度") @RequestParam BigDecimal latitude) {
        return R.ok(shopService.nearbyShopList(longitude, latitude));
@@ -129,7 +142,7 @@


    @GetMapping("/shopDetail")
    @ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
    @ApiOperation(value = "门店详情", tags = {"小程序-首页"})
    public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
                                      @ApiParam("经度") @RequestParam BigDecimal longitude,
                                      @ApiParam("纬度") @RequestParam BigDecimal latitude) {
@@ -140,7 +153,7 @@
     * 查询当前店长所属门店
     */
    @GetMapping("/shopByUser")
    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
    public R<List<Shop>> shopByUser() {
        R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
        if (R.isSuccess(r)){
@@ -156,7 +169,7 @@
     * 绑定门店
     */
    @GetMapping("/bindShop")
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
    public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
        AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
        appUser.setShopId(shopId);
@@ -168,7 +181,7 @@
     * @return
     */
    @PostMapping("/shopScore")
    @ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
    @ApiOperation(value = "门店打分", tags = {"小程序-个人中心"})
    public R<Void> shopScore(@RequestBody ShopScore shopScore) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        shopScore.setAppUserId(loginUserApplet.getUserid());
@@ -190,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);
    }
    
    
    /**