From f2b942f4ccd12a823bcb7045d99c15d2e123ce88 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 17:15:49 +0800
Subject: [PATCH] 1.后台管理-商品管理
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 26 +++++++++++++++++++++-----
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 7 ++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 1 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 3 +++
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
index b74f3c6..384ee70 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -70,6 +70,11 @@
public R<Void> addAppUserShop(AppUserShop appUserShop) {
return R.fail("添加失败");
}
- };
+
+ @Override
+ public R<AppUser> getAppUserByPhone(String phone) {
+ return R.fail("通过手机号查询用户失败");
+ }
+ };
}
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 761a32e..56c7034 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -57,4 +57,7 @@
@PostMapping("/app-user/getVipCount")
R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );
+ @GetMapping("/getAppUserByPhone")
+ public R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index d84d818..2138ca3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -343,7 +343,6 @@
@GetMapping("/getAppUserByPhone")
- @ApiOperation(value = "根据手机号获取用户信息",tags = {"后台管理-门店管理-通过手机号校验用户是否存在"})
public R<AppUser> getAppUserByPhone(String phone){
AppUser appUser = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
return R.ok(appUser);
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 fc73323..416d645 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
@@ -116,12 +116,28 @@
return R.ok(shopIPage);
}
+ /**
+ * 通过手机号校验店长
+ */
+ @PostMapping("/cheUserByPhone")
+ @ApiOperation(value = "通过手机号校验店长", tags = {"后台管理-门店管理"})
+ public R<Void> cheUserByPhone(@RequestParam("phone") String phone) {
+ R<AppUser> r = appUserClient.getAppUserByPhone(phone);
+ if (R.isError(r)){
+ return R.fail("检验失败");
+ }
+ if (r.getData() == null){
+ return R.fail("未查询到用户");
+ }
+ return R.ok();
+ }
+
/**
* 附近门店列表
*/
@GetMapping("/nearbyShopList")
- @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
+ @ApiOperation(value = "附近门店列表", tags = {"小程序-首页"})
public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
return R.ok(shopService.nearbyShopList(longitude, latitude));
@@ -129,7 +145,7 @@
@GetMapping("/shopDetail")
- @ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
+ @ApiOperation(value = "门店详情", tags = {"小程序-首页"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
@@ -140,7 +156,7 @@
* 查询当前店长所属门店
*/
@GetMapping("/shopByUser")
- @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
public R<List<Shop>> shopByUser() {
R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
if (R.isSuccess(r)){
@@ -156,7 +172,7 @@
* 绑定门店
*/
@GetMapping("/bindShop")
- @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
+ @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
@@ -168,7 +184,7 @@
* @return
*/
@PostMapping("/shopScore")
- @ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
+ @ApiOperation(value = "门店打分", tags = {"小程序-个人中心"})
public R<Void> shopScore(@RequestBody ShopScore shopScore) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
shopScore.setAppUserId(loginUserApplet.getUserid());
--
Gitblit v1.7.1