From 7915bccb915fad88e885d54832b120cf2d36a036 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 18:26:56 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index a7813f5..2c79efd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -897,20 +897,23 @@
@Override
public PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap) {
- if(Objects.isNull(pageWrap.getModel())
- || Objects.isNull(pageWrap.getModel().getLatitude())
- || Objects.isNull(pageWrap.getModel().getLongitude())){
- return null;
- }
+// if(Objects.isNull(pageWrap.getModel())
+// || Objects.isNull(pageWrap.getModel().getLatitude())
+// || Objects.isNull(pageWrap.getModel().getLongitude())){
+// return null;
+// }
IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
- " CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
+// queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE" +
+// " ,CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
+ queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE ")
.eq("isdeleted",Constants.ZERO)
- .isNotNull("LATITUDE")
- .isNotNull("LONGITUDE")
- .eq("ATTRIBUTE",Constants.ONE)
- .orderByAsc(" distance ");
+// .isNotNull("LATITUDE")
+// .isNotNull("LONGITUDE")
+ .eq("TYPE",Constants.TWO)
+ .eq("SECOND_TYPE",Constants.THREE)
+ .eq("STATUS",Constants.ONE);
+// .orderByAsc(" distance ")
Utils.MP.blankToNull(pageWrap.getModel());
PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
--
Gitblit v1.9.3