From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 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 359acf3..6531a59 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
@@ -2,15 +2,24 @@
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.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 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.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -22,23 +31,70 @@
*/
@RestController
@RequestMapping("/shop")
+@Api("门店")
public class ShopController extends BaseController {
@Resource
private TechnicianService technicianService;
+ @Resource
+ private ShopService shopService;
+ @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));
+ }
/**
* 指定门店技师列表
*/
- @RequestMapping("/technicianList")
- public AjaxResult technicianList(@RequestParam String shopId){
+ @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("/shopByUser")
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页-关联门店列表"})
+ public AjaxResult 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);
+ }
+
+ /**
+ * 绑定门店
+ */
+ @GetMapping("/bindShop")
+ @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();
+ }
}
--
Gitblit v1.7.1