From 0701ecf76dc11d54786690998f0b24fcfbc4bb00 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 19:28:47 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 980350e..d40808b 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,9 +1,12 @@
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.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserClient;
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.ShopScore;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.api.domain.Shop;
@@ -35,6 +38,15 @@
private ShopMapper shopMapper;
@Resource
private ShopScoreService shopScoreService;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
+
+
+ @Override
+ public List<Shop> getShopList(Shop shop) {
+ IPage<Shop> shopIPage = shopMapper.selectShopList(null, null);
+ return shopIPage.getRecords();
+ }
@Override
public List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude) {
@@ -83,9 +95,6 @@
return shopDetailVO;
}
- public static void main(String[] args) {
- String userLocation = String.format("%s,%s", "106.6664549", "29.4158471");
- System.out.println(userLocation);
- }
+
}
--
Gitblit v1.7.1