From 5fad5b026148771b103a6eed0e46dfcad3ee24a0 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 25 十一月 2024 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 6531a59..2766c5f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -4,18 +4,17 @@
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;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,7 +22,7 @@
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -31,7 +30,7 @@
*/
@RestController
@RequestMapping("/shop")
-@Api("门店")
+@Api(tags = "门店")
public class ShopController extends BaseController {
@Resource
private TechnicianService technicianService;
@@ -45,22 +44,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 +65,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 +77,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 +89,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();
}
}
--
Gitblit v1.7.1