diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java index 76029b9..630bc5b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OutsideReqServiceImpl.java @@ -41,26 +41,26 @@ public class OutsideReqServiceImpl implements OutsideReqService { if (dbPushClueDTO != null && (dbPushClueDTO.getMobile() != null || dbPushClueDTO.getCalled() != null)) { String mobileDecodeStr = null; String remark = dbPushClueDTO.getRemark(); + String empClientTypeName = dbPushClueDTO.getEmpClientTypeName(); + String called = dbPushClueDTO.getCalled(); try { if (StringUtils.isNotBlank(dbPushClueDTO.getMobile())) { byte[] mobileDecode = Base64.getDecoder().decode(dbPushClueDTO.getMobile()); mobileDecodeStr = new String(mobileDecode, StandardCharsets.UTF_8); - } - if (StringUtils.isNotBlank(dbPushClueDTO.getCalled())) { - mobileDecodeStr = DecryptPnoUtil.decryptPno(dbPushClueDTO.getCalled()); + } else if (StringUtils.isNotBlank(called) && StringUtils.isNotBlank(empClientTypeName) && empClientTypeName.equals("A")) { + mobileDecodeStr = DecryptPnoUtil.decryptPno(called); + }else { + return; } } catch (Exception e) { - log.error("============推送解密手机号失败============"); + log.error("============解密手机号失败============"); return; } // 添加线索 - if (MobileUtil.checkPhone(mobileDecodeStr)){ - syncTaskService.pushClueExecuteTask(appKey, mobileDecodeStr, remark); - } + boolean bool = MobileUtil.checkPhone(mobileDecodeStr); + if (bool) syncTaskService.pushClueExecuteTask(appKey, mobileDecodeStr, remark); else log.error("============号码非法============"); - } else { - log.info("============空数据 或 空手机号============"); } } @@ -69,8 +69,7 @@ public class OutsideReqServiceImpl implements OutsideReqService { String appKey = receivePushLeadsDTO.getAppKey(); List clueList = receivePushLeadsDTO.getClueList(); - UserSecretKeyEntity entity = userSecretKeyMapper - .selectOne(new LambdaQueryWrapper().eq(UserSecretKeyEntity::getAppKey, appKey)); + UserSecretKeyEntity entity = userSecretKeyMapper.selectOne(new LambdaQueryWrapper().eq(UserSecretKeyEntity::getAppKey, appKey)); if (entity != null && CollUtil.isNotEmpty(clueList)) { List clueEntityList = new ArrayList<>(); for (String clueStr : clueList) { diff --git a/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java b/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java index fa9ec88..d2c796d 100644 --- a/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java +++ b/admin/src/main/java/com/baiye/task/DistributeTaskSyncServiceImpl.java @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -22,7 +20,6 @@ public class DistributeTaskSyncServiceImpl implements DistributeTaskSyncService private final DistributeTaskMapper distributeTaskMapper; @Override - @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) public void executeTask(List userIdList, DistributeTaskService distributeTaskService) { List taskEntities = distributeTaskMapper .selectList(new LambdaQueryWrapper().eq(DistributeTaskEntity::getDefaultType, 0)