From 2c249b86e922aef7397dc496fe5bbd84730b0772 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 18:35:04 +0800
Subject: [PATCH] 修改启动异常
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 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 2751b13..d42134e 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,22 +6,23 @@
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.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 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;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -76,8 +77,8 @@
@GetMapping("/shopDetail")
@ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
- @ApiParam("经度") @RequestParam String longitude,
- @ApiParam("纬度") @RequestParam String latitude) {
+ @ApiParam("经度") @RequestParam BigDecimal longitude,
+ @ApiParam("纬度") @RequestParam BigDecimal latitude) {
return R.ok(shopService.getShopDetail(shopId, longitude, latitude));
}
@@ -101,8 +102,7 @@
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
- appUserClient.editAppUserById(appUser);
- return R.ok();
+ return appUserClient.editAppUserById(appUser);
}
@@ -127,5 +127,18 @@
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