From 678115e978e2eac37874363d89d6db1d9a12f4ec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 18:29:31 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 94 insertions(+), 16 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 62ed2f3..a556d35 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
@@ -21,6 +21,8 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ShopTree;
import com.doumee.dao.business.vo.ShopTreeVo;
+import com.doumee.dao.business.vo.UnitCodeVo;
+import com.doumee.dao.web.reqeust.EditShopDTO;
import com.doumee.dao.web.reqeust.ShopQueryByLLDTO;
import com.doumee.service.business.ShopService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,6 +32,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
@@ -38,10 +41,12 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
/**
* 蹇楅偊缁勭粐淇℃伅琛⊿ervice瀹炵幇
@@ -261,7 +266,30 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(shopMapper.selectPage(page, queryWrapper));
+ PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ List<CategorySeg> categorySegAllList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda()
+ .isNotNull(CategorySeg::getOrgId)
+ .eq(CategorySeg::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegAllList)){
+ for (Shop shop:pageData.getRecords()) {
+ if(StringUtils.isBlank(shop.getOrgId())){
+ continue;
+ }
+ List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
+ List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
+ List<String> seqNameList = new ArrayList<>();
+ for(CategorySeg model : categorySegList){
+ String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
+ if(Objects.nonNull(seqName)){
+ seqNameList.add(seqName);
+ }
+ }
+ shop.setSeqNameList(seqNameList);
+ }
+ }
+
+ return pageData;
}
@Override
@@ -382,7 +410,7 @@
}
@Async
- private void dealCategoryDataBiz(List<CategoryImport> dataList, Date date, LoginUserInfo loginUserInfo) {
+ public void dealCategoryDataBiz(List<CategoryImport> dataList, Date date, LoginUserInfo loginUserInfo) {
try {
List<CategorySeg> categorySegList = new ArrayList<>();
List<Segments> segmentsList = new ArrayList<>();
@@ -877,23 +905,25 @@
}
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 " +
+ " , (6371 * ACOS(COS(RADIANS("+pageWrap.getModel().getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+pageWrap.getModel().getLongitude()+")) + SIN(RADIANS("+pageWrap.getModel().getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance " )
.eq("isdeleted",Constants.ZERO)
.isNotNull("LATITUDE")
.isNotNull("LONGITUDE")
- .eq("ATTRIBUTE",Constants.ONE)
+ .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()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
for (Shop shop:pageData.getRecords()) {
+ this.dealDistance(shop);
//鏌ヨ闂ㄥ簵涓嬪璐暟鎹�
List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
.eq(Users::getIsdeleted,Constants.ZERO)
.eq(Users::getStatus,Constants.ONE)
- .eq(Users::getType,Constants.ZERO)
);
for (Users users:usersList) {
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -905,17 +935,39 @@
return pageData;
}
+ /**
+ * 澶勭悊闂ㄥ簵璺濈鏄剧ず
+ * @param shop
+ */
+ public void dealDistance(Shop shop){
+ if(Objects.isNull(shop.getDistance())){
+ shop.setDistanceStr("-");
+ }else{
+ //璺濈灏忎簬1鍏噷 鏄剧ず绫�
+ if(shop.getDistance().compareTo(BigDecimal.ONE)<Constants.ZERO){
+ BigDecimal distanceM = shop.getDistance().multiply(new BigDecimal(1000).setScale(0));
+ //100绫充箣鍐�
+ if(distanceM.compareTo(new BigDecimal(100))<0){
+ shop.setDistanceStr("<100绫�");
+ }else{
+ shop.setDistanceStr(distanceM.divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "m");
+ }
+ }else{
+ shop.setDistanceStr(shop.getDistance().divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "km");
+ }
+ }
+ }
+
@Override
public Shop shopDetail(Long id,Long memberId) {
- Member member = memberMapper.selectById(memberId);
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
- }
QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>();
- //濡傛灉浜哄憳娌℃湁缁忕含搴︿俊鎭紝鍒欎笉鏌ヨ璺濈
- if(Objects.nonNull(member.getLatitude())&&Objects.nonNull(member.getLongitude())){
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
- " CONVERT (ST_Distance_Sphere (point ("+member.getLongitude()+", "+member.getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ");
+ if(Objects.nonNull(memberId)){
+ 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 " +
+ " , (6371 * ACOS(COS(RADIANS("+member.getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+member.getLongitude()+")) + SIN(RADIANS("+member.getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance " );
+ }
}
queryWrapper.eq("id",id);
Shop shop = shopMapper.selectOne(queryWrapper);
@@ -927,17 +979,43 @@
List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
.eq(Users::getIsdeleted,Constants.ZERO)
.eq(Users::getStatus,Constants.ONE)
- .eq(Users::getType,Constants.ZERO)
);
+ this.dealDistance(shop);
for (Users users:usersList) {
if(StringUtils.isNotBlank(users.getImgurl())){
users.setImgurlFull(prefix + users.getImgurl());
}
}
shop.setUsersList(usersList);
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ List<CategorySeg> categorySegList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda().eq(CategorySeg::getOrgId,shop.getOrgId()).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<>();
+ for(CategorySeg model : categorySegList){
+ String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
+ if(Objects.nonNull(seqName)){
+ seqNameList.add(seqName);
+ }
+ }
+ shop.setSeqNameList(seqNameList);
+ }
return shop;
}
-
+ @Override
+ public void updShop(EditShopDTO editShopDTO) {
+ if(Objects.isNull(editShopDTO)
+ || Objects.isNull(editShopDTO.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Shop shop = shopMapper.selectById(editShopDTO.getId());
+ if(Objects.isNull(shop)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ Shop updShop = new Shop();
+ BeanUtils.copyProperties(editShopDTO,updShop);
+ shopMapper.updateById(updShop);
+ }
}
--
Gitblit v1.9.3