From c8fbd36e4c1e2cae4751b8130d62621e9f08beb7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:52:49 +0800
Subject: [PATCH] 12.4

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 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 2ff4a44..130409a 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
@@ -17,13 +17,18 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
+import com.ruoyi.other.vo.NearbyShopVO;
+import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.other.vo.VerifiableShopVo;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author luodangjia
@@ -31,7 +36,7 @@
  */
 @RestController
 @RequestMapping("/shop")
-@Api("门店")
+@Api(tags = "门店")
 public class ShopController extends BaseController {
     @Resource
     private TechnicianService technicianService;
@@ -53,14 +58,13 @@
      */
     @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 = {"技师列表-小程序"})
@@ -71,16 +75,24 @@
                 .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));
+    }
+
     /**
      * 查询当前店长所属门店
      */
     @GetMapping("/shopByUser")
-    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页-关联门店列表"})
-    public AjaxResult shopByUser(){
+    @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
+    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);
     }
 
     /**
@@ -88,13 +100,47 @@
      */
     @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();
     }
 
 
+
+    @ResponseBody
+    @GetMapping("/getVerifiableShop")
+    @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
+    public R<List<VerifiableShopVo>> getVerifiableShop(){
+        // todo 待完善 pu
+        return R.ok();
+    }
+    
+    
+    /**
+     * 根据id获取门店信息
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getShopById")
+    public R<Shop> getShopById(@RequestParam("id") Integer id){
+        Shop shop = shopService.getById(id);
+        return R.ok(shop);
+    }
+    
+    
+    /**
+     * 根据店铺管理员电话获取门店数据
+     * @param phone
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getShopByPhone")
+    public R<Shop> getShopByPhone(@RequestParam("phone") String phone){
+        Shop one = shopService.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getPhone, phone).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+        return R.ok(one);
+    }
 }
 

--
Gitblit v1.7.1