diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java index a33564d9..66af4cca 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java @@ -173,7 +173,7 @@ public class TaskServiceImpl implements TaskService { if (taskIdCount != null) { taskDto.setUnassigned(taskIdCount.getOrDefault(taskDto.getId(), DefaultNumberConstants.ZERO_NUMBER)); } else { - taskDto.setUnassigned(taskDto.getTotalNumber()); + taskDto.setUnassigned(DefaultNumberConstants.ZERO_NUMBER); } } return PageUtil.toPage(taskDtoMap); diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java index d889718f..408ba5fc 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java @@ -54,7 +54,7 @@ public class TelephoneCallReqDTO implements Serializable { @ApiModelProperty(value = "组呼叫方式:0:双呼 1:点呼 2:AXB") private Integer callMode; - @ApiModelProperty("分机号") + @ApiModelProperty("去显号") private Long display; @NotNull private Integer clueType; diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java index 41c31dec..87c12580 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java @@ -194,35 +194,32 @@ public class TelephoneCallServiceImpl implements TelephoneCallService { if (ObjectUtil.isNull(extensionDisplay)) { return CommonResponse.createByErrorMessage("未配置去显号"); } - if (extensionDisplay.getDisplay() == null && extensionDisplay.getDyDisplay() == null) { - return CommonResponse.createByErrorMessage("未配置去显号"); - } telephoneCallReqDTO.setTelA(String.valueOf(extensionNumber.getNumber())); - if (extensionDisplay.getDisplay() != null) { - telephoneCallReqDTO.setDisplay(extensionDisplay.getDisplay()); - } -// if (telephoneCallReqDTO.getClueType() != null && telephoneCallReqDTO.getClueType() == DefaultNumberConstants.ONE_NUMBER) { -// if (extensionDisplay.getDyDisplay() == null) { -// return CommonResponse.createByErrorMessage("未配置抖音去显号"); -// } -// telephoneCallReqDTO.setDisplay(extensionDisplay.getDyDisplay()); -// } + + Long display; if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.THREE_NUMBER) { if (extensionDisplay.getDyDisplay() == null) { return CommonResponse.createByErrorMessage("未配置抖音去显号"); } - telephoneCallReqDTO.setDisplay(extensionDisplay.getDyDisplay()); + display = extensionDisplay.getDyDisplay(); } else if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.FOUR_NUMBER) { if (extensionDisplay.getDeliveryDisplay() == null) { return CommonResponse.createByErrorMessage("未配置投流去显号"); } - telephoneCallReqDTO.setDisplay(extensionDisplay.getDeliveryDisplay()); + display = extensionDisplay.getDeliveryDisplay(); } else if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.FIVE_NUMBER) { if (extensionDisplay.getTokerDisplay() == null) { return CommonResponse.createByErrorMessage("未配置拓客去显号"); } - telephoneCallReqDTO.setDisplay(extensionDisplay.getTokerDisplay()); + display = extensionDisplay.getTokerDisplay(); + } else { + if (extensionDisplay.getDisplay() == null) { + return CommonResponse.createByErrorMessage("未配置去显号"); + } + display = extensionDisplay.getDisplay(); } + //设置去显号 + telephoneCallReqDTO.setDisplay(display); } //获取线索号 Clue body;