门店修改上级渠道

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelMgrController.java

@@ -153,19 +153,21 @@ public class ChannelMgrController extends BaseApiController {
         queryWrapper.eq(null != channel && null != channel.getCityId(), "t1.city_id", channel.getCityId());
         queryWrapper.eq(null != channel && null != channel.getAreaId(), "t1.area_id", channel.getAreaId());
         list = channelService.selectChannelList(queryWrapper);
-        for(ChannelVO channelVO : list){
-            //判断当前渠道下有无子渠道和门店
-            LambdaQueryWrapper<Channel> queryWrapper1 = new LambdaQueryWrapper<>();
-            queryWrapper1.eq(Channel::getParentId, channelVO.getChannelId());
-            queryWrapper1.gt(Channel::getLevel, -1);
-            int channelCount = channelService.count(queryWrapper1);
-            if (channelCount > 0) {
-                channelVO.setIsTransform(false);
-            }else {
-                channelVO.setIsTransform(true);
+
+        if (null != list && list.size() > 0) {
+            for (ChannelVO channelVO : list) {
+                //判断当前渠道下有无子渠道和门店
+                LambdaQueryWrapper<Channel> queryWrapper1 = new LambdaQueryWrapper<>();
+                queryWrapper1.eq(Channel::getParentId, channelVO.getChannelId());
+                queryWrapper1.gt(Channel::getLevel, -1);
+                int channelCount = channelService.count(queryWrapper1);
+                if (channelCount > 0) {
+                    channelVO.setIsTransform(false);
+                } else {
+                    channelVO.setIsTransform(true);
+                }
             }
         }
-
         return getDataTable(list);
     }
 
@@ -441,7 +443,7 @@ public class ChannelMgrController extends BaseApiController {
         Channel parentChannel = channelService.getById(channelParam.getParentId());
         boolean mobileChange = false;  // 手机号码是否有变更
         channel.setParentId(channelParam.getParentId());
-        channel.setLevel(2);
+        channel.setLevel(0);
         channel.setChannelNo(parentChannel.getChannelNo()+"."+channel.getChannelId());
         //佣金比例暂定为0
         channel.setCommRate(BigDecimal.ZERO);

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/SaleSiteMgrController.java

@@ -483,7 +483,8 @@ public class SaleSiteMgrController extends BaseApiController {
 
         boolean rtn = channelService.update(new LambdaUpdateWrapper<Channel>()
             .set(Channel::getName, saleSiteEditParam.getName())
-            .set(Channel::getParentId, parentChannel.getChannelNo()+"."+channel.getChannelId())
+            .set(Channel::getChannelNo, parentChannel.getChannelNo()+"."+channel.getChannelId())
+            .set(Channel::getParentId, saleSiteEditParam.getParentId())
             .set(Channel::getMobile, saleSiteEditParam.getMobile())
             .set(saleSiteEditParam.getCommFlag() != null, Channel::getCommFlag, saleSiteEditParam.getCommFlag())
             .eq(Channel::getChannelId, saleSiteEditParam.getChannelId()));