修改条数

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) {

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;
 }

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<DynamicTaskDistributionDTO>
                     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;
                     }
                 }
             }