diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/CtiCallReq.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/CtiCallReq.java index c162b6ad..38dbec98 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/CtiCallReq.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/CtiCallReq.java @@ -34,17 +34,16 @@ public class CtiCallReq { public String startReq(TelephoneCallReqDTO req) { NfpCallReqDTO reqDTO = new NfpCallReqDTO().addNfpCallReq(req.getRequestId(), req.getTelA(), req.getTelB(), String.valueOf(req.getDisplay())); reqDTO.setOrgCode(orgCode); - CommonLog.info("CTI请求参数: " + BeanUtil.beanToMap(reqDTO)); + CommonLog.info("CTI请求呼叫: " + BeanUtil.beanToMap(reqDTO)); try { String httpResponse = sendCallReq(JSONUtil.toJsonPrettyStr(reqDTO), reqUrl).body(); CtiCallResponse ctiCallResponse = JSONUtil.toBean(httpResponse, CtiCallResponse.class); + CommonLog.info("CTI呼叫结果:" + ctiCallResponse); if (ctiCallResponse.getResult()) { return ctiCallResponse.getContent(); } - CommonLog.error("nfp请求失败,response===" + ctiCallResponse.getContent()); - throw new BadRequestException("呼叫失败"); } catch (Exception e) { - log.error("method【reqTask】 roll_call error :{}", e.getMessage()); + log.error("method【CtiCallReq】 cti_call error :{}", e.getMessage()); e.printStackTrace(); } throw new BadRequestException("呼叫失败"); @@ -59,6 +58,7 @@ public class CtiCallReq { json.putOpt("action", "1001"); String httpResponse = sendCallReq(JSONUtil.toJsonPrettyStr(json), reqUrl).body(); CtiCallResponse ctiCallResponse = JSONUtil.toBean(httpResponse, CtiCallResponse.class); + CommonLog.info("CTI挂断结果:" + ctiCallResponse); return ctiCallResponse.getResult(); } 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 e0c316a9..8de890aa 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 @@ -20,7 +20,6 @@ import com.baiye.util.QueryHelp; import com.baiye.util.RedisUtils; import com.baiye.util.SecurityUtils; import lombok.extern.slf4j.Slf4j; -import org.hibernate.boot.jaxb.SourceType; import org.springframework.context.event.EventListener; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java index b13807aa..4b6cfbaa 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java @@ -248,9 +248,10 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService { extensionNumberRepository.updateExtensionNumber(0, userId); extensionUserRepository.deleteByMemberId(userId); } else { - int i = extensionUserRepository.deleteByMemberId(replaceUserId); - if (i > 0) { - extensionNumberRepository.updateExtensionNumber(0, replaceUserId); + Integer number = extensionUserRepository.findNumberByMemberId(replaceUserId); + if (number != null) { + extensionNumberRepository.updateStatusById(0, number); + extensionUserRepository.deleteByMemberId(replaceUserId); } extensionUserRepository.updateByMember(userId, replaceUserId); } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java index 06bccc37..3f20e1d6 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/TelephoneCallServiceImpl.java @@ -404,7 +404,7 @@ public class TelephoneCallServiceImpl implements TelephoneCallService { @Override @Transactional(rollbackFor = Exception.class) public void ctiCallBackInfo(NfpCallInfoResponseDTO response) { - CommonLog.infoBusinessPartyType("CTI话单:" + response, BusinessPartyType.DB); + CommonLog.infoBusinessPartyType("CTI回调话单:" + response, BusinessPartyType.DB); String sessionId = response.getCalllog().getCrmStr(); String traceId = String.valueOf(redisUtils.get(sessionId)); AllCallInfo allCallInfo = allCallInfoRepository.findBySessionId(sessionId);