From 210828d1a6947596fe00ab30fcd8725c6714dde4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 21:04:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 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 d40808b..16b42b6 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
@@ -2,14 +2,20 @@
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.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+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;
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;
@@ -19,6 +25,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -39,18 +46,46 @@
@Resource
private ShopScoreService shopScoreService;
@Resource
- private RemoteOrderGoodsClient remoteOrderGoodsClient;
+ private AppUserClient appUserClient;
+ @Resource
+ private TokenService tokenService;
@Override
- public List<Shop> getShopList(Shop shop) {
- IPage<Shop> shopIPage = shopMapper.selectShopList(null, null);
- return shopIPage.getRecords();
+ public IPage<Shop> getShopList(Integer PageNum, Integer pageSize, Shop shop) {
+ Page<Shop> page = new Page<>();
+ page.setCurrent(PageNum);
+ page.setSize(pageSize);
+ return shopMapper.selectShopList(page, shop);
}
@Override
public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
+ String token = SecurityUtils.getToken(ServletUtils.getRequest());
+ AppUser appUser = null;
+ if(StringUtils.isNotEmpty(token)){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ appUser = appUserClient.getAppUserById(userid);
+ }
+
List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, longitude);
+ if(null != appUser && null != appUser.getShopId()){
+ AppUser finalAppUser = appUser;
+ NearbyShopVO nearbyShopVO = nearbyShopVOS.stream().filter(s -> s.getId().equals(finalAppUser.getShopId().longValue())).findFirst().get();
+ if(null != nearbyShopVO){
+ nearbyShopVOS.remove(nearbyShopVO);
+ }
+
+ Shop shop = shopMapper.selectById(appUser.getShopId());
+ NearbyShopVO vo = new NearbyShopVO();
+ vo.setId(appUser.getShopId().longValue());
+ vo.setName(shop.getName());
+ vo.setAddress(shop.getAddress());
+ vo.setHomePicture(shop.getHomePicture());
+ Double wgs84 = GeodesyUtil.getDistance(longitude.toString() + "," + latitude.toString(), shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ vo.setDistance(wgs84.toString());
+ nearbyShopVOS.add(0, vo);
+ }
if (nearbyShopVOS == null || nearbyShopVOS.isEmpty()) {
return Collections.emptyList();
}
@@ -62,7 +97,6 @@
}
Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
-
nearbyShopVOS.forEach(nearbyShopVO -> {
List<ShopScore> scores = shopScoreMap.get(nearbyShopVO.getId());
if (scores != null && !scores.isEmpty()){
@@ -95,6 +129,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