From 3182f050af42e286cd0d9436757da977987a99c9 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 21 May 2024 10:41:51 +0800 Subject: [PATCH] fix --- .../java/com/cool/store/dao/LineInfoDAO.java | 16 ++++++++++++++++ .../com/cool/store/mapper/LineInfoMapper.java | 7 +++++++ .../src/main/resources/mapper/LineInfoMapper.xml | 12 ++++++++++++ .../cool/store/service/impl/CommonService.java | 3 +++ .../java/com/cool/store/job/XxlJobHandler.java | 6 ++++-- 5 files changed, 42 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index 5357e9e4d..b935524af 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -15,6 +15,7 @@ import com.cool.store.request.PointLinePageRequest; import com.cool.store.request.PublicLineListRequest; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -22,7 +23,9 @@ import org.springframework.stereotype.Repository; import javax.annotation.Resource; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * @author zhangchenbiao @@ -158,4 +161,17 @@ public class LineInfoDAO { public List getLines(List lineIdList){ return lineInfoMapper.getLines(lineIdList); } + + /** + * 获取线索手机号 + * @param lineIds + * @return + */ + public Map getLineMobileMap(List lineIds){ + if(CollectionUtils.isEmpty(lineIds)){ + return Maps.newHashMap(); + } + List lineMobile = lineInfoMapper.getLineMobile(lineIds); + return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getMobile, (k1, k2)-> k1)); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index fb9a4bf5b..f8f0c4d32 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -93,4 +93,11 @@ public interface LineInfoMapper extends Mapper { * @description: 开业运营方案根据line id join enterprise_user 查询 */ List getLines(@Param("lineIdList") List lineIdList); + + /** + * 获取线索手机号 + * @param lineIds + * @return + */ + List getLineMobile(@Param("lineIds") List lineIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 1a94e9e09..da210d82e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -521,5 +521,17 @@ + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index 72b94890e..ea9aef6f9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -132,6 +132,9 @@ public class CommonService { public void sendSms(List poneNumbers, SMSMsgEnum templateCode, Map templateParamMap){ log.info("templateCode:{}, request:{}, poneNumbers:{}", templateCode.getTitle(), JSONObject.toJSONString(templateParamMap), JSONObject.toJSONString(poneNumbers)); + if(CollectionUtils.isEmpty(poneNumbers)){ + return; + } List signNameList = new ArrayList<>(); signNameList.add("酷店掌"); AsyncClient client = null; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 988c9d8aa..467560bc8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -456,14 +456,16 @@ public class XxlJobHandler { log.info("------今日没有待更新数据------"); return; } + List lineIds = interviewList.stream().map(LineInterviewDO::getLineId).collect(Collectors.toList()); + Map lineMobileMap = lineInfoDAO.getLineMobileMap(lineIds); for (LineInterviewDO interview : interviewList) { Map templateParamMap = new HashMap<>(); templateParamMap.put("interviewTime", DateUtil.format(interview.getStartTime(), "HH:mm")); if (InterviewTypeEnum.INTERVIEW.getCode().equals(interview.getInterviewType())) { - commonService.sendSms(interview.getInterviewerUserId(), SMSMsgEnum.FIRST_INTERVIEW_REMIND, templateParamMap); + commonService.sendSms(lineMobileMap.get(interview.getLineId()), SMSMsgEnum.FIRST_INTERVIEW_REMIND, templateParamMap); } if (InterviewTypeEnum.SECOND_INTERVIEW.getCode().equals(interview.getInterviewType())) { - commonService.sendSms(interview.getInterviewerUserId(), SMSMsgEnum.SECOND_INTERVIEW_REMIND, templateParamMap); + commonService.sendSms(lineMobileMap.get(interview.getLineId()), SMSMsgEnum.SECOND_INTERVIEW_REMIND, templateParamMap); } } XxlJobHelper.handleSuccess();