From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 de346ca..79ad2ef 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
@@ -1,12 +1,17 @@
package com.ruoyi.other.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.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;
@@ -35,6 +40,18 @@
private ShopMapper shopMapper;
@Resource
private ShopScoreService shopScoreService;
+ @Resource
+ private AppUserClient appUserClient;
+
+
+ @Override
+ public IPage<Shop> getShopList(Integer PageNum, Integer pageSize, Shop shop) {
+ Page<Shop> page = new Page<>();
+ page.setCurrent(PageNum);
+ page.setSize(pageSize);
+ IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
+ return shopIPage;
+ }
@Override
public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
@@ -83,6 +100,12 @@
return shopDetailVO;
}
-
-
+ @Override
+ public Boolean cheUserByPhone(String phone) {
+ R<AppUser> r = appUserClient.getAppUserByPhone(phone);
+ if (R.isError(r)){
+ return false;
+ }
+ return r.getData() != null;
+ }
}
--
Gitblit v1.7.1