From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 6105ae0..2751b13 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
@@ -11,12 +11,14 @@
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 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;
@@ -32,7 +34,7 @@
*/
@RestController
@RequestMapping("/shop")
-@Api("门店")
+@Api(tags = "门店")
public class ShopController extends BaseController {
@Resource
private TechnicianService technicianService;
@@ -40,6 +42,14 @@
private ShopService shopService;
@Resource
private AppUserClient appUserClient;
+
+
+ @PostMapping("/getDetailById")
+ public R<Shop> getDetailById(@RequestParam("id") Long id){
+ Shop byId = shopService.getById(id);
+ return R.ok(byId);
+ }
+
/**
* 附近门店列表
@@ -54,8 +64,17 @@
/**
* 门店详情
*/
+ @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 = {"门店详情-小程序"})
+ @ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
@ApiParam("经度") @RequestParam String longitude,
@ApiParam("纬度") @RequestParam String latitude) {
@@ -66,7 +85,7 @@
* 查询当前店长所属门店
*/
@GetMapping("/shopByUser")
- @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页-关联门店列表"})
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
public R<List<Shop>> shopByUser() {
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
.eq(Shop::getAppUserId, SecurityUtils.getUserId())
@@ -85,9 +104,9 @@
appUserClient.editAppUserById(appUser);
return R.ok();
}
-
-
-
+
+
+
@ResponseBody
@GetMapping("/getVerifiableShop")
@ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
@@ -95,5 +114,18 @@
// 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);
+ }
}
--
Gitblit v1.7.1