From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 98486ea..520af51 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.GeodesyUtil;
-import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
import com.ruoyi.other.mapper.ShopMapper;
-import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
@@ -40,7 +41,7 @@
@Resource
private ShopScoreService shopScoreService;
@Resource
- private RemoteOrderGoodsClient remoteOrderGoodsClient;
+ private AppUserClient appUserClient;
@Override
@@ -48,8 +49,7 @@
Page<Shop> page = new Page<>();
page.setCurrent(PageNum);
page.setSize(pageSize);
- IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
- return shopIPage;
+ return shopMapper.selectShopList(page, shop);
}
@Override
@@ -99,6 +99,12 @@
return shopDetailVO;
}
-
-
+ @Override
+ public Boolean cheUserByPhone(String phone) {
+ R<AppUser> r = appUserClient.getAppUserByPhone1(phone);
+ if (R.isError(r)){
+ return false;
+ }
+ return r.getData() != null;
+ }
}
--
Gitblit v1.7.1