From cd82e959bc407cc2a62a11b3ef9156cfd21d7e16 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 10 十二月 2024 10:04:14 +0800 Subject: [PATCH] 新增加管理后台接口和优化购物接口 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 23 ++++++++++------------- 1 files changed, 10 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 70f3927..41c12e5 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 @@ -7,6 +7,7 @@ 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; @@ -18,6 +19,7 @@ import com.ruoyi.other.vo.NearbyShopVO; import com.ruoyi.other.vo.ShopDetailVO; import com.ruoyi.other.vo.VerifiableShopVo; +import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -25,6 +27,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; /** @@ -47,6 +50,8 @@ private AppUserClient appUserClient; @Resource private ShopScoreService shopScoreService; + @Resource + private TokenService tokenService; @PostMapping("/getDetailById") @@ -61,22 +66,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 = {"小程序-首页-门店详情"}) @@ -116,6 +110,9 @@ @PostMapping("/shopScore") @ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"}) public R<Void> shopScore(@RequestBody ShopScore shopScore) { + LoginUser loginUserApplet = tokenService.getLoginUserApplet(); + shopScore.setAppUserId(loginUserApplet.getUserid()); + shopScore.setCreateTime(LocalDateTime.now()); shopScoreService.save(shopScore); return R.ok(); } -- Gitblit v1.7.1