修改分机号配值

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/ExtensionNumberController.java

@@ -27,15 +27,17 @@ public class ExtensionNumberController {
     public CommonResponse<String> addNumbers(@RequestParam(value = "file") MultipartFile file,
                                              @RequestParam("display") Long display,
                                              @RequestParam("dyDisplay") Long dyDisplay,
+                                             @RequestParam("deliveryDisplay") Long deliveryDisplay,
+                                             @RequestParam("tokerDisplay") Long tokerDisplay,
                                              @RequestParam("companyId") Long companyId
     ) {
         if (companyId == null) {
             return CommonResponse.createByErrorMessage("参数错误");
         }
-        if (display == null && dyDisplay == null) {
+        if (display == null && dyDisplay == null && deliveryDisplay == null && tokerDisplay == null) {
             return CommonResponse.createByErrorMessage("外显号不能为空，请检查");
         }
-        return extensionNumberService.addNumbers(file, display, dyDisplay, companyId);
+        return extensionNumberService.addNumbers(file, display, dyDisplay, deliveryDisplay, tokerDisplay,companyId);
     }
 
     @GetMapping("/get/extension")

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/ExtensionDisplay.java

@@ -34,4 +34,10 @@ public class ExtensionDisplay implements Serializable {
     @Column(name = "dy_display")
     @ApiModelProperty(value = "抖音去显号")
     private Long dyDisplay;
+    @Column(name = "delivery_display")
+    @ApiModelProperty(value = "投流")
+    private Long deliveryDisplay;
+    @Column(name = "toker_display")
+    @ApiModelProperty(value = "拓客")
+    private Long tokerDisplay;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/TelephoneCallReqDTO.java

@@ -56,7 +56,6 @@ public class TelephoneCallReqDTO implements Serializable {
 
     @ApiModelProperty("分机号")
     private Long display;
-
-    @ApiModelProperty(value = "线索类型 0-正常任务得线索 1-飞鱼任务过来的线索")
+    @NotNull
     private Integer clueType;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/ExtensionNumberService.java

@@ -12,7 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface ExtensionNumberService {
 
-    CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long companyId);
+    CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long deliveryDisplay,Long tokerDisplay, Long companyId);
 
     ExtensionNumber getExtension(Long memberId);
 

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -46,7 +46,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long companyId) {
+    public CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long deliveryDisplay, Long tokerDisplay, Long companyId) {
         //保存外显号
         ExtensionDisplay extensionDisplay = extensionDisplayRepository.findExtensionDisplayByCompanyId(companyId);
         if (ObjectUtil.isEmpty(extensionDisplay)) {
@@ -54,6 +54,8 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
             extensionDisplay.setDisplay(display);
             extensionDisplay.setCompanyId(companyId);
             extensionDisplay.setDyDisplay(dyDisplay);
+            extensionDisplay.setDeliveryDisplay(deliveryDisplay);
+            extensionDisplay.setTokerDisplay(tokerDisplay);
         } else {
             if (display != null) {
                 extensionDisplay.setDisplay(display);
@@ -61,11 +63,17 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
             if (dyDisplay != null) {
                 extensionDisplay.setDyDisplay(dyDisplay);
             }
+            if (deliveryDisplay != null) {
+                extensionDisplay.setDeliveryDisplay(deliveryDisplay);
+            }
+            if (tokerDisplay != null) {
+                extensionDisplay.setTokerDisplay(tokerDisplay);
+            }
         }
         extensionDisplayRepository.save(extensionDisplay);
 
         //解析保存分机号
-        if (file != null) {
+        if (ObjectUtil.isNotEmpty(file) && file.getSize() > 0) {
             List<ExtensionNumber> list = new ArrayList<>();
             try {
                 int lastIndexOf = Objects.requireNonNull(file.getOriginalFilename()).lastIndexOf(".");
@@ -148,7 +156,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     }
 
     @Override
-    public ExtensionDisplay  queryExtensionDisplay(Long companyId) {
+    public ExtensionDisplay queryExtensionDisplay(Long companyId) {
         return extensionDisplayRepository.findExtensionDisplayByCompanyId(companyId);
     }
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java

@@ -201,11 +201,27 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
             if (extensionDisplay.getDisplay() != null) {
                 telephoneCallReqDTO.setDisplay(extensionDisplay.getDisplay());
             }
-            if (telephoneCallReqDTO.getClueType() != null && telephoneCallReqDTO.getClueType() == DefaultNumberConstants.ONE_NUMBER) {
+//            if (telephoneCallReqDTO.getClueType() != null && telephoneCallReqDTO.getClueType() == DefaultNumberConstants.ONE_NUMBER) {
+//                if (extensionDisplay.getDyDisplay() == null) {
+//                    return CommonResponse.createByErrorMessage("未配置抖音去显号");
+//                }
+//                telephoneCallReqDTO.setDisplay(extensionDisplay.getDyDisplay());
+//            }
+            if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.THREE_NUMBER) {
                 if (extensionDisplay.getDyDisplay() == null) {
                     return CommonResponse.createByErrorMessage("未配置抖音去显号");
                 }
                 telephoneCallReqDTO.setDisplay(extensionDisplay.getDyDisplay());
+            } else if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.FOUR_NUMBER) {
+                if (extensionDisplay.getDeliveryDisplay() == null) {
+                    return CommonResponse.createByErrorMessage("未配置投流去显号");
+                }
+                telephoneCallReqDTO.setDisplay(extensionDisplay.getDeliveryDisplay());
+            } else if (telephoneCallReqDTO.getClueType() == DefaultNumberConstants.FIVE_NUMBER) {
+                if (extensionDisplay.getTokerDisplay() == null) {
+                    return CommonResponse.createByErrorMessage("未配置拓客去显号");
+                }
+                telephoneCallReqDTO.setDisplay(extensionDisplay.getTokerDisplay());
             }
         }
         //获取线索号

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -76,7 +76,7 @@ public class ClueServiceImpl implements ClueService {
                 Clue clue = it.next();
                 if (StringUtils.isNotBlank(clue.getNid())) {
                     // 24位的nid解密,查询时要加*显示的线索
-                    if (clue.getNid().length() == DefaultNumberConstants.TWENTY_FOUR){
+                    if (clue.getNid().length() == DefaultNumberConstants.TWENTY_FOUR) {
                         clue.setNid(DecryptPnoUtil.decryptPno(clue.getNid()));
                         clue.setIsEncryption(DefaultNumberConstants.ONE_NUMBER);
                     }
@@ -957,12 +957,14 @@ public class ClueServiceImpl implements ClueService {
     /**
      * 获取缓存中任务名称
      */
+
     private String findTaskName(Long taskId) {
         String taskNameKey = "task:name:" + taskId;
         String str = (String) redisUtils.get(taskNameKey);
         if (str == null || "null".equals(str) || StringUtils.isBlank(str)) {
             Task body = taskClient.queryDetails(taskId).getBody();
             if (ObjectUtil.isNotEmpty(body)) {
+                redisUtils.set(taskNameKey, body.getTaskName(), 2592000);// 缓存三十天
                 return body.getTaskName();
             }
         }