合并代码

Pu Zhibing

2024-11-25 30ddf6570494f77a3dde98e5cd85c07cb340f51a

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

@@ -12,13 +12,11 @@
import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.VerifiableShopVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
@@ -42,12 +40,22 @@
    @Resource
    private AppUserClient appUserClient;

    /**
     * 附近门店列表
     */
    @GetMapping("/nearbyShopList")
    @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
    public AjaxResult nearbyShopList(@ApiParam("经度") @RequestParam String longitude,
                                     @ApiParam("纬度") @RequestParam String latitude){
        return success(shopService.nearbyShopList(longitude,latitude));
    }


    /**
     * 指定门店技师列表
     */
    @GetMapping("/technicianList")
    @ApiOperation(value = "技师列表", tags = {"技师"})
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public AjaxResult technicianList(@ApiParam("门店id") @RequestParam String shopId){
        return success(technicianService.list(new LambdaQueryWrapper<Technician>()
                .eq(Technician::getShopId,shopId)
@@ -59,7 +67,7 @@
     * 查询当前店长所属门店
     */
    @GetMapping("/shopByUser")
    @ApiOperation(value = "查询当前店长所属门店", tags = {"门店"})
    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页-关联门店列表"})
    public AjaxResult shopByUser(){
        List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
                .eq(Shop::getAppUserId, SecurityUtils.getUserId())
@@ -71,14 +79,22 @@
     * 绑定门店
     */
    @GetMapping("/bindShop")
    @ApiOperation(value = "绑定门店", tags = {"门店"})
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
    public AjaxResult bindShop(@ApiParam("门店id") @RequestParam Long shopId){
        AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
        appUser.setShopId(shopId);
        appUserClient.editAppUserById(appUser);
        return success();
    }


    
    
    
    @ResponseBody
    @GetMapping("/getVerifiableShop")
    @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
    public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(){
        // todo 待完善 pu
        return AjaxResult.success();
    }
}