From 686f53edd64c21516001942d0265a55fefd1be15 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 31 七月 2024 19:23:33 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 a2c4979..44ba5fd 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
@@ -974,7 +974,7 @@
Member member = memberMapper.selectById(memberId);
//濡傛灉浜哄憳娌℃湁缁忕含搴︿俊鎭紝鍒欎笉鏌ヨ璺濈
if(Objects.nonNull(member)&&Objects.nonNull(member.getLatitude())&&Objects.nonNull(member.getLongitude())){
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE " +
+ queryWrapper.select(" * " +
" , (6371 * ACOS(COS(RADIANS("+member.getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+member.getLongitude()+")) + SIN(RADIANS("+member.getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance " );
}
}
@@ -997,7 +997,7 @@
}
shop.setUsersList(usersList);
//鏌ヨ缁忚惀鑼冨洿淇℃伅
- List<CategorySeg> categorySegList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda().eq(CategorySeg::getOrgId,shop.getOrgId()).eq(CategorySeg::getIsdeleted,Constants.ZERO));
+ List<CategorySeg> categorySegList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda().eq(CategorySeg::getScode,shop.getScode()).eq(CategorySeg::getIsdeleted,Constants.ZERO));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegList)){
List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
List<String> seqNameList = new ArrayList<>();
@@ -1007,7 +1007,8 @@
seqNameList.add(seqName);
}
}
- shop.setSeqNameList(seqNameList);
+ Set<String> hs = new HashSet<String>(seqNameList);
+ shop.setSeqNameList(new ArrayList<String>(hs));
}
return shop;
}
@@ -1044,7 +1045,7 @@
}
Boolean manageShop = true;
if(users.getRoleCodes().indexOf(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ZBOM_CUSTOMIZED,Constants.USERS_MANAGE_CODE).getCode()))>=0){
- users.setManageShop(false);
+ manageShop = false;
}
List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
.lambda()
@@ -1062,7 +1063,7 @@
if(StringUtils.isBlank(shop.getOrgId())){
continue;
}
- List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
+ List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getScode().equals(shop.getScode())).collect(Collectors.toList());
List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
List<String> seqNameList = new ArrayList<>();
for(CategorySeg model : categorySegList){
@@ -1071,7 +1072,8 @@
seqNameList.add(seqName);
}
}
- shop.setSeqNameList(seqNameList);
+ Set<String> hs = new HashSet<String>(seqNameList);
+ shop.setSeqNameList(new ArrayList<String>(hs));
}
}
return shopList;
--
Gitblit v1.9.3