From bbff55be46004d8973fc6fceee1586e6bf7f0a6b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 15:53:00 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 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 a556d35..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
@@ -100,6 +100,11 @@
@Override
public void updateById(Shop shop) {
shopMapper.updateById(shop);
+ usersMapper.update(new UpdateWrapper<Users>().lambda()
+ .set(Users::getCardImg,null)
+ .isNotNull(Users::getCardImg)
+ .eq(Users::getDepartmentId,shop.getId())
+ );
}
@Override
@@ -359,6 +364,8 @@
shop.setLegalPhone(model.getLegalPhone());
shop.setLegalIdcode(model.getLegalIdcode());
shop.setLegalName(model.getLegalName());
+ shop.setFcode(model.getFcode());
+ shop.setScode(model.getScode());
shop.setTaxRegCode(model.getTaxRegCode());
shopMapper.updateById(shop);
}
@@ -737,6 +744,7 @@
shop.setSecondType(model.getSecondType());
shop.setAttribute(model.getAttribute());
shop.setParentIamId(model.getParentOrgId());
+ shop.setScode(model.getScode());
newList.add(shop);
}else {
shop.setEditor(loginUserInfo.getId());
@@ -745,6 +753,7 @@
shop.setSecondType(model.getSecondType());
shop.setName(model.getName());
shop.setCode(model.getCode());
+ shop.setScode(model.getScode());
shop.setUnitCode(model.getUnitCode());
if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
shop.setIsdeleted(Constants.ONE);
@@ -905,7 +914,7 @@
}
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 " +
+ queryWrapper.select("ID,NAME,LINK_PHONE,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")
@@ -950,7 +959,7 @@
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");
+ shop.setDistanceStr(distanceM.divide(BigDecimal.valueOf(1)).setScale(0,BigDecimal.ROUND_HALF_UP) + "m");
}
}else{
shop.setDistanceStr(shop.getDistance().divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "km");
@@ -965,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 " );
}
}
@@ -988,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<>();
@@ -998,7 +1007,8 @@
seqNameList.add(seqName);
}
}
- shop.setSeqNameList(seqNameList);
+ Set<String> hs = new HashSet<String>(seqNameList);
+ shop.setSeqNameList(new ArrayList<String>(hs));
}
return shop;
}
@@ -1016,6 +1026,57 @@
Shop updShop = new Shop();
BeanUtils.copyProperties(editShopDTO,updShop);
shopMapper.updateById(updShop);
+ usersMapper.update(new UpdateWrapper<Users>().lambda()
+ .set(Users::getCardImg,null)
+ .isNotNull(Users::getCardImg)
+ .eq(Users::getDepartmentId,shop.getId())
+ );
+ }
+
+ @Override
+ public List<Shop> getUserShopList(Long userId) {
+ Users users = usersMapper.selectById(userId);
+ if(Objects.isNull(users)){
+ return new ArrayList<>();
+ }
+ Shop userShop = shopMapper.selectById(users.getDepartmentId());
+ if(Objects.isNull(userShop)){
+ return new ArrayList<>();
+ }
+ Boolean manageShop = true;
+ if(users.getRoleCodes().indexOf(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.ZBOM_CUSTOMIZED,Constants.USERS_MANAGE_CODE).getCode()))>=0){
+ manageShop = false;
+ }
+ List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
+ .lambda()
+ .eq(Shop::getScode,userShop.getScode())
+ .eq(Shop::getType,Constants.TWO)
+ .eq(Shop::getSecondType,Constants.THREE)
+ .apply(manageShop,"1=2")
+ );
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ 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:shopList) {
+ if(StringUtils.isBlank(shop.getOrgId())){
+ continue;
+ }
+ 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){
+ String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
+ if(Objects.nonNull(seqName)){
+ seqNameList.add(seqName);
+ }
+ }
+ Set<String> hs = new HashSet<String>(seqNameList);
+ shop.setSeqNameList(new ArrayList<String>(hs));
+ }
+ }
+ return shopList;
}
}
--
Gitblit v1.9.3