diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 6183ef602..d28c1a3d5 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -46,7 +46,7 @@ public enum ErrorCodeEnum { GET_INFO_ERROR(1021078, "获取信息异常", null), GET_PHONENUMBER_INFO_ERROR(1021079, "手机号归属地获取异常", null), IDENTITY_CARD_PARSE_FAIL(1021080, "身份证解析失败", null), - WECHAT_BIND_OTHER_MOBILE(1021081, "该微信已绑定其它手机号,请核对", null), + WECHAT_BIND_OTHER_MOBILE(1021081, "授权号码有误,请核对", null), PARAMS_REQUIRED(400002, "参数缺失!", null), DATA_CONVERT_ERROR(400002, "日期转换异常!", null), PARENT_NODE_NOT_EXIST(400002, "父节点不存在", null), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java index 246f0bb10..ee9b48017 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java @@ -1,5 +1,7 @@ package com.cool.store.enums; +import com.alibaba.fastjson.JSONObject; + /** * @Author: young.yu * @Date: 2023-07-19 16:49 @@ -7,34 +9,40 @@ package com.cool.store.enums; */ public enum FeiShuNoticeMsgEnum { - //分配招商经理 - ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您,线索信息{1}手机号{2},请及时跟进"), - //转让招商经理 - TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您,线索信息{1}手机号{2},请及时跟进"), - //意向申请通知 - INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核,申请人{0}手机号{1}于 {2} 提交加盟意向申请,请及时处理"); + common_notice("工作台通知", "{0}", "img_v2_45d7a901-1eab-498b-a760-b38d287f0c1g"), + ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您,线索信息{1}手机号{2},请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), + TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您,线索信息{1}手机号{2},请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), + INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核,申请人{0}手机号{1}于 {2} 提交加盟意向申请,请及时处理", "img_v2_69eb6e5f-bf12-4a02-a47f-b17ce24fcfeg"), + FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"), + INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"), + ; private String title; private String content; + private String imageMediaId; - FeiShuNoticeMsgEnum(String title, String content) { + FeiShuNoticeMsgEnum(String title, String content, String imageMediaId) { this.title = title; this.content = content; + this.imageMediaId = imageMediaId; } public String getTitle() { return title; } - public void setTitle(String title) { - this.title = title; - } - public String getContent() { return content; } - public void setContent(String content) { - this.content = content; + public String getImageMediaId() { + return imageMediaId; + } + + public JSONObject getMessageObject() { + JSONObject object = new JSONObject(); + object.put("name", this.title); + object.put("imageMediaId", this.imageMediaId); + return object; } } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java deleted file mode 100644 index 63f5f53b4..000000000 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageTypeEnum.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.enums; - -import com.alibaba.fastjson.JSONObject; - -/** - * @author zhangchenbiao - * @FileName: MessageTypeEnum - * @Description: - * @date 2023-06-15 10:14 - */ -public enum MessageTypeEnum { - - SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag"), - FOLLOW_TASK("follow_task", "跟进任务提醒", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag") - - - - ; - - private String code; - - private String name; - - private String imageMediaId; - - MessageTypeEnum(String code, String name, String imageMediaId) { - this.code = code; - this.name = name; - this.imageMediaId = imageMediaId; - } - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getImageMediaId() { - return imageMediaId; - } - - public static String getImageMediaId(String code){ - for (MessageTypeEnum value : MessageTypeEnum.values()) { - if(value.code.equals(code)){ - return value.imageMediaId; - } - } - return null; - } - - - public JSONObject getMessageTypeObject() { - JSONObject object = new JSONObject(); - object.put("code", this.code); - object.put("name", this.name); - object.put("imageMediaId", this.imageMediaId); - return object; - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java index 38fab3f79..d010ca081 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java @@ -122,18 +122,18 @@ public class HyFollowTaskDAO { * 分页获取任务 * @param followUserId * @param taskStatus - * @param deadlineStartTIme - * @param deadlineEndTIme + * @param deadlineStartTime + * @param deadlineEndTime * @param pageNum * @param pageSize * @return */ - public Page getTaskPage(String followUserId, Integer taskStatus, String deadlineStartTIme, String deadlineEndTIme, Integer pageNum, Integer pageSize){ + public Page getTaskPage(String followUserId, Integer taskStatus, String deadlineStartTime, String deadlineEndTime, Integer pageNum, Integer pageSize){ if(StringUtils.isBlank(followUserId)){ return new Page<>(); } PageHelper.startPage(pageNum, pageSize); - return hyFollowTaskMapper.getTaskPage(followUserId, taskStatus, deadlineStartTIme, deadlineEndTIme); + return hyFollowTaskMapper.getTaskPage(followUserId, taskStatus, deadlineStartTime, deadlineEndTime); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 6bd8b9221..da74d6524 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -138,9 +138,10 @@ public class HyPartnerLineInfoDAO { } public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, - String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList,List developmentManagerList,List userPortraitIdList){ + String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList, + List developmentManagerList,List userPortraitIdList,List userChannelIdList){ return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, - intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList); + intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java new file mode 100644 index 000000000..5b33e6c7e --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java @@ -0,0 +1,37 @@ +package com.cool.store.dao; + +import com.cool.store.entity.HyPartnerUserChannelDO; +import com.cool.store.mapper.HyPartnerUserChannelMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author suzhuhong + * @Date 2023/8/21 11:38 + * @Version 1.0 + */ +@Repository +public class HyPartnerUserChannelDAO { + + @Resource + HyPartnerUserChannelMapper hyPartnerUserChannelMapper; + + public Map getChannelMapByIds(List userChannelIds){ + if (CollectionUtils.isEmpty(userChannelIds)){ + return new HashMap<>(1); + } + List userChannelList = hyPartnerUserChannelMapper.getUserChannelByIds(userChannelIds); + Map channelMap = userChannelList.stream().filter(date->date.getChannelId()!=null).collect(Collectors.toMap(x->x.getChannelId().intValue(), HyPartnerUserChannelDO::getChannelName)); + return channelMap; + } + + + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java index 9fe5af082..727282df3 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java @@ -38,11 +38,11 @@ public interface HyFollowTaskMapper { * 获取任务列表 * @param followUserId * @param taskStatus - * @param deadlineStartTIme - * @param deadlineEndTIme + * @param deadlineStartTime + * @param deadlineEndTime * @return */ - Page getTaskPage(@Param("followUserId")String followUserId, @Param("taskStatus")Integer taskStatus, @Param("deadlineStartTIme")String deadlineStartTIme, @Param("deadlineEndTIme")String deadlineEndTIme); + Page getTaskPage(@Param("followUserId")String followUserId, @Param("taskStatus")Integer taskStatus, @Param("deadlineStartTime")String deadlineStartTime, @Param("deadlineEndTime")String deadlineEndTime); /** * 获取跟进任务详情 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 05c447006..65609017d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -176,7 +176,8 @@ public interface HyPartnerLineInfoMapper { @Param("storeKeywordType") String storeKeywordType, @Param("userIdList") List userIdList, @Param("developmentManagerList") List developmentManagerList, - @Param("userPortraitIdList") List userPortraitIdList); + @Param("userPortraitIdList") List userPortraitIdList, + @Param("userChannelIdList") List userChannelIdList); /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml index a7354eff5..51c01a3cf 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml @@ -151,11 +151,11 @@ and task_status = #{taskStatus} - - and deadline >= #{deadlineStartTIme} + + and deadline >= #{deadlineStartTime} - - + + @@ -207,7 +207,7 @@ - +