diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 34a8d1c3..71721454 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -746,6 +746,10 @@ public class UserServiceImpl implements UserService { convert.setCompanyType(companyByUserId.getCompanyType()); convert.setCompanyStatus(companyByUserId.getStatus()); } + ChannelCustom custom = channelCustomRepository.findByUserId(user.getId()); + if (custom != null) { + convert.setSurplusNum(custom.getSurplusNum()); + } } OrganizeUser organizeUser = organizeUserRepository.findByUserId(user.getId()); if (organizeUser != null) { diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java index 5c5575ea..1317ea6b 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java +++ b/ad-platform-pojo/src/main/java/com/baiye/model/dto/UserDto.java @@ -96,4 +96,6 @@ public class UserDto extends BaseDTO implements Serializable { private Integer turnCrmNum; private String jobNumber; + + private Integer surplusNum; } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index aee6cef5..a2a02f97 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -1081,6 +1081,7 @@ public class ClueServiceImpl implements ClueService { // 查询是否自动分配 CommonResponse response = taskClient.findTaskDistribution(taskId); + Integer saveNumber = DefaultNumberConstants.ZERO_NUMBER; if (response.getStatus() == DefaultNumberConstants.ZERO_NUMBER) { DynamicTaskDistributionDTO responseData = response.getData(); // 开启了自动分配 @@ -1111,11 +1112,12 @@ public class ClueServiceImpl implements ClueService { // 判断是否包含数据 if (CollUtil.isNotEmpty(data.getResponseList())) { phoneList = data.getResponseList().stream().map(String::valueOf).collect(Collectors.toList()); - return this.saveClueTalk(phoneList, tagList, taskId, userId, num, data.getDeptId(), DefaultNumberConstants.ONE_NUMBER); + Integer integer = this.saveClueTalk(phoneList, tagList, taskId, userId, num, data.getDeptId(), DefaultNumberConstants.ONE_NUMBER); + saveNumber += integer; } } } - return DefaultNumberConstants.ZERO_NUMBER; + return saveNumber; } } }