From b0cc9bd3619e69fa4c8bbdedebb56435cfd74a8f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 11:24:51 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 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 212f7ae..68b621e 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
@@ -9,7 +9,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.GeodesyUtil;
+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;
@@ -25,10 +28,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;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -63,24 +63,46 @@
@Override
public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
- Long userid = tokenService.getLoginUserApplet().getUserid();
- AppUser appUser = appUserClient.getAppUserById(userid);
- List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, longitude);
- if(null != appUser.getShopId()){
- NearbyShopVO nearbyShopVO = nearbyShopVOS.stream().filter(s -> s.getId().equals(appUser.getShopId().longValue())).findFirst().get();
- if(null != nearbyShopVO){
- nearbyShopVOS.remove(nearbyShopVO);
+ 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();
+ for (NearbyShopVO nearbyShopVO : nearbyShopVOS) {
+ Double wgs84 = GeodesyUtil.getDistance(nearbyShopVO.getLongitude() + "," + nearbyShopVO.getLatitude(), longitude + "," + latitude).get("WGS84");
+ nearbyShopVO.setDistance(new BigDecimal(wgs84).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
+ nearbyShopVOS.sort(new Comparator<NearbyShopVO>() {
+ @Override
+ public int compare(NearbyShopVO o1, NearbyShopVO o2) {
+ return o1.getDistance().compareTo(o2.getDistance());
+ }
+ });
+
+ if(null != appUser && null != appUser.getShopId()){
+ AppUser finalAppUser = appUser;
+ Optional<NearbyShopVO> first = nearbyShopVOS.stream().filter(s -> s.getId().equals(finalAppUser.getShopId().longValue())).findFirst();
+ if(first.isPresent()){
+ NearbyShopVO nearbyShopVO = first.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(null != shop && shop.getDelFlag() == 0 && shop.getStatus() == 1){
+ 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(new BigDecimal(wgs84).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ nearbyShopVOS.add(0, vo);
+ }
}
if (nearbyShopVOS == null || nearbyShopVOS.isEmpty()) {
return Collections.emptyList();
@@ -93,7 +115,9 @@
}
Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
+ AppUser finalAppUser1 = appUser;
nearbyShopVOS.forEach(nearbyShopVO -> {
+ nearbyShopVO.setScore("5");
List<ShopScore> scores = shopScoreMap.get(nearbyShopVO.getId());
if (scores != null && !scores.isEmpty()){
BigDecimal score = scores.stream()
@@ -101,6 +125,11 @@
.reduce(BigDecimal.ZERO, BigDecimal::add)
.divide(new BigDecimal(scores.size()), 1, RoundingMode.HALF_UP);
nearbyShopVO.setScore(score.toString());
+ nearbyShopVO.setMyScore("0");
+ if(null != finalAppUser1){
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, finalAppUser1.getId()).eq(ShopScore::getShopId, nearbyShopVO.getId()).last(" order by create_time desc limit 0, 1"));
+ nearbyShopVO.setMyScore(null == one ? "0" : one.getScore().toString());
+ }
}
});
return nearbyShopVOS;
@@ -108,12 +137,14 @@
@Override
public ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
// 查询店铺详情
ShopDetailVO shopDetailVO = shopMapper.selectShopDetail(shopId);
if (shopDetailVO == null) {
throw new ServiceException("查询店铺不存在");
}
-
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shopId).last(" order by create_time desc limit 0, 1"));
+ shopDetailVO.setMyScore(null == one ? BigDecimal.ZERO : one.getScore());
// 计算距离
if (shopDetailVO.getLongitude() != null && shopDetailVO.getLatitude() != null){
String shopLocation = String.format("%s,%s", shopDetailVO.getLongitude(), shopDetailVO.getLatitude());
--
Gitblit v1.7.1