From 05e4bde01faf7ec5bdb37e1a3e25d7882019d146 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Tue, 12 Dec 2023 18:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B9=E9=94=99=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TripartiteServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java index 536ff54..ad032c1 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/TripartiteServiceImpl.java @@ -67,7 +67,6 @@ public class TripartiteServiceImpl implements TripartiteService { private final SysUserRolePromiseService sysUserRolePromiseService; - @Override @Transactional(rollbackFor = Exception.class) public Boolean callbackByAppKeyAndNid(String appKey, PushClueDTO dto) { @@ -78,9 +77,11 @@ public class TripartiteServiceImpl implements TripartiteService { if (StringUtils.isNotBlank(dto.getMobile())) { phone = Base64.decodeStr(dto.getMobile()); } + // 格式校验 if (StringUtils.isNotBlank(called) && StringUtils.isNotBlank(typeName) && Announcement.TABLE_ALIAS.equalsIgnoreCase(typeName)) { - phone = DecryptPnoUtil.decryptPno(called); + phone = called.length() > DefaultNumberConstants.ELEVEN_NUMBER + ? DecryptPnoUtil.decryptPno(called) : called; } PushLinkEntity byAppKey = pushLinkService.getByAppKey(appKey); @@ -98,14 +99,14 @@ public class TripartiteServiceImpl implements TripartiteService { log.info("============ the distribute id {} this assigned id {} ============", userList, distributeId); if (ObjectUtil.isNotNull(distributeId)) { SysUserRolePromise promise = sysUserRolePromiseService.queryIsShowByUserId(distributeId); - if (ObjectUtil.isNotNull(promise) && ObjectUtil.isNotNull + if (ObjectUtil.isNotNull(promise) && ObjectUtil.isNotNull (promise.getIsAutoAudits()) && promise.getIsAutoAudits().equals(Boolean.TRUE)) { List list = Lists.newArrayList(); // 雪花算法id Long clueId = IdUtil.getSnowflake(workerId, datacenterId).nextId(); ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).clueId(clueId).remark (remark).nid(AESUtils.encrypt(phone, securityProperties.getPasswordSecretKey())).assignedBy - (reportUserId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); + (reportUserId).createBy(distributeId).isNewClue(Boolean.TRUE).build(); list.add(clueDTO); clueService.saveClueListByStoreInfo(list); } @@ -118,6 +119,6 @@ public class TripartiteServiceImpl implements TripartiteService { return customService.createByCallBack(Collections.singletonList(customDTO)); } } - return Boolean.FALSE; + return Boolean.TRUE; } }