From ed2ca4bd91889878f5cc40ea9cd1d4afd8240dfd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 18:27:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 997c576..956dc80 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
@@ -12,13 +12,9 @@
import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.TechnicianService;
-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 com.ruoyi.other.vo.VerifiableShopVo;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -33,7 +29,7 @@
*/
@RestController
@RequestMapping("/shop")
-@Api("门店")
+@Api(tags = "门店")
public class ShopController extends BaseController {
@Resource
private TechnicianService technicianService;
@@ -42,12 +38,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 +65,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 +77,25 @@
* 绑定门店
*/
@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 = {"购物车-小程序"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "goodsId", value = "商品id数组", required = true, dataType = "int"),
+ })
+ public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(List<Integer> goodsId){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1