diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ClueBoostServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ClueBoostServiceImpl.java index 9e7e8c75..7c6af5b0 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ClueBoostServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ClueBoostServiceImpl.java @@ -140,7 +140,7 @@ public class ClueBoostServiceImpl implements ClueBoostService { } } else { if (clueBoostDTO.getStatus()) { - clueBoostRepository.deleteById(byClueId.getId()); + clueBoostRepository.delete(byClueId); return; } Date lastTime = byClueId.getLastTime(); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index fa9e702e..46551277 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -796,8 +796,10 @@ public class ClueServiceImpl implements ClueService { if (clueTalk.getMemberStatus() == DefaultNumberConstants.FOUR_NUMBER) { throw new BadRequestException("已经转为crm,请勿重复操作"); } - if (!isEffective(clueTalk.getClueId())) { - throw new BadRequestException("未拨打有效电话,不能转crm"); + if (clueTalk.getClueCallStatus() == null || clueTalk.getClueCallStatus() != DefaultNumberConstants.TWO_NUMBER) { + if (!isEffective(clueTalk.getClueId())) { + throw new BadRequestException("未拨打有效电话,不能转crm"); + } } int userCount = turnCrmLogRepository.findByUserIdCount(clueTalk.getMemberId()) + DefaultNumberConstants.ONE_NUMBER; UserDto userInfo = userClient.findUserInfo(clueTalk.getMemberId());