From d4e93cc8f361c73cc92715b3894a6e14cb491c1a Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Wed, 13 Dec 2023 17:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=9D=E5=8D=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/distribute/dto/PushClueDTO.java | 5 +++++ .../distribute/mapper/CustomMapper.java | 22 +++++++++++++++++-- .../distribute/service/CustomService.java | 8 +++++++ .../service/impl/CustomServiceImpl.java | 5 +++++ .../service/impl/TripartiteServiceImpl.java | 18 +++++++++++++-- 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java index 42b3dde..f8d4fdd 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/dto/PushClueDTO.java @@ -19,6 +19,11 @@ public class PushClueDTO { */ private String called; + /** + * 话单id + */ + private String recId; + /** * 太空猫传递的线索ID */ diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java index 20da2ab..aa41582 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java @@ -1,5 +1,6 @@ package com.baiye.modules.distribute.mapper; +import com.baiye.constant.DefaultNumberConstants; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; @@ -11,14 +12,14 @@ import com.baiye.modules.distribute.qo.CustomQo; import com.baiye.modules.distribute.qo.HomePageQo; import com.baiye.modules.distribute.vo.CustomVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import org.apache.ibatis.annotations.MapKey; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; public interface CustomMapper extends ExtendMapper { default PageResult queryPage(PageParam pageParam, CustomQo qo) { @@ -76,4 +77,21 @@ public interface CustomMapper extends ExtendMapper { List addCount(@Param("date") String date, @Param("companyId") Long companyId); List distributorsEnterClueByTime(@Param("qo") HomePageQo homePageQo); + + + /** + * 修改信息 + * + * @param phone + * @param remark + * @return + */ + default int updateNidAndRemark(String phone, String remark) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() + .set(CustomEntity::getCustomNid, phone) + .set(CustomEntity::getRemark, remark) + .eq(CustomEntity::getEnrollStatus, DefaultNumberConstants.ONE_NUMBER) + .eq(CustomEntity::getCustomNid, phone); + return this.update(null, wrapper); + } } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java b/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java index 27c1076..c1a200d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java @@ -72,4 +72,12 @@ public interface CustomService extends ExtendService { * @return */ Boolean createByCallBack(List dtoList); + + /** + * 修改资源 + * @param phone + * @param remark + * @return + */ + Boolean updateByNid(String phone, String remark); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java index a851539..7a9d981 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java @@ -271,6 +271,11 @@ public class CustomServiceImpl extends ExtendServiceImpl channelIdentifying = byAppKey.getChannelIdentifying(); // 查询所有分发员 List userList = sysUserRoleService.selectUserIdByRoleCode @@ -106,7 +117,7 @@ public class TripartiteServiceImpl implements TripartiteService { 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); } @@ -114,7 +125,10 @@ public class TripartiteServiceImpl implements TripartiteService { CallbackCustomDTO customDTO = CallbackCustomDTO.builder().channelType(DefaultNumberConstants.FOUR_NUMBER).customNid(phone).channelName(byAppKey.getName()). distributeId(distributeId).sex(DefaultNumberConstants.MINUS_ONE_NUMBER).identifying(channelIdentifying).reportUserId(reportUserId).remark(remark).companyId (byId.getWhichUserId()).enterName(byId.getUsername()).build(); - + if (StringUtils.isNotBlank(recId)) { + // 缓存三天 + redisUtils.set(recId, phone, DefaultNumberConstants.THREE_NUMBER, TimeUnit.DAYS); + } // 插入资源表 return customService.createByCallBack(Collections.singletonList(customDTO)); }