From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 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 38fcdf3..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;
@@ -16,6 +21,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -34,12 +40,32 @@
private ShopMapper shopMapper;
@Resource
private ShopScoreService shopScoreService;
+ @Resource
+ private AppUserClient appUserClient;
+
@Override
- public List<NearbyShopVO> nearbyShopList(String longitude, String latitude) {
- List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, latitude);
+ 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) {
+ List<NearbyShopVO> nearbyShopVOS = shopMapper.selectNearbyShopList(longitude, longitude);
+ if (nearbyShopVOS == null || nearbyShopVOS.isEmpty()) {
+ return Collections.emptyList();
+ }
+
List<Long> shopIds = nearbyShopVOS.stream().map(NearbyShopVO::getId).collect(Collectors.toList());
List<ShopScore> shopScores = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().in(ShopScore::getShopId, shopIds));
+ if (shopScores == null || shopScores.isEmpty()) {
+ return nearbyShopVOS;
+ }
+
Map<Long, List<ShopScore>> shopScoreMap = shopScores.stream().collect(Collectors.groupingBy(ShopScore::getShopId));
nearbyShopVOS.forEach(nearbyShopVO -> {
@@ -74,9 +100,12 @@
return shopDetailVO;
}
- public static void main(String[] args) {
- String userLocation = String.format("%s,%s", "106.6664549", "29.4158471");
- System.out.println(userLocation);
+ @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