From 296fc0dbd38fb9528c9d1f91ec9bc3758e27e994 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 19:31:20 +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 | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 0c185d7..41cfa35 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
@@ -364,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);
}
@@ -742,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());
@@ -750,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);
@@ -1028,4 +1032,44 @@
);
}
+ @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<>();
+ }
+ List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
+ .lambda()
+ .eq(Shop::getScode,userShop.getScode())
+ .eq(Shop::getType,Constants.TWO)
+ .eq(Shop::getSecondType,Constants.THREE)
+ );
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ 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.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 shopList;
+ }
+
}
--
Gitblit v1.9.3