1.完善swagger配置配置信息 2.shop实体类添加字段：1.封面图 2.详情图 3.添加购物车实体类、mapper、service、contr...

phpcjl

2024-11-25 1364b5595d2d9d0cfe0bb5c1f0eb825679b7561a

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

@@ -4,14 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
import com.ruoyi.other.vo.VerifiableShopVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,7 +24,7 @@

/**
 * <p>
 *  前端控制器
 * 前端控制器
 * </p>
 *
 * @author luodangjia
@@ -45,22 +46,20 @@
     */
    @GetMapping("/nearbyShopList")
    @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
    public AjaxResult nearbyShopList(@ApiParam("经度") @RequestParam String longitude,
                                     @ApiParam("纬度") @RequestParam String latitude){
        return success(shopService.nearbyShopList(longitude,latitude));
    public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam String longitude,
                                                @ApiParam("纬度") @RequestParam String latitude) {
        return R.ok(shopService.nearbyShopList(longitude, latitude));
    }


    /**
     * 指定门店技师列表
     * 门店详情
     */
    @GetMapping("/technicianList")
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public AjaxResult technicianList(@ApiParam("门店id") @RequestParam String shopId){
        return success(technicianService.list(new LambdaQueryWrapper<Technician>()
                .eq(Technician::getShopId,shopId)
                .eq(Technician::getStatus,2)
                .eq(Technician::getSubscribeStatus,1)));
    @GetMapping("/shopDetail")
    @ApiOperation(value = "门店详情", tags = {"门店详情-小程序"})
    public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
                                      @ApiParam("经度") @RequestParam String longitude,
                                      @ApiParam("纬度") @RequestParam String latitude) {
        return R.ok(shopService.getShopDetail(shopId, longitude, latitude));
    }

    /**
@@ -68,11 +67,11 @@
     */
    @GetMapping("/shopByUser")
    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页-关联门店列表"})
    public AjaxResult shopByUser(){
    public R<List<Shop>> shopByUser() {
        List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
                .eq(Shop::getAppUserId, SecurityUtils.getUserId())
                .eq(Shop::getStatus, ShopStatus.SHOP_STATUS_NORMAL.getCode()));
        return success(list);
        return R.ok(list);
    }

    /**
@@ -80,11 +79,11 @@
     */
    @GetMapping("/bindShop")
    @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
    public AjaxResult bindShop(@ApiParam("门店id") @RequestParam Long shopId){
    public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
        AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
        appUser.setShopId(shopId);
        appUserClient.editAppUserById(appUser);
        return success();
        return R.ok();
    }
    
    
@@ -92,9 +91,9 @@
    @ResponseBody
    @GetMapping("/getVerifiableShop")
    @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
    public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(){
    public R<List<VerifiableShopVo>> getVerifiableShop(){
        // todo 待完善 pu
        return AjaxResult.success();
        return R.ok();
    }
}