From 639eb18312a62ac2a76e2b59e16bcc1ff8d70d03 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 18:00:59 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index 5e2cce9..cb752f4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -18,12 +18,14 @@
 import com.doumee.dao.business.model.Goods;
 import com.doumee.dao.business.model.Labels;
 import com.doumee.dao.web.response.LabelsResponse;
+import com.doumee.service.business.AreasService;
 import com.doumee.service.business.LabelsService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
@@ -54,6 +56,8 @@
     private AreasMapper areasMapper;
 
     @Autowired
+    private AreasService areasService;
+    @Autowired
     private SystemDictDataBiz systemDictDataBiz;
 
     @Autowired
@@ -64,6 +68,8 @@
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         labels.setCreator(user.getId());
         labels.setCreateDate(new Date());
+        labels.setEditor(user.getId());
+        labels.setEditDate(labels.getCreateDate());
         labels.setIsdeleted(Constants.ZERO);
         labels.setStatus(Constants.ZERO);
     /*  if(labels.getParentId()!=null){
@@ -79,6 +85,7 @@
             areasMapper.update(null,new UpdateWrapper<Areas>().lambda()
                     .set(Areas::getBigAreaId,labels.getId())
                     .in(Areas::getId,labels.getAreaIdList()));
+            areasService.cacheData();
         }
         return labels.getId();
     }
@@ -106,6 +113,15 @@
         labels.setEditDate(new Date());
         labels.setEditor(user.getId());
         labelsMapper.updateById(labels);
+        if(query!=null && Constants.equalsInteger(query.getType(),Constants.LabelsType.BIG_AREA.getKey())){
+            int num =  areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
+                    .set(Areas::getBigAreaId, null)
+                    .eq(Areas::getBigAreaId, labels.getId()));
+            if(num>0){
+                areasService.cacheData();
+            }
+        }
+
     }
 
     @Override
@@ -125,13 +141,20 @@
         }
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Labels labels=new Labels();
-        ids.stream().forEach(s->{
+        int num =0;
+        for(Integer s : ids){
             labels.setId(s);
             labels.setIsdeleted(Constants.ONE);
             labels.setEditDate(new Date());
             labels.setEditor(user.getId());
             labelsMapper.updateById(labels);
-        });
+            num +=  areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
+                    .set(Areas::getBigAreaId, null)
+                    .eq(Areas::getBigAreaId, labels.getId()));
+        }
+        if(num>0){
+            areasService.cacheData();
+        }
     }
 
     @Override
@@ -149,15 +172,18 @@
         labelsMapper.updateById(labels);
         if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())){
             //鍏堟竻绌哄師鏉ユ墍鏈夌粦瀹氱殑鏁版嵁
-            areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
+           int num =  areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
                     .set(Areas::getBigAreaId, null)
                     .eq(Areas::getBigAreaId, labels.getId()));
             if( labels.getAreaIdList()!=null
                     &&labels.getAreaIdList().size()>0){
                 //璁剧疆鏈�鏂扮粦瀹氱殑鏁版嵁
-                areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
+                num +=   areasMapper.update(null, new UpdateWrapper<Areas>().lambda()
                         .set(Areas::getBigAreaId, labels.getId())
                         .in(Areas::getId, labels.getAreaIdList()));
+            }
+            if(num>0){
+                areasService.cacheData();
             }
         }
     }
@@ -206,10 +232,7 @@
 
     @Override
     public List<Labels> findList(Labels labels) {
-
-
         MPJLambdaWrapper<Labels> query = new MPJLambdaWrapper<>();
-
         if(labels!=null&&labels.getParentId()!=null){
             query.eq(Labels::getParentId,labels.getParentId());
         }else{
@@ -222,7 +245,15 @@
         }
         query.eq(Labels::getIsdeleted,Constants.ZERO);
         query.eq(labels.getType()!=null,Labels::getType,labels.getType());
+        query.orderByAsc(Labels::getSortnum);
         List<Labels> list= labelsJoinMapper.selectList(query);
+        List<Labels> childList= null;
+        if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+            childList= labelsJoinMapper.selectList(new QueryWrapper<Labels>().lambda()
+                    .eq(Labels::getIsdeleted,Constants.ZERO)
+                    .eq(Labels::getType,Constants.LabelsType.SERIES_BRAND.getKey())
+                    .orderByAsc(Labels::getSortnum));
+        }
         for(Labels model:list){
             if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())){
                 //濡傛灉鏄ぇ鍖轰俊鎭紝鏌ヨ鎵�鏈夌粦瀹氶鐪佷唤淇℃伅
@@ -230,6 +261,24 @@
                         .eq(Areas::getIsdeleted,Constants.ZERO)
                         .eq(Areas::getBigAreaId,model.getId())));
             }
+            if(Constants.equalsInteger(labels.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())
+                    &&Constants.equalsInteger(model.getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+                //濡傛灉鏄�傚簲鍝佺墝锛屽垯鏌ヨ涓嬬骇绯诲垪
+                model.setChildList(getChildListbyParentId(childList,model.getId()));
+            }
+        }
+        return list;
+    }
+
+    private List<Labels> getChildListbyParentId(List<Labels> childList, Integer id) {
+        List<Labels> list = new ArrayList<>();
+        if(childList!=null && childList.size()>0){
+            for(Labels labels : childList){
+                if(Constants.equalsInteger(labels.getParentId(),id)){
+                    list.add(labels);
+                }
+            }
+
         }
         return list;
     }
@@ -243,6 +292,15 @@
 
         queryWrapper.selectAll(Labels.class);
         queryWrapper.select("(select name from labels where id=t.PARENT_ID) as parentName");
+        if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.HOMEZHUANQU.getKey())){
+            queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.ZHUANQU_IDS like concat('%[',t.id,']%') ) as goodsNum");
+        }
+        if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+            queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.BRAND_IDS like concat('%[',t.id,']%') ) as goodsNum");
+        }
+        if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.SERIES_BRAND.getKey())){
+            queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.SERIAL_IDS like concat('%[',t.id,']%') ) as goodsNum");
+        }
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Labels::getName,pageWrap.getModel().getName());
         queryWrapper.eq(pageWrap.getModel().getParentId()!=null,Labels::getParentId,pageWrap.getModel().getParentId());
         queryWrapper.eq(pageWrap.getModel().getType()!=null,Labels::getType,pageWrap.getModel().getType());
@@ -264,12 +322,17 @@
         IPage<Labels> result =  labelsJoinMapper.selectJoinPage(page,Labels.class, queryWrapper);
      /*   String resourcePath=systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode();*/
         if(org.apache.commons.collections.CollectionUtils.isNotEmpty(result.getRecords())){
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+                    + systemDictDataBiz.queryByCode(Constants.OSS,Constants.LABELS_IMG).getCode();
             for(Labels model:result.getRecords()){
                if(model.getParentId()==null){
                    model.setTypeLevel(0);
                }else{
                    model.setTypeLevel(1);
                }
+               if(StringUtils.isNotBlank(model.getImgurl())){
+                   model.setImgFullurl(path + model.getImgurl());
+               }
                if(Constants.equalsInteger(model.getType(),Constants.LabelsType.BIG_AREA.getKey())){
                     //濡傛灉鏄ぇ鍖轰俊鎭紝鏌ヨ鎵�鏈夌粦瀹氶鐪佷唤淇℃伅
                     model.setAreaList(areasMapper.selectList(new LambdaQueryWrapper<Areas>()

--
Gitblit v1.9.3