From fd9ee9caa17d4d722532f6536d53ce40254fa722 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 18:02:02 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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 e9f86d1..39cf8ce 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
@@ -6,12 +6,10 @@
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.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
-import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
@@ -54,6 +52,7 @@
private TokenService tokenService;
+
@PostMapping("/getDetailById")
public R<Shop> getDetailById(@RequestParam("id") Long id){
Shop byId = shopService.getById(id);
@@ -66,22 +65,11 @@
*/
@GetMapping("/nearbyShopList")
@ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
- public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam String longitude,
- @ApiParam("纬度") @RequestParam String latitude) {
+ public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam BigDecimal longitude,
+ @ApiParam("纬度") @RequestParam BigDecimal 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 = {"小程序-首页-门店详情"})
@@ -121,8 +109,8 @@
@PostMapping("/shopScore")
@ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
public R<Void> shopScore(@RequestBody ShopScore shopScore) {
- LoginUser loginUser = tokenService.getLoginUser();
- shopScore.setAppUserId(loginUser.getUserid());
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ shopScore.setAppUserId(loginUserApplet.getUserid());
shopScore.setCreateTime(LocalDateTime.now());
shopScoreService.save(shopScore);
return R.ok();
@@ -163,5 +151,12 @@
Shop one = shopService.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getPhone, phone).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
return R.ok(one);
}
+
+ @PostMapping("/getShopByUserIds")
+ public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getAppUserId, userIds));
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1