zhangkaikai hace 1 año
padre
commit
77eacf67ef

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

@@ -195,8 +195,8 @@ public class SaleSiteMgrController extends BaseApiController {
                 if (StringUtils.isEmpty(channelImportExcel.getName())) {
                     return AjaxResult.error("导入的门店名称存在空值");
                 }
-                if (StringUtils.isEmpty(channelImportExcel.getParentsName())) {
-                    return AjaxResult.error("导入的上级渠道为空");
+                if (StringUtils.isEmpty(channelImportExcel.getParentsMobile())) {
+                    return AjaxResult.error("导入的上级渠道(手机号)为空");
                 }
                 if (channelImportExcel.getCommRate() == null) {
                     return AjaxResult.error("导入的佣金比例为空");
@@ -221,7 +221,8 @@ public class SaleSiteMgrController extends BaseApiController {
             List<ChannelImportErrorVO> channelImportErrorVOS = new ArrayList<>();
             siteList.forEach(importExcel -> {
                 ChannelImportErrorVO importErrorVO = mapperFacade.map(importExcel, ChannelImportErrorVO.class);
-                Channel parentsChannel = channelService.getOne(new QueryWrapper<Channel>().eq("name", importExcel.getParentsName()));
+                Channel parentsChannel = channelService.getOne(
+                        new LambdaQueryWrapper<Channel>().eq(Channel::getMobile, importExcel.getParentsMobile()));
                 if (parentsChannel == null) {
                     importErrorVO.setErrorReason("上级渠道不存在");
                 } else {

+ 2 - 2
mp-service/src/main/java/com/qs/mp/admin/domain/excel/ChannelImportExcel.java

@@ -23,6 +23,6 @@ public class ChannelImportExcel {
     @Excel(name = "佣金比例(%)")
     private BigDecimal commRate;
 
-    @Excel(name = "上级渠道")
-    private String parentsName;
+    @Excel(name = "上级渠道(手机号)")
+    private String parentsMobile;
 }

+ 2 - 1
mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -250,7 +250,8 @@ public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> impl
             }
 
             // 注册门店
-            Channel parentsChannel = channelService.getOne(new QueryWrapper<Channel>().eq("name", site.getParentsName()));
+            Channel parentsChannel = channelService.getOne(
+                    new LambdaQueryWrapper<Channel>().eq(Channel::getMobile, site.getParentsMobile()));
             Channel channel = new Channel();
             channel.setUserId(user.getUserId());
             channel.setName(site.getName());