From 9a69a763047d30c9fc166a7af6ecccbcc203a7f5 Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Mon, 6 Mar 2023 18:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/baiye/timed/DeliveryBalanceTask.java    | 12 +++++++++---
 .../com/baiye/module/service/dto/ABMessageDTO.java   |  9 ++++++++-
 .../module/service/impl/AbMessageServiceImpl.java    |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
index 4a0ce3a9..6d4c3bc7 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
@@ -12,11 +12,13 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baiye.config.properties.DeliveryProperties;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.constant.FileConstant;
+import com.baiye.model.dto.UserDto;
 import com.baiye.modules.platform.domain.Company;
 import com.baiye.modules.platform.domain.TaskImei;
 import com.baiye.modules.platform.service.*;
 import com.baiye.modules.platform.service.dto.ImeiDTO;
 import com.baiye.modules.platform.service.dto.TaskTagDto;
+import com.baiye.modules.system.service.UserService;
 import com.baiye.util.*;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
@@ -45,11 +47,12 @@ public class DeliveryBalanceTask {
 
     private final TaskService taskService;
 
+    private final UserService userService;
+
     private final CompanyService companyService;
 
     private final TaskImeiService taskImeiService;
 
-
     private final DownRecordService downRecordService;
 
     private final DeliveryProperties deliveryProperties;
@@ -75,9 +78,12 @@ public class DeliveryBalanceTask {
                 log.info("=================== the task Id as {},upload size as {} ====================", taskId, list.size());
                 Long userId = list.get(DefaultNumberConstants.ZERO_NUMBER).getUserId();
                 Company companyByUserId = companyService.findCompanyByUserId(userId);
-                if (ObjectUtil.isNotNull(companyByUserId) &&
+                UserDto userInfo = userService.findUserInfo(userId);
+                if (ObjectUtil.isNotNull(userInfo)
+                        && Boolean.TRUE.equals(userInfo.getEnabled())
+                                && ObjectUtil.isNotNull(companyByUserId)
                         // 判断价格
-                        ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
+                        && ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
                     Integer dmpLimitNum = companyByUserId.getDmpLimitNum();
                     // 判断余额
                     if (ObjectUtil.isNull(companyByUserId.getUserBalance())
diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/ABMessageDTO.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/ABMessageDTO.java
index a8276c3c..798b23d6 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/ABMessageDTO.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/ABMessageDTO.java
@@ -79,7 +79,7 @@ public class ABMessageDTO {
     /**
      * 业务名称 这个字段是用Base64进行加密
      */
-    @SerializedName("app_id")
+    @SerializedName("act_name")
     private String actName;
 
 
@@ -90,4 +90,11 @@ public class ABMessageDTO {
     private String audioUrl;
 
 
+    /**
+     * 人工评级分类
+     */
+    @SerializedName("emp_client_type_name")
+    private String empClientTypeName;
+
+
 }
diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/AbMessageServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/AbMessageServiceImpl.java
index c9ad4e74..b9492b2c 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/AbMessageServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/AbMessageServiceImpl.java
@@ -18,7 +18,6 @@ import com.baiye.util.MobileUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,8 +44,9 @@ public class AbMessageServiceImpl implements AbMessageService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean receiveDate(ABMessageDTO abMessageDTO) {
         String mobile = Base64.decodeStr(abMessageDTO.getMobile());
+        String typeName = abMessageDTO.getEmpClientTypeName();
         String jobNumber = abMessageDTO.getJobNumber();
-        if (StringUtils.isBlank(jobNumber) || StringUtils.isBlank(mobile) || !MobileUtil.checkPhone(mobile)) {
+        if (StringUtils.isBlank(jobNumber) || StringUtils.isBlank(mobile) || !MobileUtil.checkPhone(mobile) || !"A".equalsIgnoreCase(typeName)) {
             return Boolean.FALSE;
         }
         Long userId = userClient.findByJobNumber(jobNumber, SecurityConstants.FROM_IN);