diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java deleted file mode 100644 index 7df2dd4a7..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BeautyCameraSettingDAO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.BeautyCameraSettingDO; -import com.cool.store.mapper.BeautyCameraSettingMapper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: BeautyCameraSettingDAO - * @Description: - * @date 2023-09-11 14:46 - */ -@Repository -public class BeautyCameraSettingDAO { - - @Resource - private BeautyCameraSettingMapper beautyCameraSettingMapper; - - /** - * 插入或更新 - * @param param - * @return - */ - public Long insertOrUpdateBeautyCameraSetting(BeautyCameraSettingDO param){ - if(StringUtils.isBlank(param.getUserId())){ - return 0L; - } - return beautyCameraSettingMapper.insertOrUpdateBeautyCameraSetting(param); - } - - /** - * 获取用户美颜配置 - * @param userId - * @return - */ - public BeautyCameraSettingDO getBeautyCameraSetting(String userId){ - if(StringUtils.isBlank(userId)){ - return null; - } - return beautyCameraSettingMapper.getBeautyCameraSetting(userId); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java deleted file mode 100644 index 999948580..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.dao; - -import cn.hutool.core.bean.BeanUtil; -import com.cool.store.dto.content.ContentAddDto; -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.dto.content.ContentUpdateDto; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.mapper.HyContentInfoMapper; -import com.cool.store.vo.HyContentInfoVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -@Deprecated -public class ContentDAO { - - @Autowired - private HyContentInfoMapper contentInfoMapper; - - public String addContentInfo(ContentAddDto dto) { - HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); - BeanUtil.copyProperties(dto, hyContentInfoDO); - hyContentInfoDO.setUpdateUserId(dto.getCreateUserId()); - return Integer.toString(contentInfoMapper.insertSelective(hyContentInfoDO)); - } - - public void deleteContent(String contentId) { - contentInfoMapper.deleteSelective(contentId); - } - - public void updateContent(ContentUpdateDto dto) { - HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); - BeanUtil.copyProperties(dto, hyContentInfoDO); - hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); - contentInfoMapper.updateByPrimaryKeySelective(hyContentInfoDO); - } - - public List queryContentList(ContentQueryListDto dto) { - return contentInfoMapper.queryContentList(dto); - } - - public HyContentInfoDO queryContentInfo(String contentId) { - return contentInfoMapper.queryContentInfo(contentId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java deleted file mode 100644 index 2771efd6c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.EnterpriseUserMapper; -import com.cool.store.utils.StringUtil; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @date 2023-05-19 02:58 - */ -@Repository -public class EnterpriseUserDAO { - - @Resource - private EnterpriseUserMapper enterpriseUserMapper; - - - public EnterpriseUserDO getUserInfoById(String userId){ - if(StringUtils.isAnyBlank(userId)){ - return null; - } - return enterpriseUserMapper.getUserInfoById(userId); - } - - public List getUserInfoByUserIds(List userIdList){ - if(CollectionUtils.isEmpty(userIdList)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.getUserInfoByUserIds(userIdList); - } - - public Map getFeishuUserIdsByUserIds(List userIdList){ - if(CollectionUtils.isEmpty(userIdList)){ - return new HashMap<>(0); - } - List feishuUserIdsByUserIds = enterpriseUserMapper.getFeishuUserIdsByUserIds(userIdList); - return feishuUserIdsByUserIds.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getFeishuUserId)); - } - - public List getFeishuUserIdListByUserIds(List userIdList){ - if(CollectionUtils.isEmpty(userIdList)){ - return new ArrayList<>(0); - } - List feishuUserIdsByUserIds = enterpriseUserMapper.getFeishuUserIdsByUserIds(userIdList); - return feishuUserIdsByUserIds.stream().map(EnterpriseUserDO::getFeishuUserId).collect(Collectors.toList()); - } - - - public void batchInsertOrUpdate(List insertOrUpdateList) { - if(CollectionUtils.isEmpty(insertOrUpdateList)){ - return; - } - enterpriseUserMapper.batchInsertOrUpdate(insertOrUpdateList); - } - - public void updateByPrimaryKeySelective(EnterpriseUserDO enterpriseUserDO) { - if(enterpriseUserDO == null){ - return; - } - enterpriseUserMapper.updateByPrimaryKeySelective(enterpriseUserDO); - } - - public void updateOnlineStatusByUserId(String userId,Integer onlineStatus) { - if (StringUtils.isEmpty(userId)||onlineStatus == null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - enterpriseUserMapper.updateOnlineStatusByUserId(userId,onlineStatus); - } - - /** - * 删除用户 - * @param excludeUserIds - */ - public void deleteUser(List excludeUserIds){ - if(CollectionUtils.isEmpty(excludeUserIds)){ - return; - } - enterpriseUserMapper.deleteUser(excludeUserIds); - } - - public Integer deleteUserByUserId(String userId){ - if(StringUtils.isBlank(userId)){ - return CommonConstants.ZERO; - } - return enterpriseUserMapper.deleteUserByUserId(userId); - } - - public List searchUserByRegionIdsAndKeyword(List regionIds, String keyword, List leaderRegionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, leaderRegionIds); - } - - public boolean isExistDeptUser(String regionId){ - if(StringUtils.isBlank(regionId)){ - return false; - } - return enterpriseUserMapper.getUserCountByRegionId(regionId) > CommonConstants.ZERO; - } - - /** - * 获取部门负责人 - * @param regionId - * @return - */ - public List getUserListByDeptLeader(String regionId){ - if(StringUtils.isBlank(regionId)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.getUserListByDeptLeader(regionId); - } - - public List getUserListByDeptLeaders(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.getUserListByDeptLeaders(regionIds); - } - - - public List getUserListByRegionIds(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return enterpriseUserMapper.getUserListByRegionIds(regionIds); - } - - public Map getUserNameAndMobile(List userIds){ - List userList = getUserInfoByUserIds(userIds); - return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile(), o.getName())).collect(Collectors.toMap(k -> k.getUserId(), v -> v.getName() + " " + v.getMobile())); - } - - public Map getUserNameMap(List userIds){ - List userList = getUserInfoByUserIds(userIds); - return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile(), o.getName())).collect(Collectors.toMap(k -> k.getUserId(), v -> v.getName())); - } - - public Map getUserMap(List userIds){ - List userList = getUserInfoByUserIds(userIds); - return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile(), o.getName())).collect(Collectors.toMap(k -> k.getUserId(), Function.identity())); - } - - public EnterpriseUserDO selectByMobile(String mobile) { - return enterpriseUserMapper.selectByMobile(mobile); - } - - public String getUserName(String userId){ - EnterpriseUserDO userInfo = getUserInfoById(userId); - return Optional.ofNullable(userInfo).map(EnterpriseUserDO::getName).orElse(StringUtils.EMPTY); - } - - public EnterpriseUserDO selectByInvestmentManager(String investmentManager) { - if (StringUtil.isEmpty(investmentManager)) { - return null; - } - return enterpriseUserMapper.selectByInvestmentManager(investmentManager); - } -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java deleted file mode 100644 index 9d6d2d58a..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserRoleDAO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.EnterpriseUserRoleDO; -import com.cool.store.entity.SysRoleDO; -import com.cool.store.enums.DataSourceEnum; -import com.cool.store.mapper.EnterpriseUserRoleMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @date 2023-05-19 02:59 - */ -@Repository -public class EnterpriseUserRoleDAO { - - @Resource - private EnterpriseUserRoleMapper enterpriseUserRoleMapper; - - public Integer batchInsertOrUpdate(List recordList){ - if(CollectionUtils.isEmpty(recordList)){ - return null; - } - return enterpriseUserRoleMapper.batchInsertOrUpdate(recordList); - } - - public Integer deleteRoleInUser(String roleId, DataSourceEnum dataSourceEnum, List excludeUserIds){ - if(StringUtils.isBlank(roleId) || Objects.isNull(dataSourceEnum) || CollectionUtils.isEmpty(excludeUserIds)){ - return null; - } - return enterpriseUserRoleMapper.deleteRoleInUser(roleId, dataSourceEnum.getCode(), excludeUserIds); - } - - public Integer deleteUserInRole(String userId, DataSourceEnum dataSourceEnum, String excludeRoleId){ - if(StringUtils.isAnyBlank(userId, excludeRoleId) || Objects.isNull(dataSourceEnum)){ - return null; - } - return enterpriseUserRoleMapper.deleteUserInRole(userId, dataSourceEnum.getCode(), excludeRoleId); - } - - public Integer deleteUserRole(String userId){ - if(StringUtils.isBlank(userId)){ - return CommonConstants.ZERO; - } - return enterpriseUserRoleMapper.deleteUserRole(userId); - } - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyAdvancedSettingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyAdvancedSettingDAO.java deleted file mode 100644 index 2cafa8ee2..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyAdvancedSettingDAO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyAdvancedSettingDO; -import com.cool.store.mapper.HyAdvancedSettingMapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/14 20:33 - * @Version 1.0 - */ -@Repository -public class HyAdvancedSettingDAO { - - - @Resource - HyAdvancedSettingMapper hyAdvancedSettingMapper; - - - public int insertSelective(HyAdvancedSettingDO record){ - return hyAdvancedSettingMapper.insertSelective(record); - } - - public int updateByPrimaryKeySelective( HyAdvancedSettingDO record){ - return hyAdvancedSettingMapper.updateByPrimaryKeySelective(record); - } - - - public HyAdvancedSettingDO selectAdvanceSetting(){ - return hyAdvancedSettingMapper.selectAdvanceSetting(); - } - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java deleted file mode 100644 index 97b462fa2..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.cool.store.dao; - -import cn.hutool.core.collection.CollectionUtil; -import com.cool.store.dto.exhibition.ExhibitionDTO; -import com.cool.store.dto.exhibition.ExhibitionStatisticsDTO; -import com.cool.store.entity.HyExhibitionDO; -import com.cool.store.mapper.HyExhibitionMapper; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; -import com.cool.store.vo.exhibition.PartnerExhibitionListVO; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:06 - * @Version 1.0 - */ -@Repository -public class HyExhibitionDAO { - @Resource - HyExhibitionMapper hyExhibitionMapper; - - public int insertSelective(HyExhibitionDO record){ - if (record.getId() == null){ - return -1; - } - return hyExhibitionMapper.insertSelective(record); - } - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:38 - */ - public HyExhibitionDO selectByPrimaryKey(Integer id){ - if (id == null){ - return null; - } - return hyExhibitionMapper.selectByPrimaryKey(id); - } - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:38 - */ - public int updateByPrimaryKeySelective(HyExhibitionDO record){ - if (record.getId() == null){ - return -1; - } - return hyExhibitionMapper.updateByPrimaryKeySelective(record); - } - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:38 - */ - public int deleteByPrimaryKey(Integer id){ - if (id == null){ - return -1; - } - return hyExhibitionMapper.deleteByPrimaryKey(id); - } - - public int batchInsert(List records){ - if (CollectionUtils.isEmpty(records)){ - return -1; - } - return hyExhibitionMapper.batchInsert(records); - } - - public int batchUpdate(List records){ - if (CollectionUtils.isEmpty(records)){ - return -1; - } - return hyExhibitionMapper.batchUpdate(records); - } - - - public List getExhibitionListByUserId(String userId, String startDate, Integer closedType){ - if (StringUtil.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyExhibitionMapper.getExhibitionListByUserId(userId,startDate,closedType); - } - - - public Map exhibitionStatisticsMap(List list) { - if (CollectionUtils.isEmpty(list)) { - return new HashMap<>(4); - } - List result = hyExhibitionMapper.exhibitionStatistic(list); - return result.stream().collect(Collectors.toMap(ExhibitionStatisticsDTO::getExhibitionId, date -> date)); - } - - public List listByExhibitionGroupIds(List exhibitionGroupIdList,Boolean filterCloseExhibition){ - if (CollectionUtils.isEmpty(exhibitionGroupIdList)){ - return new ArrayList<>(); - } - return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList,filterCloseExhibition); - } - - public ExhibitionDTO lineSignUp(Integer exhibitionGroupId, Long lineId){ - return hyExhibitionMapper.lineSignUp(exhibitionGroupId,lineId); - } - - public List listByExhibitionGroupId(Integer exhibitionGroupId,Boolean includeClose){ - if (exhibitionGroupId==null){ - return new ArrayList<>(); - } - return hyExhibitionMapper.listByExhibitionGroupId(exhibitionGroupId,includeClose); - } - - public List getPartnerExhibitionList(Long partnerLineId) { - if (partnerLineId == null) { - return new ArrayList<>(); - } - return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId); - } - - public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) { - if (exhibitionGroupId == null || partnerLineId == null) { - return new PartnerExhibitionInfoVO(); - } - return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); - } - - public List querySelective(HyExhibitionDO hyExhibitionDO) { - if (hyExhibitionDO == null) { - return new ArrayList<>(); - } - return hyExhibitionMapper.querySelective(hyExhibitionDO); - } - - public int batchCloseExhibition(List hyExhibitionIds, Integer closedType, String closeDateTime) { - if (CollectionUtil.isEmpty(hyExhibitionIds) || closedType == null || closeDateTime == null) { - return 0; - } - return hyExhibitionMapper.batchCloseExhibition(hyExhibitionIds, closedType, closeDateTime); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionGroupDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionGroupDAO.java deleted file mode 100644 index a444d00fb..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionGroupDAO.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.exhibition.MyExhibitionGroupDTO; -import com.cool.store.entity.HyExhibitionGroupDO; -import com.cool.store.mapper.HyExhibitionGroupMapper; -import com.cool.store.utils.StringUtil; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:11 - * @Version 1.0 - */ -@Repository -public class HyExhibitionGroupDAO { - - @Resource - HyExhibitionGroupMapper hyExhibitionGroupMapper; - - public int insertSelective(HyExhibitionGroupDO record){ - if (record == null){ - return -1; - } - return hyExhibitionGroupMapper.insertSelective(record); - } - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:38 - */ - public HyExhibitionGroupDO selectByPrimaryKey(Integer id){ - if (id == null){ - return null; - } - return hyExhibitionGroupMapper.selectByPrimaryKey(id); - } - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:38 - */ - public int updateByPrimaryKeySelective(HyExhibitionGroupDO record){ - if (record.getId() == null){ - return -1; - } - return hyExhibitionGroupMapper.updateByPrimaryKeySelective(record); - } - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:38 - */ - public int deleteByPrimaryKey(Integer id){ - if (id == null){ - return -1; - } - return hyExhibitionGroupMapper.deleteByPrimaryKey(id); - } - - public List listByCreator(String userId){ - if (StringUtil.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyExhibitionGroupMapper.listByCreator(userId); - } - - - public int batchCloseExhibitionGroup() { - return hyExhibitionGroupMapper.batchCloseExhibitionGroup(); - } -} 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 deleted file mode 100644 index 1046558b0..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java +++ /dev/null @@ -1,224 +0,0 @@ -package com.cool.store.dao; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.follow.FollowTaskNumDTO; -import com.cool.store.entity.HyFollowTaskDO; -import com.cool.store.enums.FollowTaskStatusEnum; -import com.cool.store.mapper.HyFollowTaskMapper; -import com.cool.store.utils.CoolDateUtils; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: HyFollowTaskDAO - * @Description: - * @date 2023-08-10 10:35 - */ -@Repository -public class HyFollowTaskDAO { - - @Resource - private HyFollowTaskMapper hyFollowTaskMapper; - - /** - * 获取跟进任务想去 - * @param followTaskId - * @return - */ - public HyFollowTaskDO getFollowTask(Long followTaskId){ - if(Objects.isNull(followTaskId)){ - return null; - } - return hyFollowTaskMapper.getFollowTask(followTaskId); - } - - /** - * 批量获取根据任务 - * @param followTaskIds - * @return - */ - public List getFollowTaskList(List followTaskIds){ - if(CollectionUtils.isEmpty(followTaskIds)){ - return null; - } - return hyFollowTaskMapper.getFollowTaskList(followTaskIds); - } - - - /** - * 新增跟进任务 - * @param request - * @return - */ - public Long addFollowTask(HyFollowTaskDO request){ - if(StringUtils.isBlank(request.getFollowUserId()) || Objects.isNull(request.getPartnerLineId())){ - return null; - } - hyFollowTaskMapper.insertSelective(request); - return request.getId(); - } - - /** - * 更新跟进任务 - * @param request - * @return - */ - public Integer updateFollowTask(HyFollowTaskDO request){ - if(Objects.isNull(request.getId())){ - return null; - } - return hyFollowTaskMapper.updateByPrimaryKeySelective(request); - } - - /** - * 完成更近任务 - * @param followTaskId - * @return - */ - public Integer finishFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){ - HyFollowTaskDO update = new HyFollowTaskDO(); - update.setId(followTaskId); - update.setTaskStatus(followTaskStatus.getCode()); - update.setFinishTime(new Date()); - return updateFollowTask(update); - } - - /** - * 取消跟进任务 - * @param followTaskId - * @return - */ - public Integer cancelFollowTask(Long followTaskId, FollowTaskStatusEnum followTaskStatus){ - HyFollowTaskDO update = new HyFollowTaskDO(); - update.setId(followTaskId); - update.setTaskStatus(followTaskStatus.getCode()); - return updateFollowTask(update); - } - - /** - * 获取线索的所有任务 - * @param partnerLineId - * @return - */ - public List getTaskListByLineId(Long partnerLineId){ - if(Objects.isNull(partnerLineId)){ - return Lists.newArrayList(); - } - return hyFollowTaskMapper.getTaskListByLineId(partnerLineId); - } - - /** - * 分页获取任务 - * @param followUserId - * @param taskStatus - * @param deadlineStartTime - * @param deadlineEndTime - * @param pageNum - * @param pageSize - * @return - */ - 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); - } - - /** - * 更新未完成的任务跟进人 - * @param partnerLineId - * @param userId - */ - public void updateUndoTaskFollowUserId(Long partnerLineId, String userId){ - if(Objects.isNull(partnerLineId) || StringUtils.isBlank(userId)){ - return; - } - hyFollowTaskMapper.updateUndoTaskFollowUserId(partnerLineId, userId); - } - - /** - * 作废待完成&已逾期的任务 - * @param partnerLineId - */ - public void cancelUndoFollowTask(Long partnerLineId){ - if(Objects.isNull(partnerLineId)){ - return; - } - hyFollowTaskMapper.cancelUndoFollowTask(partnerLineId); - } - - /** - * 获取消息通知的跟进人 - * @param date - * @param pageNum - * @param pageSize - * @return - */ - public Page getRemindFollowUserIds(Date date, Integer pageNum, Integer pageSize){ - String startTime = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY) + CommonConstants.DAY_START_TIME_SUFFIX; - String endTime = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY) + CommonConstants.DAY_END_TIME_SUFFIX; - PageHelper.startPage(pageNum, pageSize); - return hyFollowTaskMapper.getRemindFollowUserIds(startTime, endTime); - } - - /** - * 获取用户任务数量 - * @param followUserIds - * @return - */ - public List getUserTaskNum(List followUserIds, Date date){ - if(CollectionUtils.isEmpty(followUserIds) || Objects.isNull(date)){ - return Lists.newArrayList(); - } - String endTime = DateUtil.format(date, CoolDateUtils.DATE_FORMAT_DAY) + CommonConstants.DAY_END_TIME_SUFFIX; - return hyFollowTaskMapper.getUserTaskNum(followUserIds, endTime); - } - - /** - * 获取待完成任务 - * @param startTime - * @param endTime - * @param pageNum - * @param pageSize - * @return - */ - public Page getUndoTaskPage(String startTime, String endTime, Integer pageNum, Integer pageSize){ - PageHelper.startPage(pageNum, pageSize); - return hyFollowTaskMapper.getUndoTaskPage(startTime, endTime); - } - - /** - * 更新未完成任务的状态到已逾期 - * @return - */ - public Integer updateUndoTaskStatusToOverdue(){ - return hyFollowTaskMapper.updateUndoTaskStatusToOverdue(); - } - - /** - * 更改线索id - * @param oldLineId - * @param newLineId - */ - public Integer changeLineId(Long oldLineId, Long newLineId){ - if(Objects.isNull(oldLineId) || Objects.isNull(newLineId)){ - return CommonConstants.ZERO; - } - return hyFollowTaskMapper.changeLineId(oldLineId, newLineId); - } - - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingDAO.java deleted file mode 100644 index 8c1e3ec33..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingDAO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyInspectionSettingDO; -import com.cool.store.mapper.HyInspectionSettingMapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: HyInspectionSettingDAO - * @Description: - * @date 2023-07-18 16:29 - */ -@Repository -public class HyInspectionSettingDAO { - - @Resource - private HyInspectionSettingMapper hyInspectionSettingMapper; - - /** - * 获取分页 - * @param pageNum - * @param pageSize - * @return - */ - public Page getInspectionSettingPage(Integer pageNum, Integer pageSize){ - PageHelper.startPage(pageNum, pageSize); - Page resultPage = hyInspectionSettingMapper.getInspectionSettingPage(); - return resultPage; - } - - /** - * 获取稽查详情 - * @param inspectionSettingId - * @return - */ - public HyInspectionSettingDO getInspectionSettingDetail(Long inspectionSettingId){ - if(Objects.isNull(inspectionSettingId)){ - return null; - } - return hyInspectionSettingMapper.getInspectionSettingDetail(inspectionSettingId); - } - - public Long addInspectionSetting(HyInspectionSettingDO param){ - hyInspectionSettingMapper.insertSelective(param); - return param.getId(); - } - - public Integer updateInspectionSetting(HyInspectionSettingDO param){ - return hyInspectionSettingMapper.updateByPrimaryKeySelective(param); - } - - public List getInspectionUserIds(){ - return hyInspectionSettingMapper.getInspectionUserIds(); - } - - /** - * 获取配置列表 - * @param inspectionSettingIds - * @return - */ - public List getHyInspectionSettingByIds(List inspectionSettingIds){ - if(CollectionUtils.isEmpty(inspectionSettingIds)){ - return Lists.newArrayList(); - } - return hyInspectionSettingMapper.getHyInspectionSettingByIds(inspectionSettingIds); - } - - /** - * 获取用户配置的区域 编辑的时候排除某个配置 - * @param inspectionUserId - * @param excludeInspectionSettingId - * @return - */ - public List getHyInspectionSettingByUserId(String inspectionUserId, Long excludeInspectionSettingId){ - if(StringUtils.isBlank(inspectionUserId)){ - return Lists.newArrayList(); - } - return hyInspectionSettingMapper.getHyInspectionSettingByUserId(inspectionUserId, excludeInspectionSettingId); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingMappingDAO.java deleted file mode 100644 index 176d882cb..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInspectionSettingMappingDAO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.HyInspectionSettingMappingDO; -import com.cool.store.mapper.HyInspectionSettingMappingMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: HyInspectionSettingMappingDAO - * @Description: - * @date 2023-07-18 16:29 - */ -@Repository -public class HyInspectionSettingMappingDAO { - - @Resource - private HyInspectionSettingMappingMapper hyInspectionSettingMappingMapper; - - - /** - * 获取区域ids - * @param inspectionSettingId - * @return - */ - public List getOpenAreaMappingIds(Long inspectionSettingId){ - if(Objects.isNull(inspectionSettingId)){ - return Lists.newArrayList(); - } - return hyInspectionSettingMappingMapper.getOpenAreaMappingIds(inspectionSettingId); - } - - /** - * 新增映射关系 - * @param inspectionSettingId - * @param openAreaMappingIds - * @return - */ - public Integer addInspectionSettingMapping(Long inspectionSettingId, List openAreaMappingIds){ - if(CollectionUtils.isEmpty(openAreaMappingIds) || Objects.isNull(inspectionSettingId)){ - return CommonConstants.ZERO; - } - hyInspectionSettingMappingMapper.deleteInOpenAreaMappingIds(inspectionSettingId, openAreaMappingIds); - List insertList = new ArrayList<>(); - for (Long openAreaMappingId : openAreaMappingIds) { - HyInspectionSettingMappingDO insert = new HyInspectionSettingMappingDO(); - insert.setInspectionSettingId(inspectionSettingId); - insert.setOpenAreaMappingId(openAreaMappingId); - insert.setCreateTime(new Date()); - insert.setDeleted(Boolean.FALSE); - insertList.add(insert); - } - return hyInspectionSettingMappingMapper.batchInsertSelective(insertList); - } - - /** - * 更新映射关系 - * @param inspectionSettingId - * @param openAreaMappingIds - * @return - */ - public Integer updateInspectionSettingMapping(Long inspectionSettingId, List openAreaMappingIds){ - hyInspectionSettingMappingMapper.deleteNotInOpenAreaMappingIds(inspectionSettingId, openAreaMappingIds); - return addInspectionSettingMapping(inspectionSettingId, openAreaMappingIds); - } - - /** - * 删除映射关系 - * @param inspectionSettingId - * @return - */ - public Integer deleteInspectionSettingMapping(Long inspectionSettingId){ - if(Objects.isNull(inspectionSettingId)){ - return CommonConstants.ZERO; - } - return hyInspectionSettingMappingMapper.deleteInspectionSettingMapping(inspectionSettingId); - } - - /** - * 获取冲突的映射关系 - * @param inspectionSettingId - * @param openAreaMappingIds - * @return - */ - public List getConflictInspectionSetting(Long inspectionSettingId, List openAreaMappingIds){ - if(CollectionUtils.isEmpty(openAreaMappingIds)){ - return Lists.newArrayList(); - } - return hyInspectionSettingMappingMapper.getConflictInspectionSetting(inspectionSettingId, openAreaMappingIds); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java deleted file mode 100644 index e87a50767..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.partner.ZoneCheckDTO; -import com.cool.store.entity.HyIntendDevelopementMappingDO; -import com.cool.store.mapper.HyIntendDevelopementMappingMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/14 14:42 - * @Version 1.0 - */ -@Repository -public class HyIntendDevMappingDAO { - - @Resource - HyIntendDevelopementMappingMapper hyIntendDevelopementMappingMapper; - - - public int insertSelective(HyIntendDevelopementMappingDO record){ - return hyIntendDevelopementMappingMapper.insertSelective(record); - } - - public int updateByPrimaryKeySelective(HyIntendDevelopementMappingDO record){ - return hyIntendDevelopementMappingMapper.updateByPrimaryKeySelective(record); - } - - public int deleteByOpenAreaIds(List openAreaIds,String type){ - if (CollectionUtils.isEmpty(openAreaIds)){ - return 0; - } - return hyIntendDevelopementMappingMapper.deleteByOpenAreaIds(openAreaIds,type); - } - - public int deleteByMappingIds(List mappingIds,String type){ - if (CollectionUtils.isEmpty(mappingIds)){ - return 0; - } - return hyIntendDevelopementMappingMapper.deleteByMappingIds(mappingIds,type); - } - - public List selectByMappingIdList(List idList){ - if (CollectionUtils.isEmpty(idList)){ - return new ArrayList<>(); - } - return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList); - } - - public List selectByOpenAreaMappingIdList(List idList,String type,Long currentId){ - if (CollectionUtils.isEmpty(idList)){ - return new ArrayList<>(); - } - return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type,currentId); - } - - public HyIntendDevelopementMappingDO selectByOpenAreaMappingId(Long id,String type){ - if (id==null){ - return null; - } - return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingId(id,type); - } - - public int batchInsert(List recordList){ - if (CollectionUtils.isEmpty(recordList)){ - return 0; - } - return hyIntendDevelopementMappingMapper.batchInsert(recordList); - } - - - - - - - - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevZoneInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevZoneInfoDAO.java deleted file mode 100644 index a15ac302e..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevZoneInfoDAO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyIntendDevZoneInfoDO; -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.mapper.HyIntendDevZoneInfoMapper; -import com.cool.store.mapper.HyOpenAreaInfoMapper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/14 14:40 - * @Version 1.0 - */ -@Repository -public class HyIntendDevZoneInfoDAO { - - @Resource - HyIntendDevZoneInfoMapper hyIntendDevZoneInfoMapper; - - public int insertSelective( HyIntendDevZoneInfoDO record){ - return hyIntendDevZoneInfoMapper.insertSelective(record); - } - - - public int updateByPrimaryKeySelective(HyIntendDevZoneInfoDO record){ - return hyIntendDevZoneInfoMapper.updateByPrimaryKeySelective(record); - } - - public HyIntendDevZoneInfoDO selectById(Long id){ - if (id==null){ - return null; - } - return hyIntendDevZoneInfoMapper.selectById(id); - } - - public List selectByIds(List ids){ - if (CollectionUtils.isEmpty(ids)){ - return new ArrayList<>(); - } - return hyIntendDevZoneInfoMapper.selectByIds(ids); - } - - - public List getHyIntendDevZoneInfoList(String type){ - if (StringUtils.isEmpty(type)){ - return new ArrayList<>(); - } - return hyIntendDevZoneInfoMapper.getHyIntendDevZoneInfoList(type); - } - - /** - * 根据组织架构获取配置信息 - * @param regionIds - * @return - */ - public List getZoneInfoByRegionIds(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return hyIntendDevZoneInfoMapper.getZoneInfoByRegionIds(regionIds); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java deleted file mode 100644 index a653f58c7..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -@Repository -public class HyInterviewDAO { - - @Resource - private HyPartnerInterviewMapper interviewMapper; - - @Resource - private HyPartnerLineInfoMapper lineInfoMapper; - - /** - * 更新面试状态必须使用该方法 - * 需要同步更新面试状态和线索表中的子流程状态 - */ - @Transactional - public void updateInterviewWorkflowStatus(String interviewPlanId, WorkflowStatusEnum status) { - //修改面试状态 - interviewMapper.updateInterviewStatus(interviewPlanId, status.getCode()); - //获取对应的lineId - String lineId = interviewMapper.getLineId(interviewPlanId); - //修改线索表子流程状态 - lineInfoMapper.updateWorkflowStatus(lineId, status.getCode()); - } - - /** - * 根据线索id批量修改面试状态和线索表子流程状态 - * @param lineIds - * @param status - */ - @Transactional - public void batchUpdateInterviewWorkflowStatus(List lineIds, Integer status){ - //修改面试状态 - interviewMapper.batchUpdateStatusByLineIds(lineIds, status); - //修改线索表子流程状态 - lineInfoMapper.batchUpdateStatusByLineIds(lineIds, status); - - } - - public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ - if (newLineId==null || Objects.isNull(oldLineId)){ - return 0; - } - return interviewMapper.updateLineId(newPartnerId,newLineId, oldLineId); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java deleted file mode 100644 index 7c4526aae..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.cool.store.dao; - -import cn.hutool.core.convert.Convert; -import com.cool.store.dto.partner.ApplyReservationProvinceDTO; -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.mapper.HyOpenAreaInfoMapper; -import com.cool.store.utils.StringUtil; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/6 14:32 - * @Version 1.0 - */ -@Repository -public class HyOpenAreaInfoDAO { - - @Resource - HyOpenAreaInfoMapper hyOpenAreaInfoMapper; - - public List queryKeyOpenArea(){ - return hyOpenAreaInfoMapper.queryKeyOpenArea(); - } - - public List queryByKeyword(String keyword,Boolean applyFlag,String areaStatus,Boolean filterData){ - return hyOpenAreaInfoMapper.queryByKeyword(keyword,applyFlag,areaStatus,filterData); - } - - public List queryFirstLevel(){ - return hyOpenAreaInfoMapper.queryFirstLevel(); - } - - public List queryByIdsExcludeFirstLevel(List ids){ - if (CollectionUtils.isEmpty(ids)){ - return new ArrayList<>(); - } - return hyOpenAreaInfoMapper.queryByIdsExcludeFirstLevel(ids); - } - - public List getApplyReservationProvinceCount(){ - return hyOpenAreaInfoMapper.getApplyReservationProvinceCount(); - } - - public List getChildrenList(String type ,Long parentId){ - if (parentId==null){ - return new ArrayList<>(); - } - return hyOpenAreaInfoMapper.getChildrenList(type,parentId); - } - - public Integer getChildrenCount(String type ,Long parentId){ - if (parentId==null){ - return 0; - } - return hyOpenAreaInfoMapper.getChildrenCount(type,parentId); - } - - - public int batchUpdateById(String backgroundBanner,String detailBanner,String areaStatus,String updateUserId,List ids){ - if (StringUtils.isEmpty(areaStatus)){ - return 0; - } - return hyOpenAreaInfoMapper.batchUpdateById(backgroundBanner,detailBanner,areaStatus,updateUserId,ids); - } - - public int batchUpdateByParentId(String backgroundBanner,String detailBanner,String areaStatus,String updateUserId,List ids){ - if (StringUtils.isEmpty(areaStatus)){ - return 0; - } - return hyOpenAreaInfoMapper.batchUpdateByParentId(backgroundBanner,detailBanner,areaStatus,updateUserId,ids); - } - - - public List selectByIds(List ids){ - if (CollectionUtils.isEmpty(ids)){ - return Lists.newArrayList(); - } - return hyOpenAreaInfoMapper.selectByIds(ids); - } - - public Map getNameMapByIds(List ids){ - if (CollectionUtils.isEmpty(ids)){ - return Maps.newHashMap(); - } - List hyOpenAreaInfoDOS = hyOpenAreaInfoMapper.selectByIds(ids); - return ListUtils.emptyIfNull(hyOpenAreaInfoDOS).stream().collect(Collectors.toMap(k->k.getId(), v->v.getAreaName(), (k1, k2)->k1)); - } - - public Map selectNameMapByIds(List ids){ - if (CollectionUtils.isEmpty(ids)){ - return Maps.newHashMap(); - } - List hyOpenAreaInfoDOS = hyOpenAreaInfoMapper.selectByIds(ids); - return ListUtils.emptyIfNull(hyOpenAreaInfoDOS).stream().collect(Collectors.toMap(k->String.valueOf(k.getId()), v->v.getAreaPath().replace("/"," "))); - } - - - public HyOpenAreaInfoDO selectById(Long id){ - if (id==null){ - return null; - } - return hyOpenAreaInfoMapper.selectById(id); - } - - public List getAllOpenArea(){ - return hyOpenAreaInfoMapper.getAllOpenArea(); - } - - - public List selectAllCity(){ - return hyOpenAreaInfoMapper.selectAllCity(); - } - - /** - * 过滤叶子节点 - * @param openAreaIds - * @return 叶子节点id - */ - public List filterLeafNode(List openAreaIds){ - if(CollectionUtils.isEmpty(openAreaIds)){ - return Lists.newArrayList(); - } - return hyOpenAreaInfoMapper.filterLeafNode(openAreaIds); - } - - public List getAllAreaCode(String id) { - if (StringUtils.isEmpty(id)){ - return new ArrayList<>(); - } - //获取省下所有数据 - List provinceCodeList= hyOpenAreaInfoMapper.getProvinceAllCode(id); - if(CollectionUtils.isEmpty(provinceCodeList)){ - //获取市区下所有数据 - List cityCodeList= hyOpenAreaInfoMapper.getSonArea(id); - if(CollectionUtils.isEmpty(cityCodeList)){ - return new ArrayList(){{ add(hyOpenAreaInfoMapper.selectById(Convert.toLong(id)));}}; - }else { - return cityCodeList; - } - }else { - return provinceCodeList; - } - } - - public HyOpenAreaInfoDO selectByAreaPath(String areaPath) { - if (StringUtil.isEmpty(areaPath)) { - return null; - } - return hyOpenAreaInfoMapper.selectByAreaPath(areaPath); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java deleted file mode 100644 index 13ae243fc..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.mapper.HyPartnerBaseInfoMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/13 20:25 - * @Version 1.0 - */ -@Repository -public class HyPartnerBaseInfoDAO { - - - @Resource - HyPartnerBaseInfoMapper hyPartnerBaseInfoMapper; - - - - public int insertSelective( HyPartnerBaseInfoDO record){ - return hyPartnerBaseInfoMapper.insertSelective(record); - } - - public int batchInsert( List records){ - if (CollectionUtils.isEmpty(records)){ - return 0; - } - return hyPartnerBaseInfoMapper.batchInsert(records); - } - - public HyPartnerBaseInfoDO selectById(@Param("id") Long id){ - return hyPartnerBaseInfoMapper.selectById(id); - } - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:51 - */ - public int updateByPrimaryKeySelective(HyPartnerBaseInfoDO record){ - return hyPartnerBaseInfoMapper.updateByPrimaryKeySelective(record); - } - - public int updateByPrimaryKey(HyPartnerBaseInfoDO record){ - return hyPartnerBaseInfoMapper.updateByPrimaryKey(record); - } - - - public int updateByPartnerId(String userName,String mobile,String partnerId){ - return hyPartnerBaseInfoMapper.updateByPartnerId(userName,mobile,partnerId); - } - public int cleanIdCardInfoByPartnerLineId(String idCard, String idCardPhotoFront, - String idCardPhotoBlack, Long partnerLineId){ - return hyPartnerBaseInfoMapper.cleanIdCardInfoByPartnerLineId(idCard, idCardPhotoFront, idCardPhotoBlack, partnerLineId); - } - - - public HyPartnerBaseInfoDO getByPartnerIdAndLineId(String partnerId, Long partnerLineId){ - if (StringUtils.isEmpty(partnerId) || partnerLineId == null){ - return null; - } - return hyPartnerBaseInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId); - } - - public HyPartnerBaseInfoDO getByPartnerLineId(Long partnerLineId){ - if (partnerLineId == null){ - return null; - } - return hyPartnerBaseInfoMapper.getByPartnerLineId(partnerLineId); - } - - public List getByPartnerLineIds(List partnerLineId){ - if (CollectionUtils.isEmpty(partnerLineId)){ - return new ArrayList<>(); - } - return hyPartnerBaseInfoMapper.getByPartnerLineIds(partnerLineId); - } - - public HyPartnerBaseInfoDO getByIdCard(String idCard){ - if (StringUtils.isEmpty(idCard)){ - return null; - } - return hyPartnerBaseInfoMapper.getByIdCard(idCard); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java deleted file mode 100644 index 3df225b6f..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyPartnerClerkDO; -import com.cool.store.mapper.HyPartnerClerkMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -/** - * @Author suzhuhong - * @Date 2023/6/15 10:09 - * @Version 1.0 - */ -@Repository -public class HyPartnerClerkDAO { - - @Resource - HyPartnerClerkMapper hyPartnerClerkMapper; - - public int insertSelective( HyPartnerClerkDO record){ - return hyPartnerClerkMapper.insertSelective(record); - } - - public int updateByPrimaryKeySelective(HyPartnerClerkDO record){ - return hyPartnerClerkMapper.updateByPrimaryKeySelective(record); - } - - public List getHyPartnerClerkList(Long lineId){ - return hyPartnerClerkMapper.getHyPartnerClerkList(lineId); - } - - public int batchInsert(List hyPartnerClerkDOList){ - if (CollectionUtils.isEmpty(hyPartnerClerkDOList)){ - return -1; - } - return hyPartnerClerkMapper.batchInsert(hyPartnerClerkDOList); - } - - public void deleteByPartnerIdAndLineId(String partnerId, Long partnerLineId){ - if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){ - return; - } - hyPartnerClerkMapper.deleteByPartnerIdAndLineId(partnerId, partnerLineId); - } - - public List listByPartnerIdAndLineId(String partnerId, Long partnerLineId){ - if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){ - return Collections.emptyList(); - } - return hyPartnerClerkMapper.listByPartnerIdAndLineId(partnerId, partnerLineId); - } - - public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ - if (newLineId==null || Objects.isNull(oldLineId)){ - return 0; - } - return hyPartnerClerkMapper.updateLineId(newPartnerId,newLineId, oldLineId); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java deleted file mode 100644 index b9eeb6cad..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; -import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; -import com.cool.store.dto.exhibition.ExhibitionLineDTO; -import com.cool.store.dto.exhibition.PartnerSignUpDTO; -import com.cool.store.entity.HyPartnerExhibitionDO; -import com.cool.store.entity.HyPartnerExhibitionInterviewDO; -import com.cool.store.mapper.HyPartnerExhibitionMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:13 - * @Version 1.0 - */ -@Repository -public class HyPartnerExhibitionDAO { - @Resource - HyPartnerExhibitionMapper hyPartnerExhibitionMapper; - - public int insertSelective(HyPartnerExhibitionDO record){ - if (record == null){ - return -1; - } - return hyPartnerExhibitionMapper.insertSelective(record); - } - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:38 - */ - public HyPartnerExhibitionDO selectByPrimaryKey(Long id){ - if (id == null){ - return new HyPartnerExhibitionDO(); - } - return hyPartnerExhibitionMapper.selectByPrimaryKey(id); - } - - public HyPartnerExhibitionDO querySelective(HyPartnerExhibitionDO record){ - if (record == null){ - return new HyPartnerExhibitionDO(); - } - return hyPartnerExhibitionMapper.querySelective(record); - } - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:38 - */ - public int updateByPrimaryKeySelective(HyPartnerExhibitionDO record){ - if (record.getId() == null){ - return -1; - } - return hyPartnerExhibitionMapper.updateByPrimaryKeySelective(record); - } - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:38 - */ - public int deleteByPrimaryKey(Long id){ - if (id == null){ - return -1; - } - return hyPartnerExhibitionMapper.deleteByPrimaryKey(id); - } - - public List getExhibitionLine(Integer exhibitionId){ - if (exhibitionId == null){ - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.getExhibitionLine(exhibitionId); - } - - public List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id){ - if (exhibitionId == null){ - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.exhibitionLineList(exhibitionId,participationStatus, partnerUserId,userId,id); - } - - public void rejectExhibitionInterview(String partnerLineId) { - if (StringUtils.isEmpty(partnerLineId)){ - return; - } - hyPartnerExhibitionMapper.rejectExhibitionInterview(partnerLineId); - } - - public void deleteAllByLineId(Long partnerLineId) { - if (partnerLineId == null){ - return; - } - hyPartnerExhibitionMapper.deleteAllByLineId(partnerLineId); - } - - public List queryIdListByInterviewPlanIds(List interviewPlanIds) { - if (ObjectUtils.isEmpty(interviewPlanIds)) { - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.queryListByInterviewPlanIds(interviewPlanIds); - } - - public List queryListByLineIds(List lindIds, Integer exhibitionPartnerStatusCode) { - if (ObjectUtils.isEmpty(lindIds) || exhibitionPartnerStatusCode == null) { - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.queryListByLineIds(lindIds, exhibitionPartnerStatusCode); - } - - public HyPartnerExhibitionInterviewDO queryPartnerExhibitionInterviewInfo(Long interviewPlanId, Long partnerLineId) { - if (interviewPlanId == null || partnerLineId == null) { - return new HyPartnerExhibitionInterviewDO(); - } - return hyPartnerExhibitionMapper.queryPartnerExhibitionInterviewInfo(interviewPlanId, partnerLineId); - } - - - public List exhibitionLineBaseInfo(String partnerName, Integer exhibitionId) { - if (exhibitionId == null) { - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.exhibitionLineBaseInfo(partnerName, exhibitionId); - } - - public HyPartnerExhibitionDO getPartnerExhibition(Integer exhibitionId, Long lindId){ - return hyPartnerExhibitionMapper.getPartnerExhibition(exhibitionId,lindId); - } - - public List partnerSignUpCount(List lineIds){ - if (CollectionUtils.isEmpty(lineIds)){ - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.partnerSignUpCount(lineIds); - } - - public List getCloseExhibitionLineIds(List exhibitionIds) { - if (CollectionUtils.isEmpty(exhibitionIds)){ - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.getCloseExhibitionLineIds(exhibitionIds); - } - - public List getLineByExhibitionIds(List exhibitionIds) { - if (CollectionUtils.isEmpty(exhibitionIds)){ - return new ArrayList<>(); - } - return hyPartnerExhibitionMapper.getLineByExhibitionIds(exhibitionIds); - } - - public void updateStatusAfterSubmitIndustry(Long partnerLineId) { - if (partnerLineId == null) { - return; - } - hyPartnerExhibitionMapper.updateStatusAfterSubmitIndustry(partnerLineId); - } - - public void updateStatusAfterFinishInterview(String interviewPlanId) { - if (StringUtils.isEmpty(interviewPlanId)) { - return; - } - hyPartnerExhibitionMapper.updateStatusAfterFinishInterview(Long.parseLong(interviewPlanId)); - } - - public void updateStatusAfterSubmitQualification(String interviewPlanId) { - if (StringUtils.isEmpty(interviewPlanId)) { - return; - } - hyPartnerExhibitionMapper.updateStatusAfterSubmitQualification(Long.parseLong(interviewPlanId)); - } - - public ExhibitionInterviewInfoDTO getStartInterviewInfo(Long lineId) { - if (lineId == null) { - return null; - } - return hyPartnerExhibitionMapper.getStartInterviewInfo(lineId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java deleted file mode 100644 index 6853c921e..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; -import com.cool.store.entity.HyPartnerIntentInfoDO; -import com.cool.store.mapper.HyPartnerIntentInfoMapper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @Author suzhuhong - * @Date 2023/6/9 15:02 - * @Version 1.0 - */ -@Repository -public class HyPartnerIntentInfoDAO { - - - @Resource - HyPartnerIntentInfoMapper hyPartnerIntentInfoMapper; - - @Autowired - HyPartnerExhibitionDAO hyPartnerExhibitionDAO; - - @Transactional - public int insertSelective( HyPartnerIntentInfoDO record){ - //增加修改线索会销状态 - hyPartnerExhibitionDAO.updateStatusAfterSubmitIndustry(record.getPartnerLineId()); - return hyPartnerIntentInfoMapper.insertSelective(record); - } - - public int updateByPrimaryKeySelective(HyPartnerIntentInfoDO record){ - return hyPartnerIntentInfoMapper.updateByPrimaryKeySelective(record); - } - - public HyPartnerIntentInfoDO selectByPrimaryKeySelective(Long id){ - if (id==null){ - return null; - } - return hyPartnerIntentInfoMapper.selectByPrimaryKeySelective(id); - } - - - public List selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus, String keyword, Integer callStatus, - List userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List userChannelIdList){ - if (StringUtils.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyPartnerIntentInfoMapper.selectPartnerIntentApplyInfoList(userId,workflowStage,workflowStatus,keyword,callStatus,userPortraitIdList,lastFollowStartTime,lastFollowEndTime,userChannelIdList); - } - - - public HyPartnerIntentInfoDO selectByLineId(Long lineId){ - if (lineId==null){ - return null; - } - return hyPartnerIntentInfoMapper.selectByLineId(lineId); - } - - public HyPartnerIntentInfoDO getByPartnerIdAndLineId(String partnerId, Long partnerLineId){ - if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){ - return null; - } - return hyPartnerIntentInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId); - } - - public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ - if (newLineId==null || Objects.isNull(oldLineId)){ - return 0; - } - return hyPartnerIntentInfoMapper.updateLineId(newPartnerId,newLineId, oldLineId); - } - - public int updateByPartnerLineId(HyPartnerIntentInfoDO record){ - if(Objects.isNull(record.getPartnerLineId())){ - return 0; - } - return hyPartnerIntentInfoMapper.updateByPartnerLineId(record); - } - - public int updateAcquaintanceFlag(Long id ,Integer acquaintanceFlag,String acquaintanceName, Integer acquaintanceRelationshipType,String otherRelationshipType){ - if (id==null){ - return 0; - } - return hyPartnerIntentInfoMapper.updateAcquaintanceFlag(id,acquaintanceFlag,acquaintanceName,acquaintanceRelationshipType,otherRelationshipType); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java deleted file mode 100644 index 1fe8eaf39..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.partner.AdvanceLineDTO; -import com.cool.store.dto.partner.PartnerInterviewInfoDTO; -import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; -import com.cool.store.entity.HyPartnerInterviewPlanDO; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -/** - * @Author suzhuhong - * @Date 2023/6/8 14:54 - * @Version 1.0 - */ -@Repository -public class HyPartnerInterviewPlanDAO { - - @Resource - HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - - /** - * 查询当前用户当天是否有面试 - * @param userId - * @param currentDate - * @return - */ - public List getCurrentDateInterviewCount(String userId, String currentDate, String endDate){ - if (StringUtils.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyPartnerInterviewPlanMapper.getCurrentDateInterviewCount(userId,currentDate,endDate); - } - - /** - * 查询指定日期面试数量 与未来7天面试数量 - * @param userId - * @param currentDate - * @param startTime - * @param endTime - * @return - */ - public SpecialDateRangeInterviewCountDTO getInterviewCount(String userId, String currentDate, String startTime, String endTime){ - if (StringUtils.isEmpty(userId)){ - return new SpecialDateRangeInterviewCountDTO(); - } - return hyPartnerInterviewPlanMapper.getInterviewCount(userId,currentDate,startTime,endTime); - } - - - /** - * 当天还有几场面试 - * @param userId - * @param currentDate - * @return - */ - public List getInterviewPlanList(String userId, String currentTime,String currentDay){ - if (StringUtils.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyPartnerInterviewPlanMapper.getInterviewPlanList(userId,currentTime,currentDay); - } - - /** - * 工作台 招商经理 预约面试时间 合格资格面试 列表 - * @param userId - * @param workflowStage - * @param workflowStatus - * @return - */ - public List getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus,Boolean filter){ - if (StringUtils.isEmpty(userId)){ - return Lists.newArrayList(); - } - return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus,filter); - } - - public Long selectInterviewIdByLineId(Long lineId){ - if (lineId==null){ - return 0L; - } - return hyPartnerInterviewPlanMapper.selectInterviewIdByLineId(lineId); - } - - public HyPartnerInterviewPlanDO getInterviewPlanByLineId(Long lineId){ - if (lineId==null){ - return null; - } - return hyPartnerInterviewPlanMapper.getInterviewPlanByLineId(lineId); - } - - /** - * 根据线索表ID查询 - * @param lindIds - * @return - */ - public List getHyPartnerInterviewPlanByLineIds(List lindIds){ - if (CollectionUtils.isEmpty(lindIds)){ - return Lists.newArrayList(); - } - return hyPartnerInterviewPlanMapper.getHyPartnerInterviewPlanByLineIds(lindIds); - } - - - public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ - if (newLineId==null || Objects.isNull(oldLineId)){ - return 0; - } - return hyPartnerInterviewPlanMapper.updateLineId(newPartnerId,newLineId, oldLineId); - } -} 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 deleted file mode 100644 index 90a161efc..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.cool.store.dao; - -import cn.hutool.core.map.MapUtil; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.partner.*; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.PrivateSeaLineListRequest; -import com.cool.store.vo.LinePageInfoVo; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/8 15:10 - * @Version 1.0 - */ -@Repository -public class HyPartnerLineInfoDAO { - - - @Resource - HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - - public int insertSelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){ - return hyPartnerLineInfoMapper.insertSelective(hyPartnerLineInfoDO); - } - - public int batchInsert(List hyPartnerLineInfoDOS){ - if (CollectionUtils.isEmpty(hyPartnerLineInfoDOS)){ - return -1; - } - return hyPartnerLineInfoMapper.batchInsert(hyPartnerLineInfoDOS); - } - - - public int batchDeleted(List lineIdList){ - if (CollectionUtils.isEmpty(lineIdList)){ - return -1; - } - return hyPartnerLineInfoMapper.batchDeleted(lineIdList); - } - - public HyPartnerLineInfoDO selectByPrimaryKeySelective(Long id){ - if (id==null){ - return null; - } - return hyPartnerLineInfoMapper.selectByPrimaryKeySelective(id); - } - - public int updateByPrimaryKeySelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){ - hyPartnerLineInfoDO.setUpdateTime(new Date()); - return hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - } - - public int updateByPrimaryKey(HyPartnerLineInfoDO record){ - return hyPartnerLineInfoMapper.updateByPrimaryKey(record); - } - - - public List getAdventLineCount( String userId, String currentDate,String endDate){ - if (StringUtils.isEmpty(userId)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getAdventLineCount(userId,currentDate,endDate); - } - - public StageCountDTO selectStagePendingCount(String userId){ - if (StringUtils.isEmpty(userId)){ - return new StageCountDTO(0,0); - } - return hyPartnerLineInfoMapper.selectStagePendingCount(userId); - } - - public StageCountDTO selectStageFollowCount(String userId){ - if (StringUtils.isEmpty(userId)){ - return new StageCountDTO(0,0,0); - } - return hyPartnerLineInfoMapper.selectStageFollowCount(userId); - } - - - public PartnerLineInfoAndBaseInfoDTO selectPartnerLineInfoAndBaseInfo(Long lineId){ - if (lineId==null){ - return null; - } - return hyPartnerLineInfoMapper.selectPartnerLineInfoAndBaseInfo(lineId); - } - - public List lastMonthCloseLine(String userId, String lastMonthTodayDate){ - if (userId==null){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.lastMonthCloseLine(userId,lastMonthTodayDate); - } - - public int updateInvestmentManager(String userId, List lineIdList){ - if (StringUtils.isEmpty(userId)||CollectionUtils.isEmpty(lineIdList)){ - return -1; - } - return hyPartnerLineInfoMapper.updateInvestmentManager(lineIdList,userId); - } - - - - public List getLineListByLineIds( List lineIdList){ - if (CollectionUtils.isEmpty(lineIdList)){ - return Lists.newArrayList(); - } - return hyPartnerLineInfoMapper.getLineListByLineIds(lineIdList); - } - - - public List getBlackList( String userNameKeyword,String phoneKeyword, String intentAreaName , Integer acceptAdjustType){ - return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType); - } - - - public Boolean joinAndRemoveBlack( Long lineId, Integer status, String joinReason, String removeReason){ - if (lineId==null){ - return Boolean.FALSE; - } - return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason); - } - - public List getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentAreaName, Integer acceptAdjustType, String updateStartTime, String updateEndTime, List userIdList, String createStartTime, String createEndTime){ - return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList, createStartTime, createEndTime); - } - - public List getPrivateSeaLineList(PrivateSeaLineListRequest request){ - return hyPartnerLineInfoMapper.getPrivateSeaLineList(request); - } - - - public List getPartnerLastLine(List partnerIdList){ - if (CollectionUtils.isEmpty(partnerIdList)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getPartnerLastLine(partnerIdList); - } - public HyPartnerLineInfoDO getByPartnerId(String partnerId){ - if (StringUtils.isEmpty(partnerId)){ - return null; - } - return hyPartnerLineInfoMapper.getByPartnerId(partnerId); - } - - - public List getFollowCountList( List partnerIdList){ - if (CollectionUtils.isEmpty(partnerIdList)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getFollowCountList(partnerIdList); - } - - public List getHyPartnerLineInfoListByIds( List lineIds){ - if (CollectionUtils.isEmpty(lineIds)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(lineIds); - } - - /** - * 查询根据历史 - * @param partnerId - * @return - */ - public List getLineFollowHistoryList(String partnerId){ - if (partnerId==null){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getLineFollowHistoryList(partnerId); - } - - /** - * 获取线索加盟商简要信息 - * @param partnerLineIds - * @return - */ - public Map getPartnerSimpleInfoByLineIds(List partnerLineIds){ - if(CollectionUtils.isEmpty(partnerLineIds)){ - return MapUtil.newHashMap(); - } - List partnerList = hyPartnerLineInfoMapper.getPartnerSimpleInfoByLineIds(partnerLineIds); - return ListUtils.emptyIfNull(partnerList).stream().collect(Collectors.toMap(k->k.getPartnerLineId(), Function.identity(), (k1, k2)->k1)); - } - - public PartnerSimpleInfoDTO getPartnerSimpleInfoByLineId(Long partnerLineId){ - if(Objects.isNull(partnerLineId)){ - return null; - } - List partnerList = hyPartnerLineInfoMapper.getPartnerSimpleInfoByLineIds(Arrays.asList(partnerLineId)); - return CollectionUtils.isEmpty(partnerList) ? null : partnerList.get(CommonConstants.ZERO); - } - - public List getHyPartnerLineInfoList( List lineIds,String investmentManager){ - if (CollectionUtils.isEmpty(lineIds)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.getHyPartnerLineInfoList(lineIds,investmentManager); - } - public List getPublicSeaPageInfoNext(Long lineId, String userNameKeyword, String phoneKeyword, String intentAreaName, Integer acceptAdjustType, String updateStartTime, String updateEndTime, List userIdList, String createStartTime, String createEndTime,String pageTurn,Integer limit1,Integer limit2){ - return hyPartnerLineInfoMapper.getPublicSeaPageInfoNext(lineId,userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList, createStartTime, createEndTime,pageTurn,limit1,limit2); - } - - public List getPrivateSeaPageInfoNext(PrivateSeaLineListRequest request){ - return hyPartnerLineInfoMapper.getPrivateSeaPageInfoNext(request); - } - - - public List lineInterviewList(List planIds){ - if (CollectionUtils.isEmpty(planIds)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.lineInterviewList(planIds); - } - - public List lineInvestmentList(List lineIds){ - if (CollectionUtils.isEmpty(lineIds)){ - return new ArrayList<>(); - } - return hyPartnerLineInfoMapper.lineInvestmentList(lineIds); - } - - public int batchUpdate(List records){ - if (CollectionUtils.isEmpty(records)){ - return -1; - } - return hyPartnerLineInfoMapper.batchUpdate(records); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java deleted file mode 100644 index a7a27940e..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cool.store.dao; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.entity.HyPartnerTaskInfoLogDO; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.mapper.HyPartnerTaskInfoLogMapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @Author wxp - * @Date 2023/6/25 19:41 - * @Version 1.0 - */ -@Repository -@Slf4j -public class HyPartnerTaskInfoLogDAO { - - - @Resource - HyPartnerTaskInfoLogMapper hyPartnerTaskInfoLogMapper; - - - public int updateByPrimaryKeySelective(HyPartnerTaskInfoLogDO hyPartnerTaskInfoLogDO){ - return hyPartnerTaskInfoLogMapper.updateByPrimaryKeySelective(hyPartnerTaskInfoLogDO); - } - - public int insertSelective( HyPartnerTaskInfoLogDO record){ - return hyPartnerTaskInfoLogMapper.insertSelective(record); - } - - /** - * 新增操作日志 - * @param lineLogInfo - */ - public void addOperateLog(LineLogInfo lineLogInfo){ - if(!LineLogInfo.checkParams(lineLogInfo)){ - return; - } - HyPartnerTaskInfoLogDO logInfo = LineLogInfo.convertDO(lineLogInfo); - log.info("logInfo:{}", JSONObject.toJSON(lineLogInfo)); - insertSelective(logInfo); - } - - /** - * 删除日志 - * @param lineId - * @param message - * @return - */ - public int deleteByLineId(Long lineId, String message){ - if(Objects.isNull(lineId)){ - return CommonConstants.ZERO; - } - return hyPartnerTaskInfoLogMapper.deleteByLineId(lineId, message); - } - - public int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){ - if (newLineId==null || Objects.isNull(oldLineId)){ - return 0; - } - return hyPartnerTaskInfoLogMapper.updateLineId(newPartnerId,newLineId, oldLineId); - } - - public Page getFollowTaskLogPage(Integer pageNum, Integer pageSize, Long partnerLineId){ - if(Objects.isNull(partnerLineId)){ - return new Page<>(); - } - PageHelper.startPage(pageNum, pageSize); - List operateTypes = new ArrayList<>(); - operateTypes.add(OperateTypeEnum.ADD_FOLLOW_TASK.getCode()); - operateTypes.add(OperateTypeEnum.ADD_FOLLOW_LOG.getCode()); - operateTypes.add(OperateTypeEnum.ADD_TAGS.getCode()); - operateTypes.add(OperateTypeEnum.CALL_UP.getCode()); - return hyPartnerTaskInfoLogMapper.getLogPageByLineId(partnerLineId, operateTypes); - } - -} 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 deleted file mode 100644 index 5b33e6c7e..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserChannelDAO.java +++ /dev/null @@ -1,37 +0,0 @@ -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/dao/HyPartnerUserInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java deleted file mode 100644 index 6afa8a0bb..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.dto.partner.MobileCheckDTO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.mapper.HyPartnerUserInfoMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/8 19:41 - * @Version 1.0 - */ -@Repository -public class HyPartnerUserInfoDAO { - - - @Resource - HyPartnerUserInfoMapper hyPartnerUserInfoMapper; - - - public int updateByPrimaryKeySelective(HyPartnerUserInfoDO hyPartnerUserInfoDO){ - return hyPartnerUserInfoMapper.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - } - - - /** - * 根据PartnerId查询用户 - * @param partnerId - * @return - */ - public HyPartnerUserInfoDO selectByPartnerId(String partnerId){ - if (StringUtils.isEmpty(partnerId)){ - return null; - } - return hyPartnerUserInfoMapper.selectByPartnerId(partnerId); - } - - /** - * 根据mobile查询用户 - * @param mobile - * @return - */ - public HyPartnerUserInfoDO selectByMobile(String mobile){ - if (StringUtils.isEmpty(mobile)){ - return null; - } - return hyPartnerUserInfoMapper.selectByMobile(mobile); - } - - /** - * 根据PartnerIds批量查询用户 - * @param partnerIds - * @return - */ - public List selectByPartnerIds(List partnerIds){ - if (CollectionUtils.isEmpty(partnerIds)){ - return Lists.newArrayList(); - } - return hyPartnerUserInfoMapper.selectByPartnerIds(partnerIds); - } - - public int insertSelective( HyPartnerUserInfoDO record){ - return hyPartnerUserInfoMapper.insertSelective(record); - } - - public int updateJoinKnowById(Integer isWritePartnerKnow, Long id){ - if (id == null || isWritePartnerKnow == null){ - return 0; - } - return hyPartnerUserInfoMapper.updateJoinKnowById(isWritePartnerKnow, id); - } - - public int updateByPartnerId(HyPartnerUserInfoDO record){ - if(StringUtils.isBlank(record.getPartnerId())){ - return 0; - } - return hyPartnerUserInfoMapper.updateByPartnerId(record); - } - - - public String selectLastCrmCreateTime() { - return hyPartnerUserInfoMapper.selectLastCrmCreateTime(); - } - - public MobileCheckDTO selectByCheckMobile(String mobile) { - if (StringUtils.isEmpty(mobile)){ - return null; - } - return hyPartnerUserInfoMapper.selectByCheckMobile(mobile); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserPlatformBindDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserPlatformBindDAO.java deleted file mode 100644 index 9bb48047b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserPlatformBindDAO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyPartnerUserPlatformBindDO; -import com.cool.store.mapper.HyPartnerUserPlatformBindMapper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; - -/** - * @Author wxp - * @Date 2023/6/13 19:41 - * @Version 1.0 - */ -@Repository -public class HyPartnerUserPlatformBindDAO { - - - @Resource - HyPartnerUserPlatformBindMapper hyPartnerUserPlatformBindMapper; - - public int insertSelective( HyPartnerUserPlatformBindDO record){ - return hyPartnerUserPlatformBindMapper.insertSelective(record); - } - - public int updateByPrimaryKeySelective(HyPartnerUserPlatformBindDO record){ - return hyPartnerUserPlatformBindMapper.updateByPrimaryKeySelective(record); - } - - public HyPartnerUserPlatformBindDO getByPlatformTypeAndUserId(String platformType, String platformUserId){ - if(StringUtils.isAnyBlank(platformType, platformUserId)){ - return null; - } - return hyPartnerUserPlatformBindMapper.getByPlatformTypeAndUserId(platformType, platformUserId); - } - - public HyPartnerUserPlatformBindDO getByPartnerId(String partnerId){ - if (StringUtils.isEmpty(partnerId)){ - return null; - } - return hyPartnerUserPlatformBindMapper.getByPartnerId(partnerId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPhoneLocationDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPhoneLocationDAO.java deleted file mode 100644 index 1c77d282b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPhoneLocationDAO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.HyPhoneLocationDO; -import com.cool.store.mapper.HyPhoneLocationMapper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/30 14:51 - * @Version 1.0 - */ -@Repository -public class HyPhoneLocationDAO { - - @Resource - HyPhoneLocationMapper hyPhoneLocationMapper; - - - - public int insertSelective(HyPhoneLocationDO record){ - return hyPhoneLocationMapper.insertSelective(record); - } - - - public HyPhoneLocationDO selectByPhoneNumber(String phoneNumber){ - return hyPhoneLocationMapper.selectByPhoneNumber(phoneNumber); - } - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java deleted file mode 100644 index 6e7b73673..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.RegionDO; -import com.cool.store.mapper.RegionMapper; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: RegionDAO - * @Description: - * @date 2023-06-07 14:22 - */ -@Repository -public class RegionDAO { - - @Resource - private RegionMapper regionMapper; - - /** - * 插入或者更新组织架构 - * @param insertOrUpdateList - * @return - */ - public Integer batchInsertOrUpdate(List insertOrUpdateList){ - if(CollectionUtils.isEmpty(insertOrUpdateList)){ - return CommonConstants.ZERO; - } - return regionMapper.batchInsertOrUpdate(insertOrUpdateList); - } - - public Integer deleteNotExistRegion(List regionIds){ - return regionMapper.deleteNotExistRegion(regionIds); - } - - public List getRegionByRegionIds(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return regionMapper.getRegionByRegionIds(regionIds); - } - - public List getRegionBaseInfoList(){ - return regionMapper.getRegionBaseInfoList(); - } - - public Map getRegionMap(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Maps.newHashMap(); - } - List regionList = regionMapper.getRegionNameByRegionIds(regionIds); - return ListUtils.emptyIfNull(regionList).stream().collect(Collectors.toMap(RegionDO::getRegionId, RegionDO::getName)); - } - - /** - * 获取区域 - * @param regionId - * @return - */ - public RegionDO getRegionInfoByRegionId(String regionId){ - if(StringUtils.isBlank(regionId)){ - return null; - } - return regionMapper.getRegionInfoByRegionId(regionId); - } - - /** - * 判断一个节点是否是叶子节点 - * @param regionId - * @return - */ - public boolean isLeafNode(String regionId){ - Integer subCount = regionMapper.getSubNodeCountByRegionId(regionId); - return subCount <= CommonConstants.ZERO; - } - - /** - * 删除区域 - * @param regionId - * @return - */ - public Integer deleteRegionByRegionId(String regionId){ - if(StringUtils.isBlank(regionId)){ - return CommonConstants.ZERO; - } - return regionMapper.deleteRegionByRegionId(regionId); - } - - /** - * 获取所有的子节点 - * @param leadDeptIds - */ - public List getSubRegionIds(List leadDeptIds) { - if(CollectionUtils.isEmpty(leadDeptIds)){ - return Lists.newArrayList(); - } - List regionList = getRegionByRegionIds(leadDeptIds); - List regionPathList = regionList.stream().map(RegionDO::getRegionPath).collect(Collectors.toList()); - return regionMapper.getSubRegionIds(regionPathList); - } - - /** - * 获取子部门 - * @param regionId - * @return - */ - public List getSubRegion(String regionId){ - if(StringUtils.isBlank(regionId)){ - return Lists.newArrayList(); - } - return regionMapper.getSubRegion(regionId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java deleted file mode 100644 index 0d5c8a7fb..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.SuperAdminConfigDO; -import com.cool.store.mapper.SuperAdminConfigMapper; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/9 14:26 - * @Version 1.0 - */ -@Repository -public class SuperAdminConfigDAO { - - @Resource - SuperAdminConfigMapper superAdminConfigMapper; - - public SuperAdminConfigDO selectByPrimaryKey(Long id){ - if (id==null){ - return null; - } - return superAdminConfigMapper.selectByPrimaryKey(id); - } - - - public SuperAdminConfigDO isSuperAdmin(String userId){ - return superAdminConfigMapper.isSuperAdmin(userId); - } - - - - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java deleted file mode 100644 index bd82f3145..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.SysMenuDO; -import com.cool.store.mapper.SysMenuMapper; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: SysMenuDAO - * @Description: - * @date 2023-06-08 16:41 - */ -@Repository -public class SysMenuDAO { - - @Resource - private SysMenuMapper sysMenuMapper; - - public List selectMenuAll(List parentIds){ - return sysMenuMapper.selectMenuAll(parentIds); - } - - public Long addMenu(SysMenuDO param){ - Integer sort = sysMenuMapper.selectMaxSort(); - param.setSort(sort + 1); - sysMenuMapper.insertSelective(param); - return param.getId(); - } - - /** - * 批量删除 - * @param idList - * @return - */ - public Integer batchDeleteMenu(List idList){ - if(CollectionUtils.isEmpty(idList)){ - return CommonConstants.ZERO; - } - return sysMenuMapper.batchDeleteMenu(idList); - } - - public Integer batchUpdateMenu(List updateList) { - if(CollectionUtils.isEmpty(updateList)){ - return CommonConstants.ZERO; - } - return sysMenuMapper.batchUpdateMenu(updateList); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java deleted file mode 100644 index de614d304..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleDAO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.SysRoleDO; -import com.cool.store.enums.DataSourceEnum; -import com.cool.store.mapper.SysRoleMapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: SysRoleDAO - * @Description: - * @date 2023-06-08 11:45 - */ -@Repository -public class SysRoleDAO { - - @Resource - private SysRoleMapper sysRoleMapper; - - public Integer batchInsertSelective(List insertOrUpdateList){ - if(CollectionUtils.isEmpty(insertOrUpdateList)){ - return null; - } - return sysRoleMapper.batchInsertSelective(insertOrUpdateList); - } - - public Integer deleteRole(DataSourceEnum dataSourceEnum, List roleIds){ - if(Objects.isNull(dataSourceEnum) || CollectionUtils.isEmpty(roleIds)){ - return null; - } - return sysRoleMapper.deleteRole(dataSourceEnum.getCode(), roleIds); - } - - public SysRoleDO getHighestPriorityRoleByUserId(String userId) { - if(StringUtils.isBlank(userId)){ - return null; - } - return sysRoleMapper.getHighestPriorityRoleByUserId(userId); - } - - public SysRoleDO getRoleByName(String roleName, DataSourceEnum dataSource){ - if(StringUtils.isBlank(roleName) || Objects.isNull(dataSource)){ - return null; - } - return sysRoleMapper.getRoleByName(roleName, dataSource.getCode()); - } - - public Page getRolePage(Integer pageNum, Integer pageSize){ - PageHelper.startPage(pageNum, pageSize); - return sysRoleMapper.getRolePage(); - } - - public SysRoleDO getRoleDetail(String roleId){ - if(StringUtils.isBlank(roleId)){ - return null; - } - return sysRoleMapper.getRoleDetail(roleId); - } -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java deleted file mode 100644 index 7a8b38357..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.entity.SysRoleMenuDO; -import com.cool.store.mapper.SysRoleMenuMapper; -import com.google.common.collect.Lists; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @date 2023-05-19 03:01 - */ -@Repository -public class SysRoleMenuDAO { - - @Resource - private SysRoleMenuMapper sysRoleMenuMapper; - - /** - * 获取菜单 - * @param roleId - * @param platform - * @return - */ - public List getRoleMenuByRoleId(String roleId){ - if(Objects.isNull(roleId)){ - return Lists.newArrayList(); - } - return sysRoleMenuMapper.getRoleMenuByRoleId(roleId); - } - - public Integer updateRoleAuth(String roleId, List menuIds){ - //先删后增 - sysRoleMenuMapper.deleteRoleAuth(roleId); - List insertList = new ArrayList<>(); - for (Long menuId : menuIds) { - SysRoleMenuDO insert = new SysRoleMenuDO(); - insert.setMenuId(menuId); - insert.setRoleId(roleId); - insertList.add(insert); - } - return sysRoleMenuMapper.batchInsert(insertList); - } - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java deleted file mode 100644 index 11fd97982..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.cool.store.dao; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.UserRegionMappingDO; -import com.cool.store.enums.DataSourceEnum; -import com.cool.store.mapper.UserRegionMappingMapper; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: UserRegionMappingDAO - * @Description: - * @date 2023-06-08 13:58 - */ -@Repository -public class UserRegionMappingDAO { - - @Resource - private UserRegionMappingMapper userRegionMappingMapper; - - public Integer batchInsertOrUpdateUserRegion(List insertOrUpdateList){ - if(CollectionUtils.isEmpty(insertOrUpdateList)){ - return null; - } - return userRegionMappingMapper.batchInsertOrUpdateUserRegion(insertOrUpdateList); - } - - public Integer deleteUserRegion(String regionId, DataSourceEnum dataSourceEnum, List excludeUserIds){ - if(StringUtils.isBlank(regionId) || Objects.isNull(dataSourceEnum)){ - return null; - } - return userRegionMappingMapper.deleteUserRegion(regionId, dataSourceEnum.getCode(), excludeUserIds); - } - - - public Integer deleteUserRegionByUserId(String userId, DataSourceEnum dataSourceEnum, List excludeRegionIds){ - if(StringUtils.isBlank(userId) || Objects.isNull(dataSourceEnum)){ - return null; - } - return userRegionMappingMapper.deleteUserRegionByExcludeRegionIds(userId, dataSourceEnum.getCode(), excludeRegionIds); - } - - public Integer deleteRegionUserByExcludeRegionIds(List excludeRegionIds){ - if(CollectionUtils.isEmpty(excludeRegionIds)){ - return null; - } - return userRegionMappingMapper.deleteRegionUserByExcludeRegionIds(excludeRegionIds); - } - - public Integer deleteRegionUserByExcludeUserIds(List excludeUserIds){ - if(CollectionUtils.isEmpty(excludeUserIds)){ - return null; - } - return userRegionMappingMapper.deleteRegionUserByExcludeUserIds(excludeUserIds); - } - - public Integer deleteUserRegionByUserId(String userId){ - if(StringUtils.isBlank(userId)){ - return CommonConstants.ZERO; - } - return userRegionMappingMapper.deleteUserRegionByUserId(userId); - } - - /** - * 获取一个区域下直挂的人 - * @param regionId - * @return - */ - public List getUserListByRegionId(String regionId){ - if(StringUtils.isBlank(regionId)){ - return Lists.newArrayList(); - } - return userRegionMappingMapper.getUserListByRegionId(regionId); - } - - /** - * 获取一个人所属的部门 - * @param userId - * @return - */ - public List getRegionIdsByUserId(String userId){ - if(StringUtils.isBlank(userId)){ - return Lists.newArrayList(); - } - return userRegionMappingMapper.getRegionIdsByUserId(userId); - } - - /** - * 获取用户列表 - * @param regionIds - * @return - */ - public List getUserListByRegionIds(List regionIds){ - if(CollectionUtils.isEmpty(regionIds)){ - return Lists.newArrayList(); - } - return userRegionMappingMapper.getUserListByRegionIds(regionIds); - } - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java deleted file mode 100644 index b59d1f080..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BeautyCameraSettingMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.BeautyCameraSettingDO; -import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.Mapper; - -/** - * @author zhangchenbiao - * @date 2023-09-11 02:20 - */ -public interface BeautyCameraSettingMapper extends Mapper { - - /** - * 插入或更新 - * @param param - * @return - */ - Long insertOrUpdateBeautyCameraSetting(@Param("record") BeautyCameraSettingDO param); - - /** - * 获取美颜配置 - * @param userId - * @return - */ - BeautyCameraSettingDO getBeautyCameraSetting(@Param("userId") String userId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CallRecordMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CallRecordMapper.java deleted file mode 100644 index f64fc813a..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/CallRecordMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.CallRecordDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-08-11 01:03 - */ -public interface CallRecordMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-08-11 01:03 - */ - int insertSelective(CallRecordDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-08-11 01:03 - */ - int updateByPrimaryKeySelective(CallRecordDO record); - - int updateByTransNoSelective(CallRecordDO record); - - CallRecordDO selectByTransNo(String transNo); - - /** - * 批量获取 - * @param transNos - * @return - */ - List selectByTransNos(@Param("transNos") List transNos); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java deleted file mode 100644 index f1b347b6c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.DingdingUserDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author zhangchenbiao - * @date 2023-06-15 10:03 - */ -@Mapper -public interface DingdingUserMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-15 10:03 - */ - int insertSelective(DingdingUserDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-15 10:03 - */ - int updateByPrimaryKeySelective(DingdingUserDO record); - - DingdingUserDO selectDingDingUserByMobile(String mobile); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java deleted file mode 100644 index c2e2b70f4..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.EnterpriseUserDO; -import org.apache.ibatis.annotations.MapKey; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * @author zhangchenbiao - * @date 2023-06-06 02:29 - */ -public interface EnterpriseUserMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-06 02:29 - */ - int batchInsertOrUpdate(@Param("recordList") List recordList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-06 02:29 - */ - int updateByPrimaryKeySelective(EnterpriseUserDO record); - - /** - * updateByUserId - * @param userId - * @param onlineStatus - * @return - */ - int updateOnlineStatusByUserId(@Param("userId") String userId, @Param("onlineStatus") Integer onlineStatus); - - /** - * 获取用户信息 - * @param userId - * @return - */ - EnterpriseUserDO getUserInfoById(@Param("userId") String userId); - - /** - * 批量获取用户信息 - * @param userIdList - * @return - */ - List getUserInfoByUserIds(@Param("userIdList") List userIdList); - - /** - * 删除用户 - * @param excludeUserIds - * @return - */ - int deleteUser(@Param("excludeUserIds") List excludeUserIds); - - /** - * 删除用户 - * @param userId - * @return - */ - Integer deleteUserByUserId(@Param("userId") String userId); - - /** - * 根据关键字搜索部门下的用户 - * @param regionIds - * @param keyword - * @param leaderRegionIds - * @return - */ - List searchUserByRegionIdsAndKeyword(@Param("regionIds") List regionIds, @Param("keyword") String keyword, @Param("leaderRegionIds") List leaderRegionIds); - - /** - * 获取部门用户数 - * @param regionId - * @return - */ - Integer getUserCountByRegionId(@Param("regionId") String regionId); - - - /** - * 获取部门负责人用户列表 - * @param regionId - * @return - */ - List getUserListByDeptLeader(String regionId); - - /** - * 根据开发经理获取用户列表 - * @param regionIds - * @return - */ - List getUserListByDeptLeaders(@Param("regionIds") List regionIds); - - /** - * 获取部门人员 - * @param regionIds - * @return - */ - List getUserListByRegionIds(@Param("regionIds") List regionIds); - - EnterpriseUserDO selectByMobile(@Param("mobile") String mobile); - - EnterpriseUserDO selectByInvestmentManager(@Param("investmentManager") String investmentManager); - - /** - * 使用 userId 查询 feishuUserId - * @param userIdList userId 列表 - * @return userId: feishuUserId - */ - List getFeishuUserIdsByUserIds(@Param("userIdList") List userIdList); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java deleted file mode 100644 index 3b33349ea..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserRoleMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.EnterpriseUserRoleDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-08 10:54 - */ -public interface EnterpriseUserRoleMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-08 10:54 - */ - int batchInsertOrUpdate(@Param("recordList") List recordList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-08 10:54 - */ - int updateByPrimaryKeySelective(EnterpriseUserRoleDO record); - - /** - * 删除角色下的用户 - * @param roleId - * @param type - * @param excludeUserIds - * @return - */ - int deleteRoleInUser(@Param("roleId") String roleId, @Param("type") Integer type, @Param("excludeUserIds") List excludeUserIds); - - /** - * 删除用户下的角色 - * @param userId - * @param type - * @param excludeRoleId - * @return - */ - int deleteUserInRole(@Param("userId") String userId, @Param("type") Integer type, @Param("excludeRoleId") String excludeRoleId); - - /** - * 删除用户所有角色 - * @param userId - * @return - */ - Integer deleteUserRole(@Param("userId") String userId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java deleted file mode 100644 index 48519bc5b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyAdvancedSettingDO; -import org.apache.ibatis.annotations.Param; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:49 - */ -public interface HyAdvancedSettingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:49 - */ - int insertSelective(@Param("record") HyAdvancedSettingDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:49 - */ - int updateByPrimaryKeySelective(@Param("record") HyAdvancedSettingDO record); - - /** - * 查询高级设置 - * @return - */ - HyAdvancedSettingDO selectAdvanceSetting(); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java deleted file mode 100644 index 74d727768..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.vo.HyContentInfoVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -public interface HyContentInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:50 - */ - int insertSelective(@Param("record") HyContentInfoDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:50 - */ - int updateByPrimaryKeySelective(@Param("record") HyContentInfoDO record); - - /** - * 删除方法 - * @param contentId - */ - void deleteSelective(@Param("contentId") String contentId); - - /** - * 分页查询动态列表 - * 根据传入参数匹配 - */ - List queryContentList(ContentQueryListDto dto); - - - /** - * C 端使用的动态查询 - */ - List queryContentListForC(ContentQueryListDto dto); - - /** - * 根据contentId查询动态详情 - */ - HyContentInfoDO queryContentInfo(@Param("contentId") String contentId); - - /** - * 标题是否重复 - */ - Boolean whetherTitleDuplicated(@Param("contentTitle") String contentTitle); - - /** - * 查询动态标题 - */ - List queryTitles(); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java deleted file mode 100644 index 6b21ef5fd..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.exhibition.MyExhibitionGroupDTO; -import com.cool.store.entity.HyExhibitionGroupDO; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-11-30 11:55 - */ -public interface HyExhibitionGroupMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-11-30 01:36 - */ - int insertSelective( HyExhibitionGroupDO record); - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:36 - */ - HyExhibitionGroupDO selectByPrimaryKey(Integer id); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:36 - */ - int updateByPrimaryKeySelective(HyExhibitionGroupDO record); - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:36 - */ - int deleteByPrimaryKey(Integer id); - - List listByCreator(String userId); - - /** - * 批量关闭需要关闭的会销组 - * @return - */ - int batchCloseExhibitionGroup(); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java deleted file mode 100644 index 18d56e261..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.exhibition.ExhibitionDTO; -import com.cool.store.dto.exhibition.ExhibitionStatisticsDTO; -import com.cool.store.entity.HyExhibitionDO; -import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; -import com.cool.store.vo.exhibition.PartnerExhibitionListVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-11-30 11:47 - */ -public interface HyExhibitionMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-11-30 01:38 - */ - int insertSelective(HyExhibitionDO record); - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:38 - */ - HyExhibitionDO selectByPrimaryKey(Integer id); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:38 - */ - int updateByPrimaryKeySelective(HyExhibitionDO record); - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:38 - */ - int deleteByPrimaryKey(Integer id); - - int batchInsert(@Param("records") List records); - - int batchUpdate(@Param("records") List records); - - List getExhibitionListByUserId(@Param("userId") String userId, - @Param("startDate") String startDate, - @Param("closedType") Integer closedType); - - - List exhibitionStatistic(@Param("list") List exhibitionIdList); - - List listByExhibitionGroupIds(@Param("list") List exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); - - ExhibitionDTO lineSignUp(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); - - /** - * 查询展会组下展会 (参数控制是否包含关闭的展会) - * @param exhibitionGroupId - * @param includeClose true-包含 false-不包含 - * @return - */ - List listByExhibitionGroupId(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("includeClose") Boolean includeClose); - - /** - * 获取线索报名参加的会销列表 - * @param partnerLineId - * @return - */ - List getPartnerExhibitionList(@Param("partnerLineId") Long partnerLineId); - - /** - * 获取线索报名的会销详情 - * - * @param exhibitionGroupId - * @param partnerLineId - * @return - */ - PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("partnerLineId") Long partnerLineId); - - /** - * 查询符合条件的会销列表 - * @param hyExhibitionDO - * @return - */ - List querySelective(HyExhibitionDO hyExhibitionDO); - - int batchCloseExhibition(@Param("hyExhibitionIds") List hyExhibitionIds, @Param("closedType") Integer closedType, @Param("closeDateTime") String closeDateTime); -} \ No newline at end of file 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 deleted file mode 100644 index f3f806d13..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyFollowTaskMapper.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.follow.FollowTaskNumDTO; -import com.cool.store.entity.HyFollowTaskDO; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-08-10 10:10 - */ -public interface HyFollowTaskMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-08-10 10:10 - */ - int insertSelective(@Param("record") HyFollowTaskDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-08-10 10:10 - */ - int updateByPrimaryKeySelective(@Param("record") HyFollowTaskDO record); - - /** - * 根据线索获取任务列表 - * @param partnerLineId - * @return - */ - List getTaskListByLineId(@Param("partnerLineId")Long partnerLineId); - - /** - * 获取任务列表 - * @param followUserId - * @param taskStatus - * @param deadlineStartTime - * @param deadlineEndTime - * @return - */ - Page getTaskPage(@Param("followUserId")String followUserId, @Param("taskStatus")Integer taskStatus, @Param("deadlineStartTime")String deadlineStartTime, @Param("deadlineEndTime")String deadlineEndTime); - - /** - * 获取跟进任务详情 - * @param followTaskId - * @return - */ - HyFollowTaskDO getFollowTask(@Param("followTaskId") Long followTaskId); - - /** - * 更新任务跟进人 - * @param partnerLineId - * @param followUserId - */ - Integer updateUndoTaskFollowUserId(@Param("partnerLineId") Long partnerLineId, @Param("followUserId") String followUserId); - - /** - * 作废未完成的跟进任务 - * @param partnerLineId - * @return - */ - Integer cancelUndoFollowTask(@Param("partnerLineId") Long partnerLineId); - - /** - * 获取发送通知的跟进人 - * @param startTime - * @param endTime - * @return - */ - Page getRemindFollowUserIds(@Param("startTime")String startTime, @Param("endTime")String endTime); - - /** - * 获取用户任务数量 - * @param followUserIds - * @return - */ - List getUserTaskNum(@Param("followUserIds") List followUserIds, @Param("endTime")String endTime); - - /** - * 获取待完成任务 - * @param startTime - * @param endTime - * @return - */ - Page getUndoTaskPage(@Param("startTime") String startTime, @Param("endTime") String endTime); - - /** - * 更新未完成任务的状态 - * @return - */ - Integer updateUndoTaskStatusToOverdue(); - - /** - * 批量获取跟进任务 - * @param followTaskIds - * @return - */ - List getFollowTaskList(@Param("followTaskIds") List followTaskIds); - - /** - * 更改线索id - * @param oldLineId - * @param newLineId - * @return - */ - Integer changeLineId(@Param("oldLineId") Long oldLineId, @Param("newLineId") Long newLineId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java deleted file mode 100644 index 205c2d05a..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionMapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyInspectionDO; -import com.cool.store.request.GetInterviewInspectionListReq; -import com.cool.store.request.GetInterviewInspectionResultListReq; -import com.cool.store.vo.interview.InterviewInspectionHistoryInfo; -import com.cool.store.vo.interview.InterviewInspectionInfo; -import com.cool.store.vo.interview.InterviewInspectionResultVO; -import com.cool.store.vo.interview.InterviewInspectionVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface HyInspectionMapper { - int deleteByPrimaryKey(Long id); - - int insert(HyInspectionDO record); - - int insertSelective(HyInspectionDO record); - - HyInspectionDO selectByPrimaryKey(Long id); - - HyInspectionDO selectByInterviewPlanId(Long interviewPlanId); - - int updateByPrimaryKeySelective(HyInspectionDO record); - - int updateByPrimaryKey(HyInspectionDO record); - - List interviewInspectionGetList(GetInterviewInspectionListReq request); - - - List interviewInspectionGetProvinceList(GetInterviewInspectionListReq request); - - InterviewInspectionInfo interviewInspectionGetDetail(@Param("id") Long id); - - - List interviewInspectionResultGetList(GetInterviewInspectionResultListReq request); - - List interviewInspectionResultGetProvinceList(GetInterviewInspectionResultListReq setUserId); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMapper.java deleted file mode 100644 index bf8952b4d..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyInspectionSettingDO; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-07-18 04:27 - */ -public interface HyInspectionSettingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-07-18 04:27 - */ - int insertSelective(HyInspectionSettingDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-07-18 04:27 - */ - int updateByPrimaryKeySelective(HyInspectionSettingDO record); - - /** - * 获取稽核区域设置分页 - * @return - */ - Page getInspectionSettingPage(); - - /** - * 获取稽核详情 - * @param inspectionSettingId - * @return - */ - HyInspectionSettingDO getInspectionSettingDetail(@Param("inspectionSettingId") Long inspectionSettingId); - - /** - * 获取已经配置的稽核人 - * @return - */ - List getInspectionUserIds(); - - /** - * 根据id批量获取 - * @param inspectionSettingIds - * @return - */ - List getHyInspectionSettingByIds(@Param("inspectionSettingIds") List inspectionSettingIds); - - /** - * - * @param inspectionUserId - * @return - */ - List getHyInspectionSettingByUserId(@Param("inspectionUserId") String inspectionUserId, @Param("excludeInspectionSettingId") Long excludeInspectionSettingId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMappingMapper.java deleted file mode 100644 index 1cfea1e6b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInspectionSettingMappingMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyInspectionSettingMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-07-18 04:28 - */ -public interface HyInspectionSettingMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-07-18 04:28 - */ - int batchInsertSelective(@Param("insertList") List insertList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-07-18 04:28 - */ - int updateByPrimaryKeySelective(HyInspectionSettingMappingDO record); - - /** - * 获取区域ids - * @param inspectionSettingId - * @return - */ - List getOpenAreaMappingIds(@Param("inspectionSettingId") Long inspectionSettingId); - - /** - * 删除不在的城市 - * @param inspectionSettingId - * @param openAreaMappingIds - * @return - */ - Integer deleteNotInOpenAreaMappingIds(@Param("inspectionSettingId") Long inspectionSettingId, @Param("openAreaMappingIds") List openAreaMappingIds); - - /** - * 删除 - * @param inspectionSettingId - * @return - */ - Integer deleteInspectionSettingMapping(@Param("inspectionSettingId") Long inspectionSettingId); - - /** - * - * @param inspectionSettingId - * @param openAreaMappingIds - * @return - */ - List getConflictInspectionSetting(@Param("inspectionSettingId") Long inspectionSettingId, @Param("openAreaMappingIds") List openAreaMappingIds); - - /** - * 删除 - * @param excludeInspectionSettingId - * @param openAreaMappingIds - * @return - */ - Integer deleteInOpenAreaMappingIds(@Param("excludeInspectionSettingId") Long excludeInspectionSettingId, @Param("openAreaMappingIds") List openAreaMappingIds); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java deleted file mode 100644 index 026468e59..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyIntendDevZoneInfoDO; -import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -public interface HyIntendDevZoneInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:50 - */ - int insertSelective(@Param("record") HyIntendDevZoneInfoDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:50 - */ - int updateByPrimaryKeySelective(@Param("record") HyIntendDevZoneInfoDO record); - - /** - * 根据ID查询 - * @param id - * @return - */ - HyIntendDevZoneInfoDO selectById(@Param("id") Long id); - - - List selectByIds(@Param("ids") List ids); - - /** - * 查询战区列表 - * @param type - * @return - */ - List getHyIntendDevZoneInfoList(String type); - - /** - * 根据组织架构获取配置信息 - * @param regionIds - * @return - */ - List getZoneInfoByRegionIds(@Param("regionIds") List regionIds); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java deleted file mode 100644 index bf0be4adf..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.partner.ZoneCheckDTO; -import com.cool.store.entity.HyIntendDevelopementMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -public interface HyIntendDevelopementMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:50 - */ - int insertSelective(@Param("record") HyIntendDevelopementMappingDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:50 - */ - int updateByPrimaryKeySelective(@Param("record") HyIntendDevelopementMappingDO record); - - /** - * 批量删除数据 - * @param idList - * @return - */ - int deleteByOpenAreaIds(@Param("openAreaIdList") List idList, @Param("type") String type); - - - /** - * 删除战区对应的关联意向区域 - * @param idList - * @param type - * @return - */ - int deleteByMappingIds(@Param("mappingIds") List idList, @Param("type") String type); - /** - * - * @param recordList - * @return - */ - int batchInsert(@Param("recordList") List recordList); - - /** - * 查询根据selectByMappingIdList集合 - * @param mappingIdList - * @return - */ - List selectByMappingIdList(@Param("mappingIdList") List mappingIdList); - - List selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List openAreaMappingIdList, - @Param("type") String type, - @Param("currentId") Long currentId); - - - HyIntendDevelopementMappingDO selectByOpenAreaMappingId(@Param("openAreaMappingId") Long openAreaMappingId, - @Param("type") String type); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java deleted file mode 100644 index 2df28f311..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.vo.interview.InterviewInspectionHistoryInfo; -import com.cool.store.entity.HyInterviewInspectionLogDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface HyInterviewInspectionLogMapper { - int deleteByPrimaryKey(Long id); - - int insert(HyInterviewInspectionLogDO record); - - int insertSelective(HyInterviewInspectionLogDO record); - - HyInterviewInspectionLogDO selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(HyInterviewInspectionLogDO record); - - - List interviewInspectionGetHistoryDetail(@Param("inspectionId") Long id); - int updateByPrimaryKey(HyInterviewInspectionLogDO record); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java deleted file mode 100644 index 96eed9e89..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.partner.ApplyReservationProvinceDTO; -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.github.pagehelper.PageInfo; -import io.swagger.models.auth.In; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -public interface HyOpenAreaInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:51 - */ - int insertSelective(@Param("record") HyOpenAreaInfoDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:51 - */ - int updateByPrimaryKeySelective(@Param("record") HyOpenAreaInfoDO record); - - /** - * 查询重点城市 - * @return - */ - List queryKeyOpenArea(); - - - /** - * 查询所有 - * @return - */ - List queryByKeyword(@Param("keyword") String keyword, - @Param("applyFlag") Boolean applyFlag, - @Param("areaStatus") String areaStatus, - @Param("filterData") Boolean filterData); - - /** - * 查询所有一级城市 (所有省份+直辖市) - * @return - */ - List queryFirstLevel(); - - - /** - * 查询所有一级城市 (所有省份+直辖市) - * @return - */ - List queryByIdsExcludeFirstLevel(@Param("ids") List ids); - - /** - * 查询省份可申请可预约数量 - * @return - */ - List getApplyReservationProvinceCount(); - - /** - * 查询子列表 - * @return - */ - List getChildrenList(@Param("type") String type , - @Param("parentId") Long parentId); - - Integer getChildrenCount(@Param("type") String type , - @Param("parentId") Long parentId); - - - /** - * 更新城市昨天 - * @param backgroundBanner - * @param detailBanner - * @param areaStatus - * @param updateUserId - * @param ids - * @return - */ - int batchUpdateById(@Param("backgroundBanner") String backgroundBanner, - @Param("detailBanner") String detailBanner, - @Param("areaStatus") String areaStatus, - @Param("updateUserId") String updateUserId, - @Param("ids") List ids); - - int batchUpdateByParentId(@Param("backgroundBanner") String backgroundBanner, - @Param("detailBanner") String detailBanner, - @Param("areaStatus") String areaStatus, - @Param("updateUserId") String updateUserId, - @Param("parentIdList") List parentIdList); - - /** - * 根据idList查询数据 - * @param idList - * @return - */ - List selectByIds(@Param("idList") List idList); - - HyOpenAreaInfoDO selectById(@Param("id") Long id); - - /** - * 获取所有的区域 - * @return - */ - List getAllOpenArea(); - - /** - * 过滤叶子节点 - * @param openAreaIds - * @return - */ - List filterLeafNode(@Param("openAreaIds") List openAreaIds); - - List getSonArea(@Param("id") String id); - - List getProvinceAllCode(@Param("id") String id); - - HyOpenAreaInfoDO selectByAreaPath(@Param("areaPath") String areaPath); - - List selectAllCity(); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOutboundMobileMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOutboundMobileMapper.java deleted file mode 100644 index d81c92346..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOutboundMobileMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.mapper; - - -import com.cool.store.dto.outbound.OutboundListDTO; -import com.cool.store.entity.HyOutboundMobileDO; -import com.cool.store.vo.HyOutboundVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author Fun Li - * @date 2023/08/09 - */ -public interface HyOutboundMobileMapper { - int deleteByPrimaryKey(Long id); - - int insert(HyOutboundMobileDO record); - - int insertSelective(HyOutboundMobileDO record); - - HyOutboundMobileDO selectByPrimaryKey(Long id); - - List selectByPrimarySelective(HyOutboundMobileDO hyOutboundMobileDO); - - int updateByPrimaryKeySelective(HyOutboundMobileDO record); - - int updateByPrimaryKey(HyOutboundMobileDO record); - - /** - * 获取呼出手机号列表 - * - * @param dto - * @param userId - * @return - */ - List getOutboundNumberList(@Param("dto") OutboundListDTO dto, @Param("userId") String userId); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java deleted file mode 100644 index 1ea332ebd..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.entity.SyncEcCustomerLabelDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Mapper -public interface HyPartnerBaseInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:51 - */ - int insertSelective(@Param("record") HyPartnerBaseInfoDO record); - - /** - * 跟进ID查询 - * @param id - * @return - */ - HyPartnerBaseInfoDO selectById(@Param("id") Long id); - - - int batchInsert(@Param("records") List records); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:51 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerBaseInfoDO record); - - int updateByPrimaryKey(@Param("record") HyPartnerBaseInfoDO record); - - - /** - * 根据加盟商ID修改用户名称与手机号 - * @param userName - * @param mobile - * @param partnerId - * @return - */ - int updateByPartnerId(@Param("userName") String userName, - @Param("mobile") String mobile, - @Param("partnerId") String partnerId); - - HyPartnerBaseInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId); - - HyPartnerBaseInfoDO getByPartnerLineId(@Param("partnerLineId") Long partnerLineId); - - - List getByPartnerLineIds(@Param("partnerLineId") List partnerLineIds); - - HyPartnerBaseInfoDO getByIdCard(@Param("idCard") String idCard); - - int cleanIdCardInfoByPartnerLineId(@Param("idCard") String idCard, - @Param("idCardPhotoFront") String idCardPhotoFront, - @Param("idCardPhotoBlack") String idCardPhotoBlack, - @Param("partnerLineId") Long partnerLineId); - - int selectAllList(); - - List selectListByLimit(@Param("limit1") Integer limit1, @Param("limit2") Integer limit2); - - void updateByMobile(HyPartnerBaseInfoDO record); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java deleted file mode 100644 index 6d67eb43b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerCertificationInfoDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Mapper -public interface HyPartnerCertificationInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:51 - */ - int insertSelective(@Param("record") HyPartnerCertificationInfoDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:51 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerCertificationInfoDO record); - - /** - * 根据资质审核流程 id 获取面试会议 id - * @param qualifyVerifyId 资质审核流程 id - * @return 面试会议 id - */ - String getInterviewIdByQualifyVerifyId(@Param("qualifyVerifyId") String qualifyVerifyId); - - /** - * 根据资质审核流程 id 获取面试会议 id - * @param qualifyVerifyId 资质审核流程 id - * @return 面试会议计划 id - */ - String getInterviewPlanIdByQualifyVerifyId(String qualifyVerifyId); - - HyPartnerCertificationInfoDO selectByPartnerLineId(@Param("partnerLineId") Long partnerLineId); - - int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java deleted file mode 100644 index e52a94f03..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerClerkDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -public interface HyPartnerClerkMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:51 - */ - int insertSelective(@Param("record") HyPartnerClerkDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:51 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerClerkDO record); - - List getHyPartnerClerkList(@Param("lineId") Long lineId); - - - int batchInsert(@Param("recordList") List recordList); - - void deleteByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId); - - /** - * 查询店员信息 - * @return - */ - List listByPartnerIdAndLineId(@Param("partnerId") String partnerId, - @Param("partnerLineId") Long partnerLineId); - - int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerEcTrackLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerEcTrackLogMapper.java deleted file mode 100644 index 1666be0f3..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerEcTrackLogMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerEcTrackLogDO; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author hxd - */ -@Mapper -public interface HyPartnerEcTrackLogMapper { - - int deleteByPrimaryKey(Long id); - - int insert(HyPartnerEcTrackLogDO record); - - int insertSelective(HyPartnerEcTrackLogDO record); - - HyPartnerEcTrackLogDO selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(HyPartnerEcTrackLogDO record); - - int updateByPrimaryKey(HyPartnerEcTrackLogDO record); - - int batchInsertOrUpdate(@Param("recordList") HyPartnerEcTrackLogDO resultTrajectoryList); - - Page getEcLogPageByPartnerId(@Param("partnerId") String partnerId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java deleted file mode 100644 index 90810ac11..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; -import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; -import com.cool.store.dto.exhibition.ExhibitionLineDTO; -import com.cool.store.dto.exhibition.PartnerSignUpDTO; -import com.cool.store.entity.HyPartnerExhibitionDO; -import com.cool.store.entity.HyPartnerExhibitionInterviewDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-11-30 11:55 - */ -@Mapper -public interface HyPartnerExhibitionMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-11-30 01:39 - */ - int insertSelective(HyPartnerExhibitionDO record); - - /** - * - * 默认查询方法，通过主键获取所有字段的值 - * dateTime:2023-11-30 01:39 - */ - HyPartnerExhibitionDO selectByPrimaryKey(Long id); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-11-30 01:39 - */ - int updateByPrimaryKeySelective(HyPartnerExhibitionDO record); - - /** - * - * 默认更新方法，根据主键物理删除 - * dateTime:2023-11-30 01:39 - */ - int deleteByPrimaryKey(Long id); - - - /** - * 展会参与线索信息 - * @param exhibitionId - * @return - */ - List getExhibitionLine(Integer exhibitionId); - - HyPartnerExhibitionDO querySelective(HyPartnerExhibitionDO record); - - List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id ); - - /** - * 将线索参加的会销面试状态设为不通过 - * @param partnerLineId - */ - void rejectExhibitionInterview(@Param("partnerLineId") String partnerLineId); - - /** - * 删除线索所有的会销信息 - * @param partnerLineId - */ - void deleteAllByLineId(Long partnerLineId); - - /** - * 查询在会销中进行的面试的面试计划id - * @param interviewPlanIds - * @return - */ - List queryListByInterviewPlanIds(@Param("interviewPlanIds") List interviewPlanIds); - - /** - * 查询处在会销面试状态中的线索ids - * - * @param lindIds - * @param exhibitionPartnerStatusCode - * @return - */ - List queryListByLineIds(@Param("lineIds") List lindIds, @Param("status") Integer exhibitionPartnerStatusCode); - - /** - * 查询线索参加的会销面试相关信息 - * @param interviewPlanId - * @param partnerLineId - * @return - */ - HyPartnerExhibitionInterviewDO queryPartnerExhibitionInterviewInfo(@Param("interviewPlanId") Long interviewPlanId, @Param("partnerLineId") Long partnerLineId); - - - List exhibitionLineBaseInfo(@Param("partnerName") String partnerName, @Param("id") Integer id); - - HyPartnerExhibitionDO getPartnerExhibition(@Param("exhibitionId") Integer exhibitionId, @Param("lineId") Long lindId); - - /** - * 加盟商报名会销次数(不包括取消报名) - * @param lineId - * @return - */ - List partnerSignUpCount(@Param("lineIds") List lineIds ); - - /** - * 获取待修改会销中状态的线索 ids - * @param exhibitionIds - * @return - */ - List getCloseExhibitionLineIds(@Param("exhibitionIds") List exhibitionIds); - - /** - * 根据展会 id 列表获取会销线索信息 - * @param exhibitionIds - * @return - */ - List getLineByExhibitionIds(List exhibitionIds); - - /** - * 在线索提交意向申请后刷线线索报名会销的状态 - * @param partnerLineId - */ - int updateStatusAfterSubmitIndustry(@Param("partnerLineId") Long partnerLineId); - - /** - * 结束面试后刷线线索报名会销的状态 - * @param interviewPlanId - * @return - */ - int updateStatusAfterFinishInterview(@Param("interviewPlanId")Long interviewPlanId); - - /** - * 资质审批通过后更新线索报名会销状态 - * @param interviewPlanId - * @return - */ - int updateStatusAfterSubmitQualification(@Param("interviewPlanId") Long interviewPlanId); - - /** - * 获取部分会销面试发起人信息 - */ - ExhibitionInterviewInfoDTO getStartInterviewInfo(@Param("lineId") Long lineId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java deleted file mode 100644 index 54159e16b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; -import com.cool.store.entity.HyPartnerIntentInfoDO; -import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -public interface HyPartnerIntentInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:52 - */ - int insertSelective(@Param("record") HyPartnerIntentInfoDO record); - - HyPartnerIntentInfoDO selectByPrimaryKeySelective(@Param("id") Long id); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:52 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerIntentInfoDO record); - - - /** - * 工作台 招商经理 意向申请阶段 待处理 待跟进 列表 - * @param userId - * @param workflowStage - * @param workflowStatus - * @return - */ - List selectPartnerIntentApplyInfoList(@Param("userId") String userId, - @Param("workflowStage") String workflowStage , - @Param("workflowStatus") String workflowStatus, - @Param("keyword") String keyword, - @Param("callStatus") Integer callStatus, - @Param("userPortraitIdList") List userPortraitIdList, - @Param("lastFollowStartTime") String lastFollowStartTime, - @Param("lastFollowEndTime") String lastFollowEndTime, - @Param("userChannelIdList") List userChannelIdList); - - /** - * 根据线索ID查询数据 - * @param lineId - * @return - */ - HyPartnerIntentInfoDO selectByLineId(@Param("lineId") Long lineId); - - HyPartnerIntentInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId); - - - /** - * updateLineId - * @param newLineId - * @param oldLineId - * @return - */ - int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - - - int updateByPartnerLineId(@Param("record") HyPartnerIntentInfoDO record); - - /** - * 更新数据 - * @param id - * @param acquaintanceFlag - * @param acquaintanceName - * @param acquaintanceRelationshipType - * @param otherRelationshipType - */ - int updateAcquaintanceFlag(Long id ,Integer acquaintanceFlag,String acquaintanceName, Integer acquaintanceRelationshipType,String otherRelationshipType); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java deleted file mode 100644 index cf56982d4..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerInterviewDO; -import com.cool.store.request.GetInterviewListReq; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.cool.store.vo.PartnerPassLetterDetailVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-09 05:51 - */ -@Mapper -public interface HyPartnerInterviewMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-09 05:51 - */ - int insertSelective(@Param("record") HyPartnerInterviewDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-09 05:51 - */ - int updateByPrimaryKeySelective(HyPartnerInterviewDO record); - - /** - * 根据加盟商id查询面试信息 - * @param partnerId - * @return - */ - PartnerInterviewInfoVO queryByPartnerId(@Param("partnerId") String partnerId); - PartnerInterviewInfoVO queryByPartnerLineId(@Param("partnerLineId") String partnerLineId); - - /** - * 根据会议 id 查询面试官 id - */ - EnterInterviewVO getInterviewerByInterviewPlanId(@Param("interviewPlanId") String interviewPlanId); - - /** - * 获取通知函详情 - */ - PartnerPassLetterDetailVO getPassLetterDetail(@Param("interviewPlanId") String interviewPlanId); - - /** - * 生成通过函 pdf 后修改 - */ - int updatePassLetterInfo(@Param("passCode") String passCode, @Param("passPdfUrl") String passPdfUrl, @Param("passImageUrl") String passImageUrl, @Param("expiryDate") String expiryDate, @Param("interviewId") String interviewId); - - /** - * 根据面试 id 查询面试信息 - */ - HyPartnerInterviewDO selectByPrimaryKeySelective(String interviewId); - - /** - * 根据面试 id 获取意向区域 - * @param interviewId - * @return - */ - String getVerifyCityByInterviewId(@Param("interviewId") String interviewId); - - /** - * 查询面试基本信息列表 - * @param request - * @return - */ - List getInterviewBaseInfoList(@Param("record") GetInterviewListReq request); - - List getInterviewBaseInfoListByLineIds(@Param("lineIds") List lineIds); - void batchUpdateInterviewStatus(@Param("interviewIds") List interviewIdList, @Param("status") Integer interviewStatus,@Param("deleted") Integer deleted); - - void batchUpdateStatusByLineIds(@Param("lineIds") List lineIds, @Param("status") Integer interviewStatus); - - HyPartnerInterviewDO getInterviewInfoByInterviewPlanId(@Param("interviewPlanId") String interviewPlanId); - - - HyPartnerInterviewDO getInterviewInfoByQualifyVerifyId(@Param("qualifyVerifyId") String qualifyVerifyId); - /** - * 修改面试状态 - */ - void updateInterviewStatus(@Param("interviewPlanId") String interviewPlanId, @Param("status") String status); - - /** - * 获取面试对应的线索id - */ - String getLineId(@Param("interviewPlanId") String interviewPlanId); - - /** - * 获取面试流程状态 - * @param interviewPlanId - * @return - */ - String getStatus(String interviewPlanId); - - /** - * 在面试信息表中添加面试录制视频链接 - * @param roomId - * @param videoUrl - */ - void addVideoUrl(@Param("roomId") String roomId, @Param("videoUrl") String videoUrl); - - /** - * 查询是否已有该链接 - */ - Boolean hasVideoUrls(@Param("videoUrl") String videoUrl); - - int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java deleted file mode 100644 index 5a3740e4f..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.message.RemindInterviewMsgDTO; -import com.cool.store.dto.partner.AdvanceLineDTO; -import com.cool.store.dto.partner.PartnerInterviewInfoDTO; -import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; -import com.cool.store.entity.HyInterviewRemindDO; -import com.cool.store.entity.HyPartnerInterviewBookSituation; -import com.cool.store.entity.HyPartnerInterviewPlanDO; -import com.cool.store.request.GetInterviewListReq; -import com.cool.store.vo.EnterpriseUserBaseInfoVO; -import com.cool.store.vo.interview.InterviewVO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -@Mapper -public interface HyPartnerInterviewPlanMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:52 - */ - int insertSelective(@Param("record") HyPartnerInterviewPlanDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:52 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewPlanDO record); - - /** - * 查询当天面试数量 - * @param userId - * @param currentDate - * @return - */ - List getCurrentDateInterviewCount(@Param("userId") String userId, @Param("currentDate") String currentDate, String endDate); - - /** - * todo 当天面试数据需要修改 - * 查询指定日期面试数量 与未来7天面试数量 - * @param userId - * @param currentDate - * @param startTime - * @param endTime - * @return - */ - SpecialDateRangeInterviewCountDTO getInterviewCount(@Param("userId") String userId, - @Param("currentDate") String currentDate, - @Param("startTime") String startTime, - @Param("endTime") String endTime); - /** - * 查询面试列表 - * @param userId - * @param currentDate - * @return - */ - List getInterviewPlanList(@Param("userId") String userId, - @Param("currentTime") String currentTime, - @Param("currentDay") String currentDay); - - /** - * 工作台 招商经理 预约面试时间 合格资格面试 列表 - * @param userId - * @param workflowStage - * @param workflowStatus - * @return - */ - List getPartnerInterviewInfoList(@Param("userId") String userId, - @Param("workflowStage") String workflowStage , - @Param("workflowStatus") String workflowStatus, - @Param("filter") Boolean filter); - - /** - * 查询面试列表 - * - * @param request - * @return - */ - List getInterviewList(@Param("record") GetInterviewListReq request); - - /** - * 查询面试详情 - * - * @param interviewPlanId - * @return - */ - InterviewVO getInterviewInfo(String interviewPlanId); - - /** - * 查询用户基本信息 - */ - EnterpriseUserBaseInfoVO getEnterpriseUserBaseInfo(@Param("userId") String userId); - - Long selectInterviewIdByLineId(Long lineId); - - /** - * 根据条件字段查询面试安排信息 - * @param record - * @return - */ - List selectBySelective(@Param("record") HyPartnerInterviewPlanDO record); - - /** - * 根据线索 - * @param lindIds - * @return - */ - List getHyPartnerInterviewPlanByLineIds(List lindIds); - - /** - * 批量软删面试计划 - * @param interviewIds - * @return - */ - void batchDeleteInterviewPlans(@Param("interviewPlanIds")List interviewIds); - - /** - * 通用更新房间状态方法 - * @param record - * @param roomStatus - */ - void updateInterviewRoomStatus(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus); - - /** - * 仅适用于开启面试房间 - * @param lineIds - */ - void openInterviewRoom(@Param("lineIds") List lineIds,@Param("roomStatus")Integer roomStatu); - - /** - * 仅适用于关闭面试房间 - * @param record - * @param roomStatus - */ - void closeInterviewRoom(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus); - - /** - * 修改面试实际开始时间 - */ - void updateActualStartTime(@Param("id") Long id, @Param("now") String now); - - /** - * 获取面试房间状态 - * @param interviewPlanId - */ - Integer getRoomStatus(@Param("interviewPlanId") String interviewPlanId); - - /** - * 获取面试开始时间 - */ - String getInterviewStartTime(String interviewPlanId); - - /** - * 根据面试计划id获取面试计划信息 - * @param interviewPlanId - * @return - */ - HyPartnerInterviewPlanDO getInterviewPlanById(String interviewPlanId); - - HyPartnerInterviewPlanDO getInterviewPlanByLineId(Long lineId); - - List selectRemindInterviewPlan(@Param("startTime") Date startTime, - @Param("endTime") Date endTime, - @Param("workflowStage") String workflowStage, - @Param("workflowStatus") String workflowStatus); - - int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - - /** - * 获取明天开始面试的面试开始时间和 partnerId（17:00 前确定为明天面试的） - * - * @return - */ - List getTomorrowInterview(); - - /** - * 获取 30 分钟后开始的面试（预约30分钟之内的面试不发获取） - * @return - */ - List remindInterviewStartMinutes(); - - /** - * 获取招商经理各时段预约情况 - * @param interviewerId 招商经理 id - * @param startTimeStr 开始时间点 - * @param endTimeStr 结束时间点 - * @return - */ - List getInterviewBookSituation(@Param("interviewerId") String interviewerId, @Param("startTime") String startTimeStr, @Param("endTime") String endTimeStr); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java deleted file mode 100644 index 0c7881255..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerLabelGroupDO; -import com.cool.store.vo.LabelGroupListVo; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author Fun Li 2023/8/10 13:25 - * @version 1.0 - */ -@Mapper -public interface HyPartnerLabelGroupMapper { - - int deleteByPrimaryKey(Long id); - - int insert(HyPartnerLabelGroupDO record); - - int insertSelective(HyPartnerLabelGroupDO record); - - HyPartnerLabelGroupDO selectByPrimaryKey(Long id); - - List selectSelective(HyPartnerLabelGroupDO record); - - List getLabelGroupList(HyPartnerLabelGroupDO record); - - List getLabelGroupListOrder(HyPartnerLabelGroupDO record); - - int updateByPrimaryKeySelective(HyPartnerLabelGroupDO record); - - int updateByPrimaryKey(HyPartnerLabelGroupDO record); - -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java deleted file mode 100644 index 747e06f68..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.label.LabelListDTO; -import com.cool.store.entity.HyPartnerLabelDO; -import com.cool.store.vo.LabelListVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author Fun Li - * @date 2023-08-10 - */ -public interface HyPartnerLabelMapper { - int deleteByPrimaryKey(Long id); - - int insert(HyPartnerLabelDO record); - - int insertSelective(HyPartnerLabelDO record); - - HyPartnerLabelDO selectByPrimaryKey(Long id); - - List selectSelective(HyPartnerLabelDO labelDO); - - int updateByPrimaryKeySelective(HyPartnerLabelDO record); - - int updateByPrimaryKey(HyPartnerLabelDO record); - - List getLabelList(LabelListDTO dto); - - /** - * 某个标签组内是否有未删除的标签 - * @param labelGroupId 标签组 id - */ - Boolean whetherGroupInUse(@Param("labelGroupId") Long labelGroupId); - - List getLabelListByIds(@Param("labelIds") List labelIds); -} \ No newline at end of file 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 deleted file mode 100644 index ea5177c4c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ /dev/null @@ -1,284 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.partner.*; -import com.cool.store.dto.partner.PartnerBlackListDTO; -import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; -import com.cool.store.dto.partner.StageCountDTO; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.request.PrivateSeaLineListRequest; -import com.cool.store.vo.LinePageInfoVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -@Mapper -public interface HyPartnerLineInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:52 - */ - int insertSelective(@Param("record") HyPartnerLineInfoDO record); - - /** - * 批量新增线索 - * @param recordList - * @return - */ - int batchInsert(@Param("recordList") List recordList); - - /** - * 批量将线索置为删除状态 - * @param lineIdList - * @return - */ - int batchDeleted(@Param("lineIdList") List lineIdList); - - /** - * 根据ID查询数据 - * @param id - * @return - */ - HyPartnerLineInfoDO selectByPrimaryKeySelective(Long id); - - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:52 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerLineInfoDO record); - - int updateByPrimaryKey(@Param("record") HyPartnerLineInfoDO record); - - - /** - * 当前用户指定时间 临期线索 - * @param userId - * @param currentDate - * @return - */ - List getAdventLineCount(@Param("userId") String userId, @Param("currentDate") String currentDate, @Param("endDate") String endDate); - - /** - * 招商经理 对应各阶段待处理数据 - * @param userId - * @return - */ - StageCountDTO selectStagePendingCount(@Param("userId") String userId); - - /** - * 招商经理 对应各个阶段 待跟进数据 - * @param userId - * @return - */ - StageCountDTO selectStageFollowCount(@Param("userId") String userId); - - - /** - * 查询线索信息与加盟商基本信息 - * @param lineId - * @return - */ - PartnerLineInfoAndBaseInfoDTO selectPartnerLineInfoAndBaseInfo(@Param("lineId") Long lineId); - - /** - * 最近30天结束的线索 - * @param userId - * @param lastMonthTodayDate - * @return - */ - List lastMonthCloseLine(@Param("userId") String userId, - @Param("lastMonthTodayDate") String lastMonthTodayDate); - - /** - * 修改招商经理 - * @param lineIdList - * @param userId - * @return - */ - int updateInvestmentManager(@Param("lineIdList") List lineIdList, @Param("userId") String userId); - - /** - * 根据线索ID查询线索 - * @param lineIdList - * @return - */ - List getLineListByLineIds(List lineIdList); - - /** - * 查询黑名单列表 - * @param userNameKeyword - * @param phoneKeyword - * @param intentArea - * @param acceptAdjustType - * @return - */ - List getBlackList(@Param("userNameKeyword") String userNameKeyword, - @Param("phoneKeyword") String phoneKeyword, - @Param("intentAreaName") String intentAreaName , - @Param("acceptAdjustType") Integer acceptAdjustType); - - - /** - * 加入/移除 黑名单 - * @param lineId - * @param status - * @param joinReason - * @param removeReason - * @return - */ - Boolean joinAndRemoveBlack(@Param("lineId") Long lineId, - @Param("status") Integer status, - @Param("joinReason") String joinReason, - @Param("removeReason") String removeReason); - - HyPartnerLineInfoDO getByPartnerId(@Param("partnerId") String partnerId); - - - - /** - * 查询公海线索 - * @param userNameKeyword - * @param phoneKeyword - * @param intentArea - * @param acceptAdjustType - * @param updateStartTime - * @param updateEndTime - * @param userIdList - * @return - */ - List getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword, - @Param("phoneKeyword") String phoneKeyword, - @Param("intentAreaName") String intentAreaName, - @Param("acceptAdjustType") Integer acceptAdjustType, - @Param("updateStartTime") String updateStartTime, - @Param("updateEndTime") String updateEndTime, - @Param("userIdList") List userIdList, - @Param("createStartTime") String createStartTime, - @Param("createEndTime") String createEndTime); - - - /** - * - * @return - */ - List getPrivateSeaLineList(PrivateSeaLineListRequest request); - - - /** - * 查询对应的加盟商最近线索 - * @param partnerIdList - * @return - */ - List getPartnerLastLine(@Param("partnerIdList") List partnerIdList); - - /** - * 加盟商跟进次数 - * @param partnerIdList - * @return - */ - List getFollowCountList(@Param("partnerIdList") List partnerIdList); - - - /** - * 根据线索ID查询线索数据 - * @param lineIds - * @return - */ - List getHyPartnerLineInfoListByIds(@Param("lineIds") List lineIds); - - /** - * 跟进历史 及删除状态为1的线索 - * @param partnerId - * @return - */ - List getLineFollowHistoryList(String partnerId); - - /** - * 根据面试计划 id 查询战区 id - */ - String getAffiliationZoneIdByInterviewPlanId(String interviewPlanId); - - /** - * 修改线索状态 - */ - void updateWorkflowStatus(@Param("lineId") String lineId, @Param("status") String status); - - List getOverTimeReserveLineList(@Param("deadlineEnd") Date deadlineEnd, - @Param("workflowStage") String workflowStage, - @Param("workflowStatus") String workflowStatus); - - List getWaitForOpenInterviewLineList(@Param("startTime") Date startTime, - @Param("endTime") Date endTime); - - void batchUpdateStatusByLineIds(@Param("lineIds") List lineIds, @Param("status")Integer status); - - /** - * 获取线索简要信息 - * @param partnerLineIds - * @return - */ - List getPartnerSimpleInfoByLineIds(@Param("partnerLineIds") List partnerLineIds); - - - /** - * 根据线索ID与招商经理查询数据 - * @param lineIds - * @param investmentManager - * @return - */ - List getHyPartnerLineInfoList(@Param("lineIds") List lineIds,String investmentManager); - - /** - * 获取线索转让次数 - * @param partnerLineId 线索 id - * @return 线索转让次数 - */ - Integer getTransferTimes(@Param("lineId") Long partnerLineId); - - - /** - * - * @return - */ - List getPrivateSeaPageInfoNext(PrivateSeaLineListRequest request); - - List getPublicSeaPageInfoNext(@Param("lineId") Long lineId,@Param("userNameKeyword") String userNameKeyword, - @Param("phoneKeyword") String phoneKeyword, - @Param("intentAreaName") String intentAreaName, - @Param("acceptAdjustType") Integer acceptAdjustType, - @Param("updateStartTime") String updateStartTime, - @Param("updateEndTime") String updateEndTime, - @Param("userIdList") List userIdList, - @Param("createStartTime") String createStartTime, - @Param("createEndTime") String createEndTime, - @Param("pageTurn") String pageTurn, - @Param("limit1") Integer limit1, - @Param("limit2") Integer limit2 - ); - - - /** - * 查询线索面试管信息 - * @param list - * @return - */ - List lineInterviewList(@Param("list") List list); - /** - * 查询线索招商经理信息 - * @param list - * @return - */ - List lineInvestmentList(@Param("list") List list); - - int batchUpdate(@Param("records") List records); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java deleted file mode 100644 index 328c7b71c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerTaskInfoLogDO; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -@Mapper -public interface HyPartnerTaskInfoLogMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:53 - */ - int insertSelective(@Param("record") HyPartnerTaskInfoLogDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:53 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerTaskInfoLogDO record); - - List selectByPartnerLineIdAndOperateType(@Param("partnerLineId") Long partnerLineId, @Param("operateType") String operateType); - - - int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); - - - /** - * 跟进线索id以及操作类型分页获取日志 - * @param partnerLineId - * @param operateTypes - * @return - */ - Page getLogPageByLineId(@Param("partnerLineId")Long partnerLineId, @Param("operateTypes")List operateTypes); - - /** - * 删除线索 - * @param partnerLineId - * @param message - * @return - */ - int deleteByLineId(@Param("partnerLineId") Long partnerLineId, @Param("message") String message); - - /** - * 获取通用信息需要的最新一条线索操作日志 - * @param partnerLineId - * @return - */ - List getLastTipsLog(@Param("lineId") Long partnerLineId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserChannelMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserChannelMapper.java deleted file mode 100644 index 7670ff35e..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserChannelMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerUserChannelDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - - -@Mapper -public interface HyPartnerUserChannelMapper { - int deleteByPrimaryKey(Long id); - - int insert(HyPartnerUserChannelDO record); - - int insertSelective(HyPartnerUserChannelDO record); - - HyPartnerUserChannelDO selectByPrimaryKey(Long id); - - int updateByPrimaryKeySelective(HyPartnerUserChannelDO record); - - int updateByPrimaryKey(HyPartnerUserChannelDO record); - - HyPartnerUserChannelDO selectByChannelId(@Param("channelId") Long id); - - HyPartnerUserChannelDO selectByChannelName(@Param("channelName") String channelName); - - List getAllUserChannel(); - - List getUserChannelByIds(List userChannelIds); - - HyPartnerUserChannelDO selectByChannel(@Param("channelId") Long channelId,@Param("channelName") String channelName); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java deleted file mode 100644 index eb95a698b..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.dto.partner.MobileCheckDTO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.entity.SyncEcCustomerDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -public interface HyPartnerUserInfoMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:53 - */ - int insertSelective(@Param("record") HyPartnerUserInfoDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:53 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerUserInfoDO record); - - /** - * 根据partnerID查询用户信息 - * @param partnerId - * @return - */ - HyPartnerUserInfoDO selectByPartnerId(@Param("partnerId") String partnerId); - - HyPartnerUserInfoDO selectByMobile(@Param("mobile") String mobile); - - /** - * 根据partnerIDs批量查询用户信息 - * @param partnerIdList - * @return - */ - List selectByPartnerIds(@Param("partnerIdList") List partnerIdList); - - int updateJoinKnowById(@Param("isWritePartnerKnow")Integer isWritePartnerKnow, @Param("id")Long id); - - List selectByHourDate(@Param("selectTime") String hourDayDate, @Param("now") String now,@Param("limit1")Integer limit1,@Param("limit2")Integer limit2); - - int selectByHourDateCount(@Param("selectTime") String hourDayDate, @Param("now") String now); - - int updateByPartnerId(@Param("record") HyPartnerUserInfoDO record); - - String selectLastCrmCreateTime(); - - MobileCheckDTO selectByCheckMobile(@Param("mobile") String mobile); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java deleted file mode 100644 index 66f04e7f1..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.entity.HyPartnerUserPlatformBindDO; -import org.apache.ibatis.annotations.Param; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -public interface HyPartnerUserPlatformBindMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:53 - */ - int insertSelective(@Param("record") HyPartnerUserPlatformBindDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:53 - */ - int updateByPrimaryKeySelective(@Param("record") HyPartnerUserPlatformBindDO record); - - HyPartnerUserPlatformBindDO getByPlatformTypeAndUserId(@Param("platformType") String platformType, @Param("platformUserId") String platformUserId); - - HyPartnerUserPlatformBindDO getByPartnerId(@Param("partnerId") String partnerId); - -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPhoneLocationMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPhoneLocationMapper.java deleted file mode 100644 index ddeefef06..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPhoneLocationMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyPhoneLocationDO; -import org.apache.ibatis.annotations.Param; - -/** - * @author zhangchenbiao - * @date 2023-06-30 02:47 - */ -public interface HyPhoneLocationMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-30 02:47 - */ - int insertSelective(@Param("record") HyPhoneLocationDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-30 02:47 - */ - int updateByPrimaryKeySelective(@Param("record") HyPhoneLocationDO record); - - /** - * 查询手机号 - * @param phoneNumber - * @return - */ - HyPhoneLocationDO selectByPhoneNumber(@Param("phoneNumber") String phoneNumber); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java deleted file mode 100644 index 5afd65996..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.HyWorkflowStageDO; -import org.apache.ibatis.annotations.Param; - -/** - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -public interface HyWorkflowStageMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-29 03:53 - */ - int insertSelective(@Param("record") HyWorkflowStageDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-29 03:53 - */ - int updateByPrimaryKeySelective(@Param("record") HyWorkflowStageDO record); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MdmAreaMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MdmAreaMapper.java deleted file mode 100644 index 0ea1d3c80..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/MdmAreaMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.MDMAreaDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface MdmAreaMapper { - - /** - * 获取 MDM 省级地区数据 - * @return - */ - List getProvince(); - - List getSonArea(@Param("code") String code); - - List getProvinceAllCode(@Param("code") String code); - - List getArea(@Param("code") String code); -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java deleted file mode 100644 index 8b9d4d59c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.RegionDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-07 02:07 - */ -public interface RegionMapper { - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-07 02:07 - */ - int updateByPrimaryKeySelective(RegionDO record); - - /** - * 批量新增或者更新 - * @param insertOrUpdateList - * @return - */ - int batchInsertOrUpdate(@Param("insertOrUpdateList") List insertOrUpdateList); - - /** - * 删除不存在的区域 - * @param regionIds - * @return - */ - int deleteNotExistRegion(@Param("regionIds")List regionIds); - - /** - * 根据regionIds获取region - * @param regionIds - * @return - */ - List getRegionByRegionIds(@Param("regionIds")List regionIds); - - /** - * 根据区域id获取名称 - * @param regionIds - * @return - */ - List getRegionNameByRegionIds(@Param("regionIds")List regionIds); - - /** - * 获取区域基本信息 - * @return - */ - List getRegionBaseInfoList(); - - /** - * 获取区域信息 - * @param regionId - * @return - */ - RegionDO getRegionInfoByRegionId(@Param("regionId") String regionId); - - /** - * 获取区域的子节点个数 - * @return - */ - Integer getSubNodeCountByRegionId(@Param("regionId") String regionId); - - /** - * 删除区域 - * @param regionId - * @return - */ - Integer deleteRegionByRegionId(@Param("regionId") String regionId); - - /** - * 获取子节点 - * @param regionPathList - * @return - */ - List getSubRegionIds(@Param("regionPathList") List regionPathList); - - /** - * 获取子部门 - * @param regionId - * @return - */ - List getSubRegion(@Param("regionId") String regionId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java deleted file mode 100644 index e8449f4ba..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.SuperAdminConfigDO; -import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.Mapper; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-11-09 02:24 - */ -public interface SuperAdminConfigMapper { - - SuperAdminConfigDO selectByPrimaryKey(Long id); - - SuperAdminConfigDO isSuperAdmin(@Param("userId") String userId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java deleted file mode 100644 index f7ffbcf68..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysMenuMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.SysMenuDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-08 04:38 - */ -public interface SysMenuMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-08 04:38 - */ - int insertSelective(SysMenuDO record); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-08 04:38 - */ - int batchUpdateMenu(@Param("recordList") List recordList); - - List selectMenuAll(@Param("list") List parentIds); - - Integer selectMaxSort(); - - Integer batchDeleteMenu(@Param("list") List idList); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java deleted file mode 100644 index ff6e2fea7..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.SysRoleDO; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-08 10:54 - */ -public interface SysRoleMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-08 10:54 - */ - int batchInsertSelective(@Param("insertOrUpdateList") List insertOrUpdateList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-08 10:54 - */ - int updateByPrimaryKeySelective(SysRoleDO record); - - Integer deleteRole(@Param("roleType")Integer roleType, @Param("roleIds") List roleIds); - - /** - * 获取用户权限 - * @param userId - * @return - */ - SysRoleDO getHighestPriorityRoleByUserId(@Param("userId") String userId); - - /** - * 获取角色 - * @param roleName - * @return - */ - SysRoleDO getRoleByName(@Param("roleName") String roleName, @Param("roleType")Integer roleType); - - /** - * 角色分页 - * @return - */ - Page getRolePage(); - - /** - * 获取角色详情 - * @param roleId - * @return - */ - SysRoleDO getRoleDetail(@Param("roleId") String roleId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java deleted file mode 100644 index 038cae62c..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMenuMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.SysRoleMenuDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-05-19 03:01 - */ -public interface SysRoleMenuMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-05-19 03:01 - */ - int batchInsert(@Param("recordList") List recordList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-05-19 03:01 - */ - int updateByPrimaryKeySelective(@Param("record") SysRoleMenuDO record); - - /** - * 根据角色获取菜单 - * @param roleId - * @return - */ - List getRoleMenuByRoleId(@Param("roleId")String roleId); - - /** - * 删除角色权限 - * @param roleId - * @return - */ - Integer deleteRoleAuth(@Param("roleId")String roleId); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TRTCVideoCallBackMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TRTCVideoCallBackMapper.java deleted file mode 100644 index ab930d672..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/TRTCVideoCallBackMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface TRTCVideoCallBackMapper { - - /** - * 在面试信息表中添加面试录制视频链接 - * @param roomId - * @param videoUrl - */ - void addVideoUrl(@Param("roomId") String roomId, @Param("videoUrl") String videoUrl); -} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java deleted file mode 100644 index d12db9cac..000000000 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.cool.store.mapper; - -import com.cool.store.entity.UserRegionMappingDO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author zhangchenbiao - * @date 2023-06-07 02:07 - */ -public interface UserRegionMappingMapper { - /** - * - * 默认插入方法，只会给有值的字段赋值 - * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null - * dateTime:2023-06-07 02:07 - */ - int batchInsertOrUpdateUserRegion(@Param("insertOrUpdateList") List insertOrUpdateList); - - /** - * - * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 - * dateTime:2023-06-07 02:07 - */ - int updateByPrimaryKeySelective(UserRegionMappingDO record); - - /** - * 删除用户区域 - * @param regionId - * @param type - * @param excludeUserIds - * @return - */ - int deleteUserRegion(@Param("regionId") String regionId, @Param("type")Integer type, @Param("excludeUserIds") List excludeUserIds); - - /** - * 删除用户不存在的部门 - * @param userId - * @param type - * @param excludeRegionIds - * @return - */ - int deleteUserRegionByExcludeRegionIds(@Param("userId") String userId, @Param("type")Integer type, @Param("excludeRegionIds") List excludeRegionIds); - - /** - * 删除没有的部门映射关系 - * @param excludeRegionIds - * @return - */ - Integer deleteRegionUserByExcludeRegionIds(@Param("excludeRegionIds") List excludeRegionIds); - - /** - * 删除用户不在的区域 - * @param excludeUserIds - * @return - */ - Integer deleteRegionUserByExcludeUserIds(@Param("excludeUserIds") List excludeUserIds); - - /** - * 删除用户所在的区域 - * @param userId - * @return - */ - Integer deleteUserRegionByUserId(@Param("userId") String userId); - - /** - * 获取一个区域下是直挂的人 - * @param regionId - * @return - */ - List getUserListByRegionId(@Param("regionId") String regionId); - - /** - * 获取人所在的区域 - * @param userId - * @return - */ - List getRegionIdsByUserId(@Param("userId") String userId); - - /** - * 获取用户列表 - * @param regionIds - * @return - */ - List getUserListByRegionIds(@Param("regionIds") List regionIds); -} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml deleted file mode 100644 index 04d6a6a7c..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/BeautyCameraSettingMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - id, user_id, beauty, brightness, ruddy, deleted, create_time, update_time - - - - insert into beauty_camera_setting - - - user_id, - - - beauty, - - - brightness, - - - ruddy, - - - deleted, - - - create_time, - - - update_time, - - - - - #{record.userId}, - - - #{record.beauty}, - - - #{record.brightness}, - - - #{record.ruddy}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - ON DUPLICATE KEY UPDATE beauty = values(beauty), brightness = values(brightness), ruddy = values(ruddy) - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/CallRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/CallRecordMapper.xml deleted file mode 100644 index 31212903d..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/CallRecordMapper.xml +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, partner_line_id, trans_no, outgoing_mobile, outgoing_user_id, incoming_mobile, - incoming_user_id, call_start_time, call_end_time, record_url, call_status, fail_reason, - creater, create_time, updater, update_time, remark - - - insert into call_record - - - partner_line_id, - - - trans_no, - - - outgoing_mobile, - - - outgoing_user_id, - - - incoming_mobile, - - - incoming_user_id, - - - call_start_time, - - - call_end_time, - - - record_url, - - - call_status, - - - fail_reason, - - - creater, - - - create_time, - - - updater, - - - update_time, - - - remark, - - - - - #{partnerLineId}, - - - #{transNo}, - - - #{outgoingMobile}, - - - #{outgoingUserId}, - - - #{incomingMobile}, - - - #{incomingUserId}, - - - #{callStartTime}, - - - #{callEndTime}, - - - #{recordUrl}, - - - #{callStatus}, - - - #{failReason}, - - - #{creater}, - - - #{createTime}, - - - #{updater}, - - - #{updateTime}, - - - #{remark}, - - - - - update call_record - - - partner_line_id = #{partnerLineId}, - - - trans_no = #{transNo}, - - - outgoing_mobile = #{outgoingMobile}, - - - outgoing_user_id = #{outgoingUserId}, - - - incoming_mobile = #{incomingMobile}, - - - incoming_user_id = #{incomingUserId}, - - - call_start_time = #{callStartTime}, - - - call_end_time = #{callEndTime}, - - - record_url = #{recordUrl}, - - - call_status = #{callStatus}, - - - fail_reason = #{failReason}, - - - creater = #{creater}, - - - create_time = #{createTime}, - - - updater = #{updater}, - - - update_time = #{updateTime}, - - - remark = #{remark}, - - - where id = #{id} - - - update call_record - - - partner_line_id = #{partnerLineId}, - - - outgoing_mobile = #{outgoingMobile}, - - - outgoing_user_id = #{outgoingUserId}, - - - incoming_mobile = #{incomingMobile}, - - - incoming_user_id = #{incomingUserId}, - - - call_start_time = #{callStartTime}, - - - call_end_time = #{callEndTime}, - - - record_url = #{recordUrl}, - - - call_status = #{callStatus}, - - - fail_reason = #{failReason}, - - - creater = #{creater}, - - - create_time = #{createTime}, - - - updater = #{updater}, - - - update_time = #{updateTime}, - - - remark = #{remark}, - - - where trans_no = #{transNo} - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/DingdingUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DingdingUserMapper.xml deleted file mode 100644 index f383f5093..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/DingdingUserMapper.xml +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, userid, unionid, remark, is_boss, hired_date, is_senior, tel, work_place, email, - active, avatar, is_admin, is_hide, job_number, name, state_code, real_authed, db_update_timestamp, - position, mobile, check_status, job_status, config_code_id - - - is_leader_in_depts, department, extattr, roles - - - insert into dingding_user - - - userid, - - - unionid, - - - remark, - - - is_boss, - - - hired_date, - - - is_senior, - - - tel, - - - work_place, - - - email, - - - active, - - - avatar, - - - is_admin, - - - is_hide, - - - job_number, - - - name, - - - state_code, - - - real_authed, - - - db_update_timestamp, - - - position, - - - mobile, - - - check_status, - - - job_status, - - - config_code_id, - - - is_leader_in_depts, - - - department, - - - extattr, - - - roles, - - - - - #{userid}, - - - #{unionid}, - - - #{remark}, - - - #{isBoss}, - - - #{hiredDate}, - - - #{isSenior}, - - - #{tel}, - - - #{workPlace}, - - - #{email}, - - - #{active}, - - - #{avatar}, - - - #{isAdmin}, - - - #{isHide}, - - - #{jobNumber}, - - - #{name}, - - - #{stateCode}, - - - #{realAuthed}, - - - #{dbUpdateTimestamp}, - - - #{position}, - - - #{mobile}, - - - #{checkStatus}, - - - #{jobStatus}, - - - #{configCodeId}, - - - #{isLeaderInDepts}, - - - #{department}, - - - #{extattr}, - - - #{roles}, - - - - - update dingding_user - - - userid = #{userid}, - - - unionid = #{unionid}, - - - remark = #{remark}, - - - is_boss = #{isBoss}, - - - hired_date = #{hiredDate}, - - - is_senior = #{isSenior}, - - - tel = #{tel}, - - - work_place = #{workPlace}, - - - email = #{email}, - - - active = #{active}, - - - avatar = #{avatar}, - - - is_admin = #{isAdmin}, - - - is_hide = #{isHide}, - - - job_number = #{jobNumber}, - - - name = #{name}, - - - state_code = #{stateCode}, - - - real_authed = #{realAuthed}, - - - db_update_timestamp = #{dbUpdateTimestamp}, - - - position = #{position}, - - - mobile = #{mobile}, - - - check_status = #{checkStatus}, - - - job_status = #{jobStatus}, - - - config_code_id = #{configCodeId}, - - - is_leader_in_depts = #{isLeaderInDepts}, - - - department = #{department}, - - - extattr = #{extattr}, - - - roles = #{roles}, - - - where id = #{id} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml deleted file mode 100644 index 16cf19ea8..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, user_id, name, remark, mobile, email, org_email, main_admin, is_admin, unionid, - avatar, jobnumber, is_leader, leader_dept_ids, face_url, user_status, deleted, create_time, - update_time,online_status, feishu_user_id - - - user_region_ids - - - - insert into enterprise_user - - - user_id, - - - feishu_user_id, - - - name, - - - remark, - - - mobile, - - - email, - - - org_email, - - - main_admin, - - - is_admin, - - - unionid, - - - avatar, - - - jobnumber, - - - is_leader, - - - leader_dept_ids, - - - face_url, - - - user_status, - - - deleted, - - - create_time, - - - update_time, - - - user_region_ids, - - - - - #{record.userId}, - - - #{record.feishuUserId}, - - - #{record.name}, - - - #{record.remark}, - - - #{record.mobile}, - - - #{record.email}, - - - #{record.orgEmail}, - - - #{record.mainAdmin}, - - - #{record.isAdmin}, - - - #{record.unionid}, - - - #{record.avatar}, - - - #{record.jobnumber}, - - - #{record.isLeader}, - - - #{record.leaderDeptIds}, - - - #{record.faceUrl}, - - - #{record.userStatus}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.userRegionIds}, - - - ON DUPLICATE KEY UPDATE user_id = values(user_id), name = values(name), remark = values(remark), mobile = values(mobile), email = values(email), org_email = values(org_email) - , main_admin = values(main_admin), is_admin = values(is_admin), unionid = values(unionid), avatar = values(avatar), jobnumber = values(jobnumber) - , face_url = values(face_url), user_status = values(user_status), user_region_ids = values(user_region_ids), deleted = values(deleted), feishu_user_id = values(feishu_user_id) - - , is_leader = values(is_leader) - - - , leader_dept_ids = values(leader_dept_ids) - - - - - update enterprise_user - - - user_id = #{userId}, - - - feishu_user_id = #{feishuUserId}, - - - name = #{name}, - - - remark = #{remark}, - - - mobile = #{mobile}, - - - email = #{email}, - - - org_email = #{orgEmail}, - - - main_admin = #{mainAdmin}, - - - is_admin = #{isAdmin}, - - - unionid = #{unionid}, - - - avatar = #{avatar}, - - - jobnumber = #{jobnumber}, - - - is_leader = #{isLeader}, - - - leader_dept_ids = #{record.leaderDeptIds}, - - - face_url = #{faceUrl}, - - - user_status = #{userStatus}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - user_region_ids = #{userRegionIds}, - - - online_status = #{onlineStatus}, - - - where id = #{id} - - - - - - update enterprise_user set online_status = #{onlineStatus} where user_id = #{userId} - - - - - - update enterprise_user set deleted = 1 where user_id not in #{userId} - - - - update enterprise_user set deleted = 1 where user_id = #{userId} - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml deleted file mode 100644 index 97e69ab3b..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserRoleMapper.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - id, role_id, user_id, type, deleted, create_time, update_time - - - - insert into enterprise_user_role - - - role_id, - - - user_id, - - - type, - - - deleted, - - - create_time, - - - update_time, - - - - - #{record.roleId}, - - - #{record.userId}, - - - #{record.type}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - ON DUPLICATE KEY UPDATE deleted = values(deleted) - - - - update enterprise_user_role - - - role_id = #{roleId}, - - - user_id = #{userId}, - - - type = #{type}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - where id = #{id} - - - - update enterprise_user_role set deleted = 1 where role_id = #{roleId} and type = #{type} and user_id not in #{userId} - - - - update enterprise_user_role set deleted = 1 where role_id != #{excludeRoleId} and user_id = #{userId} and type = #{type} - - - - update enterprise_user_role set deleted = 1 where user_id = #{userId} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml deleted file mode 100644 index ed9fe563c..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - id, partner_url, allocation_roles, tencent_video_account, tencent_video_key, create_time, - update_time, create_user_id, update_user_id - - - - - - insert into hy_advanced_setting - - - partner_url, - - - allocation_roles, - - - tencent_video_account, - - - tencent_video_key, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - - - #{record.partnerUrl}, - - - #{record.allocationRoles}, - - - #{record.tencentVideoAccount}, - - - #{record.tencentVideoKey}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.createUserId}, - - - #{record.updateUserId}, - - - - - update hy_advanced_setting - set - partner_url = #{record.partnerUrl}, - tencent_video_account = #{record.tencentVideoAccount}, - tencent_video_key = #{record.tencentVideoKey}, - update_user_id = #{record.updateUserId} - where id = #{record.id} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml deleted file mode 100644 index 79d4650d9..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id, content_title, `subject`, content_type, cover, content, `status`, deleted, create_time, update_time, - create_user_id, update_user_id - - - content - - - insert into hy_content_info - - - content_title, - - - subject, - - - content_type, - - - cover, - - - status, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - content, - - - - - #{record.contentTitle}, - - - #{record.subject}, - - - #{record.contentType}, - - - #{record.cover}, - - - #{record.status}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.createUserId}, - - - #{record.updateUserId}, - - - #{record.content}, - - - - - update hy_content_info - - - content_title = #{record.contentTitle}, - - - subject = #{record.subject}, - - - content_type = #{record.contentType}, - - - cover = #{record.cover}, - - - status = #{record.status}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - create_user_id = #{record.createUserId}, - - - update_user_id = #{record.updateUserId}, - - - content = #{record.content}, - - - where id = #{record.id} - - - update hy_content_info - - deleted = 1 - - where id = #{contentId} - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml deleted file mode 100644 index ccffa8a07..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - id, exhibition_group_name, closed, create_time, update_time, creator, updater, deleted - - - - - - - - - - delete from hy_exhibition_group - where id = #{id,jdbcType=INTEGER} - - - insert into hy_exhibition_group - - - exhibition_group_name, - - - closed, - - - create_time, - - - update_time, - - - creator, - - - updater, - - - deleted, - - - - - #{exhibitionGroupName,jdbcType=VARCHAR}, - - - #{closed,jdbcType=BIT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{creator,jdbcType=VARCHAR}, - - - #{updater,jdbcType=VARCHAR}, - - - #{deleted,jdbcType=BIT}, - - - - - update hy_exhibition_group - - - exhibition_group_name = #{exhibitionGroupName,jdbcType=VARCHAR}, - - - closed = #{closed,jdbcType=BIT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - updater = #{updater,jdbcType=VARCHAR}, - - - deleted = #{deleted,jdbcType=BIT}, - - - where id = #{id,jdbcType=INTEGER} - - - - - and t.id = #{id,jdbcType=INTEGER} - - - and t.exhibition_group_name = #{exhibitionGroupName,jdbcType=VARCHAR} - - - and t.closed = #{closed,jdbcType=BIT} - - - and t.create_time = #{createTime,jdbcType=TIMESTAMP} - - - and t.update_time = #{updateTime,jdbcType=TIMESTAMP} - - - and t.creator = #{creator,jdbcType=VARCHAR} - - - and t.updater = #{updater,jdbcType=VARCHAR} - - - and t.deleted = #{deleted,jdbcType=BIT} - - - - - - UPDATE `hy_exhibition_group` t1 - INNER JOIN ( - -- 所有关联的会销都结束的会销组（不包含未关联会销的会销组） - SELECT eg.id - FROM `hy_exhibition_group` eg - LEFT JOIN `hy_exhibition` e ON eg.id = e.exhibition_group_id - WHERE eg.deleted = 0 - AND e.deleted = 0 - AND eg.closed = 0 - GROUP BY eg.id - HAVING COUNT(e.id) = COUNT(CASE WHEN e.closed_type != 0 THEN 1 END) - ) AS t2 ON t1.id = t2.id - SET closed = 1 - WHERE t1.deleted = 0 - AND t1.closed = 0 - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml deleted file mode 100644 index f085f8a91..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ /dev/null @@ -1,476 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id, exhibition_group_id, exhibition_code, exhibition_name, start_date, location, - closed_type, create_time, update_time, creator, updater, deleted, close_time - - - collaborators - - - - - - - delete from hy_exhibition - where id = #{id,jdbcType=INTEGER} - - - - SELECT LAST_INSERT_ID() - - insert into hy_exhibition - - - exhibition_group_id, - - - exhibition_code, - - - exhibition_name, - - - start_date, - - - location, - - - closed_type, - - - create_time, - - - update_time, - - - creator, - - - updater, - - - deleted, - - - close_time, - - - collaborators, - - - - - #{exhibitionGroupId,jdbcType=INTEGER}, - - - #{exhibitionCode,jdbcType=VARCHAR}, - - - #{exhibitionName,jdbcType=VARCHAR}, - - - #{startDate,jdbcType=DATE}, - - - #{location,jdbcType=VARCHAR}, - - - #{closedType,jdbcType=TINYINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{creator,jdbcType=VARCHAR}, - - - #{updater,jdbcType=VARCHAR}, - - - #{deleted,jdbcType=BIT}, - - - #{closeTime,jdbcType=TIMESTAMP}, - - - #{collaborators,jdbcType=LONGVARCHAR}, - - - - - - insert into hy_exhibition - ( - exhibition_group_id, - exhibition_code, - exhibition_name, - start_date, - location, - collaborators, - creator - ) - values - - ( - #{record.exhibitionGroupId}, - #{record.exhibitionCode}, - #{record.exhibitionName}, - #{record.startDate}, - #{record.location}, - #{record.collaborators}, - #{record.creator} - ) - - - - - - - update hy_exhibition - - - exhibition_group_id = #{exhibitionGroupId,jdbcType=INTEGER}, - - - exhibition_code = #{exhibitionCode,jdbcType=VARCHAR}, - - - exhibition_name = #{exhibitionName,jdbcType=VARCHAR}, - - - start_date = #{startDate,jdbcType=DATE}, - - - location = #{location,jdbcType=VARCHAR}, - - - closed_type = #{closedType,jdbcType=TINYINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - updater = #{updater,jdbcType=VARCHAR}, - - - deleted = #{deleted,jdbcType=BIT}, - - - close_time = #{closeTime,jdbcType=TIMESTAMP}, - - - collaborators = #{collaborators,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - - update hy_exhibition - set - exhibition_name = CASE id - - WHEN #{record.id} THEN #{record.exhibitionName} - - END, - location = CASE id - - WHEN #{record.id} THEN #{record.location} - - END, - updater = CASE id - - WHEN #{record.id} THEN #{record.updater} - - END, - collaborators = CASE id - - WHEN #{record.id} THEN #{record.collaborators} - - END - where id in - - #{record.id} - - - - - - - - - - - - - - - - - - - - - - and t.id = #{id,jdbcType=INTEGER} - - - and t.exhibition_group_id = #{exhibitionGroupId,jdbcType=INTEGER} - - - and t.exhibition_code = #{exhibitionCode,jdbcType=VARCHAR} - - - and t.exhibition_name = #{exhibitionName,jdbcType=VARCHAR} - - - and t.start_date = #{startDate,jdbcType=DATE} - - - and t.location = #{location,jdbcType=VARCHAR} - - - and t.closed_type = #{closedType,jdbcType=TINYINT} - - - and t.create_time = #{createTime,jdbcType=TIMESTAMP} - - - and t.update_time = #{updateTime,jdbcType=TIMESTAMP} - - - and t.creator = #{creator,jdbcType=VARCHAR} - - - and t.updater = #{updater,jdbcType=VARCHAR} - - - and t.deleted = #{deleted,jdbcType=BIT} - - - and t.close_time = #{closeTime,jdbcType=TIMESTAMP} - - - and t.collaborators = #{collaborators,jdbcType=LONGVARCHAR} - - - - - - - - - - update hy_exhibition - set closed_type = #{closedType}, close_time = #{closeDateTime} - where id in ( - - #{hyExhibitionId} - - ) - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml deleted file mode 100644 index 1bb8e876b..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, partner_line_id, follow_user_id, task_title, communication_type, deadline, communication_content, - task_status, finish_time, deleted, create_time, update_time - - - insert into hy_follow_task - - - partner_line_id, - - - follow_user_id, - - - task_title, - - - communication_type, - - - deadline, - - - communication_content, - - - task_status, - - - finish_time, - - - deleted, - - - create_time, - - - update_time, - - - - - #{record.partnerLineId}, - - - #{record.followUserId}, - - - #{record.taskTitle}, - - - #{record.communicationType}, - - - #{record.deadline}, - - - #{record.communicationContent}, - - - #{record.taskStatus}, - - - #{record.finishTime}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_follow_task - - - partner_line_id = #{record.partnerLineId}, - - - follow_user_id = #{record.followUserId}, - - - task_title = #{record.taskTitle}, - - - communication_type = #{record.communicationType}, - - - deadline = #{record.deadline}, - - - communication_content = #{record.communicationContent}, - - - task_status = #{record.taskStatus}, - - - finish_time = #{record.finishTime}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - - - - - - - - - update hy_follow_task set follow_user_id = #{followUserId} where partner_line_id = #{partnerLineId} - - - - update - hy_follow_task - set - task_status = if(deadline >= now(), 3, 5) - where - partner_line_id = #{partnerLineId} and task_status in ('0', '2') - - - - - - - - - - - - - - - - update hy_follow_task set partner_line_id = #{newLineId} where partner_line_id = #{oldLineId} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml deleted file mode 100644 index 88a951189..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml +++ /dev/null @@ -1,446 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id, interview_plan_id, operator_user_id, type, status, files, description, inspection_time, - creator, updator, remark, deleted, create_time, update_time - - - - - - - - - - - - - delete from hy_inspection - where id = #{id} - - - insert into hy_inspection (id, interview_plan_id, operator_user_id, - type, status, files, - description, inspection_time, creator, - updator, remark, deleted, - create_time, update_time) - values (#{id}, #{interviewPlanId}, #{operatorUserId}, - #{type}, #{status}, #{files}, - #{description}, #{inspectionTime}, #{creator}, - #{updator}, #{remark}, #{deleted}, - #{createTime}, #{updateTime}) - - - insert into hy_inspection - - - id, - - - interview_plan_id, - - - operator_user_id, - - - type, - - - status, - - - files, - - - description, - - - inspection_time, - - - creator, - - - updator, - - - remark, - - - deleted, - - - create_time, - - - update_time, - - - - - #{id}, - - - #{interviewPlanId}, - - - #{operatorUserId}, - - - #{type}, - - - #{status}, - - - #{files}, - - - #{description}, - - - #{inspectionTime}, - - - #{creator}, - - - #{updator}, - - - #{remark}, - - - #{deleted}, - - - #{createTime}, - - - #{updateTime}, - - - - - update hy_inspection - - - interview_plan_id = #{interviewPlanId}, - - - operator_user_id = #{operatorUserId}, - - - type = #{type}, - - - status = #{status}, - - - files = #{files}, - - - description = #{description}, - - - inspection_time = #{inspectionTime}, - - - creator = #{creator}, - - - updator = #{updator}, - - - remark = #{remark}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - where id = #{id} - - - update hy_inspection - set interview_plan_id = #{interviewPlanId}, - operator_user_id = #{operatorUserId}, - type = #{type}, - status = #{status}, - files = #{files}, - description = #{description}, - inspection_time = #{inspectionTime}, - creator = #{creator}, - updator = #{updator}, - remark = #{remark}, - deleted = #{deleted}, - create_time = #{createTime}, - update_time = #{updateTime} - where id = #{id} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMapper.xml deleted file mode 100644 index 5c288d4d1..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMapper.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - id, zone_name, inspection_user_id, create_user_id, update_user_id, create_time, update_time, deleted - - - insert into hy_inspection_setting - - - zone_name, - - - inspection_user_id, - - - create_user_id, - - - update_user_id, - - - create_time, - - - update_time, - - - deleted, - - - - - #{zoneName}, - - - #{inspectionUserId}, - - - #{createUserId}, - - - #{updateUserId}, - - - #{createTime}, - - - #{updateTime}, - - - #{deleted}, - - - - - update hy_inspection_setting - - - zone_name = #{zoneName}, - - - inspection_user_id = #{inspectionUserId}, - - - create_user_id = #{createUserId}, - - - update_user_id = #{updateUserId}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - deleted = #{deleted}, - - - where id = #{id} - - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml deleted file mode 100644 index 6d5fade75..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionSettingMappingMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - id, inspection_setting_id, open_area_mapping_id, create_time, update_time, deleted - - - - insert into hy_inspection_setting_mapping - - - inspection_setting_id, - - - open_area_mapping_id, - - - create_time, - - - update_time, - - - deleted, - - - - - #{record.inspectionSettingId}, - - - #{record.openAreaMappingId}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.deleted}, - - - ON DUPLICATE KEY UPDATE update_time = now(), deleted = values(deleted) - - - - update hy_inspection_setting_mapping - - - inspection_setting_id = #{inspectionSettingId}, - - - open_area_mapping_id = #{openAreaMappingId}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - deleted = #{deleted}, - - - where id = #{id} - - - - - - update - hy_inspection_setting_mapping - set - deleted = '1' , update_time = now() - where - inspection_setting_id = #{inspectionSettingId} and open_area_mapping_id not in - #{openAreaMappingId} - - - - update hy_inspection_setting_mapping set deleted = '1' , update_time = now() where inspection_setting_id = #{inspectionSettingId} - - - - - - update - hy_inspection_setting_mapping - set - deleted = '1' , update_time = now() - where - open_area_mapping_id in #{openAreaMappingId} - - and inspection_setting_id != #{excludeInspectionSettingId} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml deleted file mode 100644 index 3a4c1ac60..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - id, zone_name, associated_region_id, type, last_allot_user_id, deleted, create_time, - update_time, create_user_id, update_user_id - - - - - - insert into hy_intend_dev_zone_info - - - zone_name, - - - associated_region_id, - - - type, - - - last_allot_user_id, - - - deleted, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - - - #{record.zoneName}, - - - #{record.associatedRegionId}, - - - #{record.type}, - - - #{record.lastAllotUserId}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.createUserId}, - - - #{record.updateUserId}, - - - - - update hy_intend_dev_zone_info - - - zone_name = #{record.zoneName}, - - - associated_region_id = #{record.associatedRegionId}, - - - type = #{record.type}, - - - last_allot_user_id = #{record.lastAllotUserId}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - create_user_id = #{record.createUserId}, - - - update_user_id = #{record.updateUserId}, - - - where id = #{record.id} - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml deleted file mode 100644 index 052e907bf..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - id, mapping_id, open_area_mapping_id, type, create_time, update_time - - - insert into hy_intend_developement_mapping - - - mapping_id, - - - open_area_mapping_id, - - - type, - - - create_time, - - - update_time, - - - - - #{record.mappingId}, - - - #{record.openAreaMappingId}, - - - #{record.type}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_intend_developement_mapping - - - mapping_id = #{record.mappingId}, - - - open_area_mapping_id = #{record.openAreaMappingId}, - - - type = #{record.type}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - - - delete from hy_intend_developement_mapping - - - and type = #{type} - - - - #{openAreaId} - - - - - - - delete from hy_intend_developement_mapping - - - and type = #{type} - - - - #{mappingId} - - - - - - - - insert into - hy_intend_developement_mapping - ( - mapping_id, - open_area_mapping_id, - type - ) - values - - (#{record.mappingId}, - #{record.openAreaMappingId}, - #{record.type}) - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml deleted file mode 100644 index a92ce1949..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, operator_user_id, inspection_id, operation_type, description, files, operation_time, - remark, create_time, update_time - - - - - delete from hy_interview_inspection_log - where id = #{id} - - - insert into hy_interview_inspection_log (id, operator_user_id, inspection_id, - operation_type, description, files, - operation_time, remark, create_time, - update_time) - values (#{id}, #{operatorUserId}, #{inspectionId}, - #{operationType}, #{description}, #{files}, - #{operationTime}, #{remark}, #{createTime}, - #{updateTime}) - - - insert into hy_interview_inspection_log - - - id, - - - operator_user_id, - - - inspection_id, - - - operation_type, - - - description, - - - files, - - - operation_time, - - - remark, - - - create_time, - - - update_time, - - - - - #{id}, - - - #{operatorUserId}, - - - #{inspectionId}, - - - #{operationType}, - - - #{description}, - - - #{files}, - - - #{operationTime}, - - - #{remark}, - - - #{createTime}, - - - #{updateTime}, - - - - - update hy_interview_inspection_log - - - operator_user_id = #{operatorUserId}, - - - inspection_id = #{inspectionId}, - - - operation_type = #{operationType}, - - - description = #{description}, - - - files = #{files}, - - - operation_time = #{operationTime}, - - - remark = #{remark}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - where id = #{id} - - - update hy_interview_inspection_log - set operator_user_id = #{operatorUserId}, - inspection_id = #{inspectionId}, - operation_type = #{operationType}, - description = #{description}, - files = #{files}, - operation_time = #{operationTime}, - remark = #{remark}, - create_time = #{createTime}, - update_time = #{updateTime} - where id = #{id} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml deleted file mode 100644 index d916c2b8a..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - - - - - - - - - - - - id, parent_id, area_name, area_path, background_banner, detail_banner, area_status, - deleted, create_time, update_time, update_user_id - - - - insert into hy_open_area_info - - - parent_id, - - - area_name, - - - area_path, - - - background_banner, - - - detail_banner, - - - area_status, - - - deleted, - - - create_time, - - - update_time, - - - update_user_id, - - - - - #{record.parentId}, - - - #{record.areaName}, - - - #{record.areaPath}, - - - #{record.backgroundBanner}, - - - #{record.detailBanner}, - - - #{record.areaStatus}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.updateUserId}, - - - - - update hy_open_area_info - - - parent_id = #{record.parentId}, - - - area_name = #{record.areaName}, - - - area_path = #{record.areaPath}, - - - background_banner = #{record.backgroundBanner}, - - - detail_banner = #{record.detailBanner}, - - - area_status = #{record.areaStatus}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - update_user_id = #{record.updateUserId}, - - - where id = #{record.id} - - - - - - update hy_open_area_info - - - background_banner = #{backgroundBanner}, - - - detail_banner = #{detailBanner}, - - - area_status = #{areaStatus}, - - - update_user_id = #{updateUserId}, - - - - - - #{id} - - - - - - - - - update hy_open_area_info - - - background_banner = #{backgroundBanner}, - - - detail_banner = #{detailBanner}, - - - area_status = #{areaStatus}, - - - update_user_id = #{updateUserId}, - - - - - - #{parentId} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOutboundMobileMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOutboundMobileMapper.xml deleted file mode 100644 index 60a8f36ed..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOutboundMobileMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - id, mobile, remark, edit_user_id, create_user_id, update_user_id, deleted, create_time, update_time - - - - - - - delete from hy_outbound_mobile - where id = #{id} - - - insert into hy_outbound_mobile (id, mobile, edit_user_id, remark, - create_user_id, update_user_id, deleted, - create_time, update_time) - values (#{id}, #{mobile}, #{editUserId}, #{remark}, - #{createUserId}, #{updateUserId}, #{deleted}, - #{createTime}, #{updateTime}) - - - insert into hy_outbound_mobile - - - id, - - - mobile, - - - edit_user_id, - - - remark, - - - create_user_id, - - - update_user_id, - - - deleted, - - - create_time, - - - update_time, - - - - - #{id}, - - - #{mobile}, - - - #{remark}, - - - #{editUserId}, - - - #{createUserId}, - - - #{updateUserId}, - - - #{deleted}, - - - #{createTime}, - - - #{updateTime}, - - - - - update hy_outbound_mobile - - - mobile = #{mobile}, - - - remark = #{remark}, - - - edit_user_id = #{editUserId}, - - - create_user_id = #{createUserId}, - - - update_user_id = #{updateUserId}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - where id = #{id} - - - update hy_outbound_mobile - set mobile = #{mobile}, - edit_user_id = #{editUserId}, - remark = #{remark}, - create_user_id = #{createUserId}, - update_user_id = #{updateUserId}, - deleted = #{deleted}, - create_time = #{createTime}, - update_time = #{updateTime} - where id = #{id} - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml deleted file mode 100644 index a3ab15314..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id, partner_id, partner_line_id, mobile, username, sex, nation, birthdate, id_card, - id_card_photo_front, id_card_photo_black, live_address, user_portrait, status, latest_log_message, - pass_reason, certify_file, create_time, update_time - - - - - - insert into - hy_partner_base_info - ( - partner_id, - partner_line_id - ) - values - - (#{record.partnerId}, - #{record.partnerLineId}) - - - - - insert into hy_partner_base_info - - - partner_id, - - - partner_line_id, - - - mobile, - - - username, - - - sex, - - - nation, - - - birthdate, - - - id_card, - - - id_card_photo_front, - - - id_card_photo_black, - - - live_address, - - - user_portrait, - - - status, - - - latest_log_message, - - - pass_reason, - - - certify_file, - - - create_time, - - - update_time, - - - - - #{record.partnerId}, - - - #{record.partnerLineId}, - - - #{record.mobile}, - - - #{record.username}, - - - #{record.sex}, - - - #{record.nation}, - - - #{record.birthdate}, - - - #{record.idCard}, - - - #{record.idCardPhotoFront}, - - - #{record.idCardPhotoBlack}, - - - #{record.liveAddress}, - - - #{record.userPortrait}, - - - #{record.status}, - - - #{record.latestLogMessage}, - - - #{record.passReason}, - - - #{record.certifyFile}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - - - - update hy_partner_base_info - - - partner_id = #{record.partnerId}, - - - partner_line_id = #{record.partnerLineId}, - - - mobile = #{record.mobile}, - - - username = #{record.username}, - - - sex = #{record.sex}, - - - nation = #{record.nation}, - - - birthdate = #{record.birthdate}, - - - id_card = #{record.idCard}, - - - id_card_photo_front = #{record.idCardPhotoFront}, - - - id_card_photo_black = #{record.idCardPhotoBlack}, - - - live_address = #{record.liveAddress}, - - - user_portrait = #{record.userPortrait}, - - - status = #{record.status}, - - - latest_log_message = #{record.latestLogMessage}, - - - pass_reason = #{record.passReason}, - - - certify_file = #{record.certifyFile}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - pass_time = #{record.passTime}, - - - pass_user_id = #{record.passUserId}, - - - where id = #{record.id} - - - - update hy_partner_base_info - set - nation = #{record.nation}, - birthdate = #{record.birthdate}, - id_card = #{record.idCard}, - user_portrait = #{record.userPortrait}, - id_card_photo_front = #{record.idCardPhotoFront}, - id_card_photo_black = #{record.idCardPhotoBlack}, - live_address = #{record.liveAddress}, - status = #{record.status} - where id = #{record.id} - - - - - update hy_partner_base_info - - update_time=now(), - - username = #{userName}, - - - mobile = #{mobile}, - - - where partner_id = #{partnerId} - - - - - - - - - - - - - - update hy_partner_base_info - set - id_card = #{idCard}, - id_card_photo_front = #{idCardPhotoFront}, - id_card_photo_black = #{idCardPhotoBlack} - where partner_line_id = #{partnerLineId} - - - update hy_partner_base_info - - update_time=now(), - - user_portrait = concat(",",#{userPortrait},","), - - - where mobile = #{mobile} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml deleted file mode 100644 index b7713fef3..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - id, partner_id, partner_line_id, partner_interview_id, qualify_verify_id, intention_contract_no, data_source, certification_info_record_json, create_time, update_time - - - insert into hy_partner_certification_info - - - partner_id, - - - partner_line_id, - - - partner_interview_id, - - - qualify_verify_id, - - - intention_contract_no, - - - data_source, - - - certification_info_record_json, - - - create_time, - - - update_time, - - - - - #{record.partnerId}, - - - #{record.partnerLineId}, - - - #{record.partnerInterviewId}, - - - #{record.qualifyVerifyId}, - - - #{record.intentionContractNo}, - - - #{record.dataSource}, - - - #{record.certificationInfoRecordJson}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_partner_certification_info - - - partner_id = #{record.partnerId}, - - - partner_line_id = #{record.partnerLineId}, - - - partner_interview_id = #{record.partnerInterviewId}, - - - qualify_verify_id = #{record.qualifyVerifyId}, - - - intention_contract_no = #{record.intentionContractNo}, - - - data_source = #{record.dataSource}, - - - certification_info_record_json = #{record.certificationInfoRecordJson}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - - 1 = 0 - - or id = #{record.id} - - - or partner_line_id = #{record.partnerLineId} - - - - - - - - - - - - - update hy_partner_interview - set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml deleted file mode 100644 index ae27c8b67..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - id, partner_line_id, partner_id, username, relationship, age, choose_reason, create_time, - update_time - - - insert into hy_partner_clerk - - - partner_line_id, - - - partner_id, - - - username, - - - relationship, - - - age, - - - choose_reason, - - - create_time, - - - update_time, - - - - - #{record.partnerLineId}, - - - #{record.partnerId}, - - - #{record.username}, - - - #{record.relationship}, - - - #{record.age}, - - - #{record.chooseReason}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_partner_clerk - - - partner_line_id = #{record.partnerLineId}, - - - partner_id = #{record.partnerId}, - - - username = #{record.username}, - - - relationship = #{record.relationship}, - - - age = #{record.age}, - - - choose_reason = #{record.chooseReason}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - - - - - insert into - hy_partner_clerk - ( - partner_line_id, - partner_id, - username, - relationship, - age, - choose_reason - ) - values - - (#{record.partnerLineId}, - #{record.partnerId}, - #{record.username}, - #{record.relationship}, - #{record.age}, - #{record.chooseReason}) - - - - - delete from hy_partner_clerk where partner_id = #{partnerId} and partner_line_id = #{partnerLineId} - - - - - - update hy_partner_clerk - set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerEcTrackLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerEcTrackLogMapper.xml deleted file mode 100644 index 57d5d7422..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerEcTrackLogMapper.xml +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id, trajectory_id, user_id, user_name, crm_id,mobile, receive_user_ids, receive_user, trajectory_type,partner_id, - trajectory_type_content, content, operate_time, create_time, update_time, remark - - - - - delete from hy_partner_ec_track_log - where id = #{id,jdbcType=BIGINT} - - - insert into hy_partner_ec_track_log (trajectory_id, user_id, user_name, mobile, - crm_id,partner_id, receive_user_ids, receive_user, - trajectory_type, trajectory_type_content, - content, operate_time, create_time, - update_time, remark) - values (#{trajectoryId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, - #{crmId,jdbcType=VARCHAR},#{partnerId,jdbcType=VARCHAR}, #{receiveUserIds,jdbcType=VARCHAR}, #{receiveUser,jdbcType=VARCHAR}, - #{trajectoryType,jdbcType=INTEGER}, #{trajectoryTypeContent,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, #{operateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}) - - - insert into hy_partner_ec_track_log - - - trajectory_id, - - - user_id, - - - user_name, - - - mobile, - - - crm_id, - - - partner_id, - - - receive_user_ids, - - - receive_user, - - - trajectory_type, - - - trajectory_type_content, - - - content, - - - operate_time, - - - create_time, - - - update_time, - - - remark, - - - - - #{trajectoryId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{userName,jdbcType=VARCHAR}, - - - #{mobile,jdbcType=VARCHAR}, - - - #{crmId,jdbcType=VARCHAR}, - - - #{partnerId,jdbcType=VARCHAR}, - - - #{receiveUserIds,jdbcType=VARCHAR}, - - - #{receiveUser,jdbcType=VARCHAR}, - - - #{trajectoryType,jdbcType=INTEGER}, - - - #{trajectoryTypeContent,jdbcType=VARCHAR}, - - - #{content,jdbcType=VARCHAR}, - - - #{operateTime,jdbcType=TIMESTAMP}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - ON DUPLICATE KEY UPDATE trajectory_id=values(trajectory_id) - ,user_id=values(user_id) - ,user_name=values(user_name) - ,crm_id=values(crm_id) - ,partner_id=values(partner_id) - ,mobile=values(mobile) - ,receive_user_ids=values(receive_user_ids) - ,receive_user=values(receive_user) - ,trajectory_type=values(trajectory_type) - ,trajectory_type_content=values(trajectory_type_content) - ,content=values(content) - ,operate_time=values(operate_time) - ,create_time=values(create_time) - ,remark=values(remark) - - - - insert into hy_partner_ec_track_log - - - trajectory_id, - - - user_id, - - - user_name, - - - mobile, - - - crm_id, - - - partner_id, - - - receive_user_ids, - - - receive_user, - - - trajectory_type, - - - trajectory_type_content, - - - content, - - - operate_time, - - - create_time, - - - update_time, - - - remark, - - - - - #{record.trajectoryId,jdbcType=VARCHAR}, - - - #{record.userId,jdbcType=VARCHAR}, - - - #{record.userName,jdbcType=VARCHAR}, - - - #{record.mobile,jdbcType=VARCHAR}, - - - #{record.crmId,jdbcType=VARCHAR}, - - - #{record.partnerId,jdbcType=VARCHAR}, - - - #{record.receiveUserIds,jdbcType=VARCHAR}, - - - #{record.receiveUser,jdbcType=VARCHAR}, - - - #{record.trajectoryType,jdbcType=INTEGER}, - - - #{record.trajectoryTypeContent,jdbcType=VARCHAR}, - - - #{record.content,jdbcType=VARCHAR}, - - - #{record.operateTime,jdbcType=TIMESTAMP}, - - - #{record.createTime,jdbcType=TIMESTAMP}, - - - #{record.remark,jdbcType=VARCHAR}, - - - ON DUPLICATE KEY UPDATE trajectory_id=values(trajectory_id) - ,user_id=values(user_id) - ,user_name=values(user_name) - ,crm_id=values(crm_id) - ,partner_id=values(partner_id) - ,mobile=values(mobile) - ,receive_user_ids=values(receive_user_ids) - ,receive_user=values(receive_user) - ,trajectory_type=values(trajectory_type) - ,trajectory_type_content=values(trajectory_type_content) - ,content=values(content) - ,operate_time=values(operate_time) - ,create_time=values(create_time) - ,remark=values(remark) - - - - update hy_partner_ec_track_log - - - trajectory_id = #{trajectoryId,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - mobile = #{mobile,jdbcType=VARCHAR}, - - - user_name = #{userName,jdbcType=VARCHAR}, - - - crm_id = #{crmId,jdbcType=VARCHAR}, - - - partner_id = #{partnerId,jdbcType=VARCHAR}, - - - receive_user_ids = #{receiveUserIds,jdbcType=VARCHAR}, - - - receive_user = #{receiveUser,jdbcType=VARCHAR}, - - - trajectory_type = #{trajectoryType,jdbcType=INTEGER}, - - - trajectory_type_content = #{trajectoryTypeContent,jdbcType=VARCHAR}, - - - content = #{content,jdbcType=VARCHAR}, - - - operate_time = #{operateTime,jdbcType=TIMESTAMP}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - update hy_partner_ec_track_log - set trajectory_id = #{trajectoryId,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - user_name = #{userName,jdbcType=VARCHAR}, - crm_id = #{crmId,jdbcType=VARCHAR}, - partner_id = #{partnerId,jdbcType=VARCHAR}, - mobile = #{mobile,jdbcType=VARCHAR}, - receive_user_ids = #{receiveUserIds,jdbcType=VARCHAR}, - receive_user = #{receiveUser,jdbcType=VARCHAR}, - trajectory_type = #{trajectoryType,jdbcType=INTEGER}, - trajectory_type_content = #{trajectoryTypeContent,jdbcType=VARCHAR}, - content = #{content,jdbcType=VARCHAR}, - operate_time = #{operateTime,jdbcType=TIMESTAMP}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml deleted file mode 100644 index 15031ef01..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ /dev/null @@ -1,553 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - id, exhibition_id, partner_line_id, partner_id, want_shop_area, investment_manager_name, - expected_visitors_count, expected_information, participation_status, interview_plan_id, - create_time, update_time, creator, updater, deleted,check_in_time - - - - - - - - - delete from hy_partner_exhibition - where id = #{id,jdbcType=BIGINT} - - - - - - - SELECT LAST_INSERT_ID() - - insert into hy_partner_exhibition - - - exhibition_id, - - - partner_line_id, - - - partner_id, - - - want_shop_area, - - - investment_manager_name, - - - expected_visitors_count, - - - expected_information, - - - participation_status, - - - interview_plan_id, - - - create_time, - - - update_time, - - - creator, - - - updater, - - - deleted, - - - - - #{exhibitionId,jdbcType=VARCHAR}, - - - #{partnerLineId,jdbcType=BIGINT}, - - - #{partnerId,jdbcType=VARCHAR}, - - - #{wantShopArea,jdbcType=VARCHAR}, - - - #{investmentManagerName,jdbcType=VARCHAR}, - - - #{expectedVisitorsCount,jdbcType=INTEGER}, - - - #{expectedInformation,jdbcType=VARCHAR}, - - - #{participationStatus,jdbcType=TINYINT}, - - - #{interviewPlanId,jdbcType=BIGINT}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{creator,jdbcType=VARCHAR}, - - - #{updater,jdbcType=VARCHAR}, - - - #{deleted,jdbcType=BIT}, - - - - - update hy_partner_exhibition - - - exhibition_id = #{exhibitionId,jdbcType=BIGINT}, - - - partner_line_id = #{partnerLineId,jdbcType=BIGINT}, - - - partner_id = #{partnerId,jdbcType=VARCHAR}, - - - want_shop_area = #{wantShopArea,jdbcType=VARCHAR}, - - - investment_manager_name = #{investmentManagerName,jdbcType=VARCHAR}, - - - expected_visitors_count = #{expectedVisitorsCount,jdbcType=INTEGER}, - - - expected_information = #{expectedInformation,jdbcType=VARCHAR}, - - - participation_status = #{participationStatus,jdbcType=TINYINT}, - - - interview_plan_id = #{interviewPlanId,jdbcType=BIGINT}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - updater = #{updater,jdbcType=VARCHAR}, - - - deleted = #{deleted,jdbcType=BIT}, - - - check_in_time = #{checkInTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - - - and t.id = #{id,jdbcType=BIGINT} - - - and t.exhibition_id = #{exhibitionId,jdbcType=VARCHAR} - - - and t.partner_line_id = #{partnerLineId,jdbcType=BIGINT} - - - and t.partner_id = #{partnerId,jdbcType=VARCHAR} - - - and t.want_shop_area = #{wantShopArea,jdbcType=VARCHAR} - - - and t.investment_manager_name = #{investmentManagerName,jdbcType=VARCHAR} - - - and t.expected_visitors_count = #{expectedVisitorsCount,jdbcType=INTEGER} - - - and t.expected_information = #{expectedInformation,jdbcType=VARCHAR} - - - and t.participation_status = #{participationStatus,jdbcType=TINYINT} - - - and t.interview_plan_id = #{interviewPlanId,jdbcType=BIGINT} - - - and t.create_time = #{createTime,jdbcType=TIMESTAMP} - - - and t.update_time = #{updateTime,jdbcType=TIMESTAMP} - - - and t.creator = #{creator,jdbcType=VARCHAR} - - - and t.updater = #{updater,jdbcType=VARCHAR} - - - and t.deleted = #{deleted,jdbcType=BIT} - - - - - - UPDATE hy_partner_exhibition - SET participation_status = 6 - WHERE partner_line_id = #{partnerLineId} - AND participation_status = 4 - - - - UPDATE hy_partner_exhibition - SET deleted = 1 - WHERE partner_line_id = #{partnerLineId} - AND deleted = 0 - - - - - - - - - - - - - - - - - - - - - UPDATE hy_partner_exhibition t1 - INNER JOIN hy_exhibition t2 ON t1.exhibition_id = t2.id - SET t1.participation_status = 2 - WHERE t1.deleted = 0 - AND t2.deleted = 0 - AND t2.closed_type = 0 - AND partner_line_id = #{partnerLineId} - AND participation_status = 1 - - - - UPDATE hy_partner_exhibition - SET participation_status = 4 - WHERE deleted = 0 - AND participation_status = 3 - AND interview_plan_id = #{interviewPlanId} - - - - UPDATE hy_partner_exhibition - SET participation_status = 5 - WHERE deleted = 0 - AND participation_status = 4 - AND interview_plan_id = #{interviewPlanId} - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml deleted file mode 100644 index fb2ef946e..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ /dev/null @@ -1,484 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop, - want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp, - work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,credit_prove, - create_time, update_time,detailed_address,email ,acquaintance_flag,acquaintance_name,acquaintance_relationship_type,other_relationship_type - - - - insert into hy_partner_intent_info - - - partner_id, - - - partner_line_id, - - - live_area, - - - want_shop_area, - - - accept_adjust_type, - - - is_have_want_shop, - - - want_shop_info, - - - max_budget, - - - money_source, - - - money_prove, - - - credit_prove, - - - education, - - - work_year, - - - is_have_work_exp, - - - work_exp, - - - is_consumer, - - - other_band, - - - brand_strength, - - - need_improve, - - - strength, - - - weakness, - - - create_time, - - - update_time, - - - detailed_address, - - - email, - - - acquaintance_flag, - - - acquaintance_name, - - - acquaintance_relationship_type, - - - other_relationship_type, - - - - - #{record.partnerId}, - - - #{record.partnerLineId}, - - - #{record.liveArea}, - - - #{record.wantShopArea}, - - - #{record.acceptAdjustType}, - - - #{record.isHaveWantShop}, - - - #{record.wantShopInfo}, - - - #{record.maxBudget}, - - - #{record.moneySource}, - - - #{record.moneyProve}, - - - #{record.creditProve}, - - - #{record.education}, - - - #{record.workYear}, - - - #{record.isHaveWorkExp}, - - - #{record.workExp}, - - - #{record.isConsumer}, - - - #{record.otherBand}, - - - #{record.brandStrength}, - - - #{record.needImprove}, - - - #{record.strength}, - - - #{record.weakness}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.detailedAddress}, - - - #{record.email}, - - - #{record.acquaintanceFlag}, - - - #{record.acquaintanceName}, - - - #{record.acquaintanceRelationshipType}, - - - #{record.otherRelationshipType}, - - - - - update hy_partner_intent_info - - - partner_id = #{record.partnerId}, - - - partner_line_id = #{record.partnerLineId}, - - - live_area = #{record.liveArea}, - - - want_shop_area = #{record.wantShopArea}, - - - accept_adjust_type = #{record.acceptAdjustType}, - - - is_have_want_shop = #{record.isHaveWantShop}, - - - want_shop_info = #{record.wantShopInfo}, - - - max_budget = #{record.maxBudget}, - - - money_source = #{record.moneySource}, - - - money_prove = #{record.moneyProve}, - - - credit_prove = #{record.creditProve}, - - - education = #{record.education}, - - - work_year = #{record.workYear}, - - - is_have_work_exp = #{record.isHaveWorkExp}, - - - work_exp = #{record.workExp}, - - - is_consumer = #{record.isConsumer}, - - - other_band = #{record.otherBand}, - - - brand_strength = #{record.brandStrength}, - - - need_improve = #{record.needImprove}, - - - strength = #{record.strength}, - - - weakness = #{record.weakness}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - detailed_address = #{record.detailedAddress}, - - - email = #{record.email}, - - - where id = #{record.id} - - - - - - - - - - - update hy_partner_intent_info - set partner_line_id = #{newLineId},partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - - - update hy_partner_intent_info - set - acquaintance_flag = #{acquaintanceFlag} , - other_relationship_type = #{otherRelationshipType}, - acquaintance_name = #{acquaintanceName}, - acquaintance_relationship_type = #{acquaintanceRelationshipType} - where id = #{id} - - - - update hy_partner_intent_info - - - live_area = #{record.liveArea}, - - - want_shop_area = #{record.wantShopArea}, - - - accept_adjust_type = #{record.acceptAdjustType}, - - - is_have_want_shop = #{record.isHaveWantShop}, - - - want_shop_info = #{record.wantShopInfo}, - - - max_budget = #{record.maxBudget}, - - - money_source = #{record.moneySource}, - - - money_prove = #{record.moneyProve}, - - - credit_prove = #{record.creditProve}, - - - education = #{record.education}, - - - work_year = #{record.workYear}, - - - is_have_work_exp = #{record.isHaveWorkExp}, - - - work_exp = #{record.workExp}, - - - is_consumer = #{record.isConsumer}, - - - other_band = #{record.otherBand}, - - - brand_strength = #{record.brandStrength}, - - - need_improve = #{record.needImprove}, - - - strength = #{record.strength}, - - - weakness = #{record.weakness}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where partner_line_id = #{record.partnerLineId} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml deleted file mode 100644 index f88f57beb..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ /dev/null @@ -1,526 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer, - recorder, process_info, record_time, summary, auth_code, pass_pdf_url, pass_image_url, expiry_date, - latest_log_message, pass_reason, certify_file, create_time, update_time, approve_time, - partner_enter_time, interviewer_enter_time,deleted - - - insert into hy_partner_interview - - - status, - - - partner_line_id, - - - interview_plan_id, - - - partner_id, - - - deadline, - - - interviewer, - - - recorder, - - - process_info, - - - record_time, - - - summary, - - - auth_code, - - - pass_pdf_url, - - - pass_image_url, - - - expiry_date, - - - latest_log_message, - - - pass_reason, - - - certify_file, - - - create_time, - - - update_time, - - - approve_time, - - - partner_enter_time, - - - interviewer_enter_time, - - - deleted, - - - - - #{record.status}, - - - #{record.partnerLineId}, - - - #{record.interviewPlanId}, - - - #{record.partnerId}, - - - #{record.deadline}, - - - #{record.interviewer}, - - - #{record.recorder}, - - - #{record.processInfo}, - - - #{record.recordTime}, - - - #{record.summary}, - - - #{record.authCode}, - - - #{record.passPdfUrl}, - - - #{record.passImageUrl}, - - - #{record.expiryDate}, - - - #{record.latestLogMessage}, - - - #{record.passReason}, - - - #{record.certifyFile}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.approveTime}, - - - #{record.partnerEnterTime}, - - - #{record.interviewerEnterTime}, - - - #{record.deleted}, - - - - - update hy_partner_interview - - - status = #{status}, - - - partner_line_id = #{partnerLineId}, - - - interview_plan_id = #{interviewPlanId}, - - - partner_id = #{partnerId}, - - - deadline = #{deadline}, - - - interviewer = #{interviewer}, - - - recorder = #{recorder}, - - - process_info = #{processInfo}, - - - record_time = #{recordTime}, - - - summary = #{summary}, - - - auth_code = #{authCode}, - - - pass_code = #{passCode}, - - - pass_pdf_url = #{passPdfUrl}, - - - pass_image_url = #{passImageUrl}, - - - pass_time = #{passTime}, - - - expiry_date = #{expiryDate}, - - - latest_log_message = #{latestLogMessage}, - - - pass_reason = #{passReason}, - - - certify_file = #{certifyFile}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - approve_time = #{approveTime}, - - - partner_enter_time = #{partnerEnterTime}, - - - interviewer_enter_time = #{interviewerEnterTime}, - - - deleted = #{deleted}, - - - - 1 = 0 - - or id = #{id} - - - or interview_plan_id = #{interviewPlanId} - - - - - - - - - - - - - - - - - - - - - UPDATE hy_partner_interview - - - pass_code = #{passCode}, - - - pass_pdf_url = #{passPdfUrl}, - - - pass_image_url = #{passImageUrl}, - - - expiry_date = #{expiryDate} - - - WHERE id = #{interviewId} - - - UPDATE hy_partner_interview - - - status = #{status}, - - - deleted = #{deleted}, - - - WHERE id in - - #{item} - - - - - - - - - - - - - - - UPDATE hy_partner_interview - SET status = #{status} - WHERE interview_plan_id = #{interviewPlanId} - - - UPDATE hy_partner_interview - - - status = #{status} - - - WHERE partner_line_id in - - #{item} - - and deleted = 0 - - - - - - - - - - - - - - UPDATE hy_partner_interview - SET process_info = IF(process_info IS NULL, #{videoUrl}, CONCAT(process_info, ',' ,#{videoUrl})) - WHERE interview_plan_id = ( - SELECT id - FROM hy_partner_interview_plan - WHERE room_id = #{roomId} - ) - - - - - - - update hy_partner_interview - set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml deleted file mode 100644 index 8ec3e11e8..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ /dev/null @@ -1,624 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id, partner_line_id, partner_id, interview_date, start_time, end_time, is_partner_interview, - actual_start_time, actual_end_time, room_id, room_password, interviewer, room_status, - deleted, create_time, update_time,feishu_calendar_id,feishu_schedule_id - - - insert into hy_partner_interview_plan - - - partner_line_id, - - - partner_id, - - - interview_date, - - - start_time, - - - end_time, - - - is_partner_interview, - - - actual_start_time, - - - actual_end_time, - - - room_id, - - - room_password, - - - interviewer, - - - room_status, - - - deleted, - - - create_time, - - - update_time, - - - application_approved, - - - - - #{record.partnerLineId}, - - - #{record.partnerId}, - - - #{record.interviewDate}, - - - #{record.startTime}, - - - #{record.endTime}, - - - #{record.isPartnerInterview}, - - - #{record.actualStartTime}, - - - #{record.actualEndTime}, - - - #{record.roomId}, - - - #{record.roomPassword}, - - - #{record.interviewer}, - - - #{record.roomStatus}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.applicationApproved}, - - - - - update hy_partner_interview_plan - - - partner_line_id = #{record.partnerLineId}, - - - partner_id = #{record.partnerId}, - - - interview_date = #{record.interviewDate}, - - - start_time = #{record.startTime}, - - - end_time = #{record.endTime}, - - - is_partner_interview = #{record.isPartnerInterview}, - - - actual_start_time = #{record.actualStartTime}, - - - actual_end_time = #{record.actualEndTime}, - - - room_id = #{record.roomId}, - - - room_password = #{record.roomPassword}, - - - interviewer = #{record.interviewer}, - - - room_status = #{record.roomStatus}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - feishu_calendar_id = #{record.feishuCalendarId}, - - - feishu_schedule_id = #{record.feishuScheduleId}, - - - application_approved = #{record.applicationApproved}, - - - where id = #{record.id} - - - update hy_partner_interview_plan - set deleted = 1 - where id in - - #{id} - - - - update hy_partner_interview_plan - set room_status = #{roomStatus},update_time = now() - - - and room_status = #{record.roomStatus} - - - and start_time >= #{record.startTime} - - - and end_time <= #{record.endTime} - - - and deleted = #{deleted} - - - - - - update hy_partner_interview_plan - set room_status = #{roomStatus},update_time = now() - - partner_line_id in - - #{item} - - and deleted = 0 - - - - - update hy_partner_interview_plan - set room_status = #{roomStatus},update_time = now() - - - and room_status = #{record.roomStatus} - - - and end_time >= #{record.startTime} - - - and end_time <= #{record.endTime} - - - and deleted = #{deleted} - - - - - - - update hy_partner_interview_plan - set actual_start_time = IF(actual_start_time is NULL, #{now}, actual_start_time) - where id = #{id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update hy_partner_interview_plan - set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml deleted file mode 100644 index 605df6fd1..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - id, label_group_name, deleted, edit_user_id, edit_date, create_time, update_time, - create_user_id, update_user_id, remark - - - - - - - delete from hy_partner_label_group - where id = #{id} - - and id = #{id} - - - and label_group_name like concat('%', #{labelGroupName}, '%') - - - and edit_user_id = #{editUserId} - - - and edit_date = #{editDate} - - - and create_time = #{createTime} - - - and update_time =#{updateTime} - - - and create_user_id = #{createUserId} - - - and update_user_id = #{updateUserId} - - - and remark like concat('%', #{remark}, '%') - - - - insert into hy_partner_label_group (id, label_group_name, deleted, - edit_user_id, edit_date, create_time, - update_time, create_user_id, update_user_id, - remark) - values (#{id}, #{labelGroupName}, #{deleted}, - #{editUserId}, #{editDate}, #{createTime}, - #{updateTime}, #{createUserId}, #{updateUserId}, - #{remark}) - - - insert into hy_partner_label_group - - - id, - - - label_group_name, - - - deleted, - - - edit_user_id, - - - edit_date, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - remark, - - - - - #{id}, - - - #{labelGroupName}, - - - #{deleted}, - - - #{editUserId}, - - - #{editDate}, - - - #{createTime}, - - - #{updateTime}, - - - #{createUserId}, - - - #{updateUserId}, - - - #{remark}, - - - - - update hy_partner_label_group - - - label_group_name = #{labelGroupName}, - - - deleted = #{deleted}, - - - edit_user_id = #{editUserId}, - - - edit_date = #{editDate}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - create_user_id = #{createUserId}, - - - update_user_id = #{updateUserId}, - - - remark = #{remark}, - - - where id = #{id} - - - update hy_partner_label_group - set label_group_name = #{labelGroupName}, - deleted = #{deleted}, - edit_user_id = #{editUserId}, - edit_date = #{editDate}, - create_time = #{createTime}, - update_time = #{updateTime}, - create_user_id = #{createUserId}, - update_user_id = #{updateUserId}, - remark = #{remark} - where id = #{id} - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml deleted file mode 100644 index 1aa6f475b..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - id, label_group_id, label_name, edit_user_id, edit_date, deleted, create_time, update_time, - create_user_id, update_user_id, remark - - - - - - - delete from hy_partner_label - where id = #{id} - - - insert into hy_partner_label (id, label_group_id, label_name, - edit_user_id, edit_date, deleted, - create_time, update_time, create_user_id, - update_user_id, remark) - values (#{id}, #{labelGroupId}, #{labelName}, - #{editUserId}, #{editDate}, #{deleted}, - #{createTime}, #{updateTime}, #{createUserId}, - #{updateUserId}, #{remark}) - - - insert into hy_partner_label - - - id, - - - label_group_id, - - - label_name, - - - edit_user_id, - - - edit_date, - - - deleted, - - - create_time, - - - update_time, - - - create_user_id, - - - update_user_id, - - - remark, - - - - - #{id}, - - - #{labelGroupId}, - - - #{labelName}, - - - #{editUserId}, - - - #{editDate}, - - - #{deleted}, - - - #{createTime}, - - - #{updateTime}, - - - #{createUserId}, - - - #{updateUserId}, - - - #{remark}, - - - - - update hy_partner_label - - - label_group_id = #{labelGroupId}, - - - label_name = #{labelName}, - - - edit_user_id = #{editUserId}, - - - edit_date = #{editDate}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - create_user_id = #{createUserId}, - - - update_user_id = #{updateUserId}, - - - remark = #{remark} - - - where deleted = 0 - and id = #{id} - - - update hy_partner_label - set label_group_id = #{labelGroupId}, - label_name = #{labelName}, - edit_user_id = #{editUserId}, - edit_date = #{editDate}, - deleted = #{deleted}, - create_time = #{createTime}, - update_time = #{updateTime}, - create_user_id = #{createUserId}, - update_user_id = #{updateUserId}, - remark = #{remark} - where id = #{id} - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml deleted file mode 100644 index 393fd8e10..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ /dev/null @@ -1,1081 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, partner_id, workflow_stage, workflow_status, line_status, whether_in_exhibition, investment_manager, - development_director, development_manager, deadline, pass_reason, reject_public_reason, - reject_real_reason, certify_file, deleted, create_time, update_time, close_time, - close_user_id,create_user_id,create_user_mobile,operator_type,update_user_id,allot_time - - - - - - - insert into - hy_partner_line_info - ( - partner_id, - workflow_stage, - workflow_status, - line_status, - investment_manager, - allot_time - ) - values - - (#{record.partnerId}, - #{record.workflowStage}, - #{record.workflowStatus}, - #{record.lineStatus}, - #{record.investmentManager}, - #{record.allotTime}) - - - - - update hy_partner_line_info - set deleted = 1 - - - - #{lineId} - - - - - - - - - insert into hy_partner_line_info - - - partner_id, - - - workflow_stage, - - - workflow_status, - - - line_status, - - - whether_in_exhibition, - - - investment_manager, - - - development_director, - - - development_manager, - - - deadline, - - - pass_reason, - - - reject_public_reason, - - - reject_real_reason, - - - certify_file, - - - deleted, - - - create_time, - - - update_time, - - - close_time, - - - close_user_id, - - - create_user_id, - - - create_user_mobile, - - - operator_type, - - - update_user_id, - - - allot_time, - - - - - #{record.partnerId}, - - - #{record.workflowStage}, - - - #{record.workflowStatus}, - - - #{record.lineStatus}, - - - #{record.whetherInExhibition}, - - - #{record.investmentManager}, - - - #{record.developmentDirector}, - - - #{record.developmentManager}, - - - #{record.deadline}, - - - #{record.passReason}, - - - #{record.rejectPublicReason}, - - - #{record.rejectRealReason}, - - - #{record.certifyFile}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.closeTime}, - - - #{record.closeUserId}, - - - #{record.createUserId}, - - - #{record.createUserMobile}, - - - #{record.operatorType}, - - - #{record.updateUserId}, - - - #{record.allotTime}, - - - - - update hy_partner_line_info - - - partner_id = #{record.partnerId}, - - - workflow_stage = #{record.workflowStage}, - - - workflow_status = #{record.workflowStatus}, - - - line_status = #{record.lineStatus}, - - - whether_in_exhibition = #{record.whetherInExhibition}, - - - investment_manager = #{record.investmentManager}, - - - development_director = #{record.developmentDirector}, - - - development_manager = #{record.developmentManager}, - - - deadline = #{record.deadline}, - - - pass_reason = #{record.passReason}, - - - reject_public_reason = #{record.rejectPublicReason}, - - - reject_real_reason = #{record.rejectRealReason}, - - - certify_file = #{record.certifyFile}, - - - deleted = #{record.deleted}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - close_time = #{record.closeTime}, - - - close_user_id = #{record.closeUserId}, - - - join_black_reason = #{record.joinBlackReason}, - - - remove_black_reason = #{record.removeBlackReason}, - - - allot_time = #{record.allotTime}, - - - where id = #{record.id} - - - - update hy_partner_line_info - set - partner_id = #{record.partnerId}, - workflow_stage = #{record.workflowStage}, - workflow_status = #{record.workflowStatus}, - line_status = #{record.lineStatus}, - whether_in_exhibition = #{record.whetherInExhibition}, - investment_manager = #{record.investmentManager}, - development_director = #{record.developmentDirector}, - development_manager = #{record.developmentManager}, - deadline = #{record.deadline}, - pass_reason = #{record.passReason}, - reject_public_reason = #{record.rejectPublicReason}, - reject_real_reason = #{record.rejectRealReason}, - certify_file = #{record.certifyFile}, - close_time = #{record.closeTime}, - close_user_id = #{record.closeUserId}, - join_black_reason = #{record.joinBlackReason}, - remove_black_reason = #{record.removeBlackReason} - where id = #{record.id} - - - - - - - - - - - - - - - update hy_partner_line_info - set investment_manager = #{userId}, line_status= '1',allot_time=now() - - - #{lineId} - - - - - - - - - - - - update hy_partner_line_info - - - line_status = #{status}, - - - join_black_reason = #{joinCause}, - - - remove_black_reason = #{removeReason}, - - - where id = #{lineId} - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE hy_partner_line_info - SET workflow_status = #{status} - WHERE id = #{lineId} - - - UPDATE hy_partner_line_info - SET workflow_status = #{status} - WHERE id IN - - #{lineId} - - - - - - - - - - - - - - - - - - - - update hy_partner_line_info - set whether_in_exhibition = CASE id - - WHEN #{record.id} THEN #{record.whetherInExhibition} - - END - - #{record.id} - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml deleted file mode 100644 index 55af1df53..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, partner_line_id, operate_user_id, operate_username, operate_type, workflow_stage, workflow_status, - message, create_time, update_time, partner_id - - - field_copy - - - insert into hy_partner_task_info_log - - - partner_line_id, - - - operate_user_id, - - - operate_username, - - - operate_type, - - - workflow_stage, - - - workflow_status, - - - message, - - - create_time, - - - update_time, - - - partner_id, - - - field_copy, - - - - - #{record.partnerLineId}, - - - #{record.operateUserId}, - - - #{record.operateUsername}, - - - #{record.operateType}, - - - #{record.workflowStage}, - - - #{record.workflowStatus}, - - - #{record.message}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.partnerId}, - - - #{record.fieldCopy}, - - - - - update hy_partner_task_info_log - - - partner_line_id = #{record.partnerLineId}, - - - operate_user_id = #{record.operateUserId}, - - - operate_username = #{record.operateUsername}, - - - workflow_stage = #{record.workflowStage}, - - - workflow_status = #{record.workflowStatus}, - - - message = #{record.message}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - partner_id = #{record.partnerId}, - - - field_copy = #{record.fieldCopy}, - - - where id = #{record.id} - - - - - update hy_partner_task_info_log - set partner_line_id = #{newLineId} , partner_id = #{newPartnerId} - where partner_line_id = #{oldLineId} - - - - - - update hy_partner_task_info_log set deleted = '1', message = #{message} where partner_line_id= #{partnerLineId} - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserChannelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserChannelMapper.xml deleted file mode 100644 index 25529e754..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserChannelMapper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - id, channel_id, channel_name, create_time, update_time - - - - - - delete from hy_partner_user_channel - where id = #{id,jdbcType=BIGINT} - - - insert into hy_partner_user_channel (channel_id, channel_name, create_time, - update_time) - values (#{channelId,jdbcType=BIGINT}, #{channelName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into hy_partner_user_channel - - - channel_id, - - - channel_name, - - - create_time, - - - - - #{channelId,jdbcType=BIGINT}, - - - #{channelName,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - update hy_partner_user_channel - - - channel_id = #{channelId,jdbcType=BIGINT}, - - - channel_name = #{channelName,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=BIGINT} - - - update hy_partner_user_channel - set channel_id = #{channelId,jdbcType=BIGINT}, - channel_name = #{channelName,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=BIGINT} - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml deleted file mode 100644 index 23641e8b1..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, - invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, - recommend_partner_id, recommend_partner_name, recommend_partner_mobile,user_channel_id - - - - - - - - - - - - - - insert into hy_partner_user_info - - - partner_id, - - - mobile, - - - username, - - - live_area, - - - want_shop_area, - - - accept_adjust_type, - - - invite_code, - - - is_write_partner_know, - - - create_time, - - - update_time, - - - shop_code, - - - shop_name, - - - shop_id, - - - recommend_partner_id, - - - recommend_partner_name, - - - recommend_partner_mobile, - - - user_channel_id, - - - ec_want_shop_area, - - - crm_create_time, - - - - - #{record.partnerId}, - - - #{record.mobile}, - - - #{record.username}, - - - #{record.liveArea}, - - - #{record.wantShopArea}, - - - #{record.acceptAdjustType}, - - - #{record.inviteCode}, - - - #{record.isWritePartnerKnow}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.shopCode}, - - - #{record.shopName}, - - - #{record.shopId}, - - - #{record.recommendPartnerId}, - - - #{record.recommendPartnerName}, - - - #{record.recommendPartnerMobile}, - - - #{record.userChannelId}, - - - #{record.ecWantShopArea}, - - - #{record.crmCreateTime}, - - - - - update hy_partner_user_info - - - partner_id = #{record.partnerId}, - - - mobile = #{record.mobile}, - - - username = #{record.username}, - - - live_area = #{record.liveArea}, - - - want_shop_area = #{record.wantShopArea}, - - - accept_adjust_type = #{record.acceptAdjustType}, - - - invite_code = #{record.inviteCode}, - - - is_write_partner_know = #{record.isWritePartnerKnow}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - shop_code = #{record.shopCode}, - - - shop_name = #{record.shopName}, - - - shop_id = #{record.shopId}, - - - recommend_partner_id = #{record.recommendPartnerId}, - - - recommend_partner_name = #{record.recommendPartnerName}, - - - recommend_partner_mobile = #{record.recommendPartnerMobile}, - - - ec_want_shop_area = #{record.ecWantShopArea}, - - - where id = #{record.id} - - - - update hy_partner_user_info - set `is_write_partner_know`=#{isWritePartnerKnow,jdbcType=INTEGER} - where id=#{id,jdbcType=BIGINT} - - - - update hy_partner_user_info - - - mobile = #{record.mobile}, - - - username = #{record.username}, - - - live_area = #{record.liveArea}, - - - want_shop_area = #{record.wantShopArea}, - - - accept_adjust_type = #{record.acceptAdjustType}, - - - invite_code = #{record.inviteCode}, - - - is_write_partner_know = #{record.isWritePartnerKnow}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - shop_code = #{record.shopCode}, - - - shop_name = #{record.shopName}, - - - shop_id = #{record.shopId}, - - - recommend_partner_id = #{record.recommendPartnerId}, - - - recommend_partner_name = #{record.recommendPartnerName}, - - - recommend_partner_mobile = #{record.recommendPartnerMobile}, - - - where partner_id = #{record.partnerId} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml deleted file mode 100644 index 974460526..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - id, platform_type, platform_user_id, bind_time, partner_id, create_time, update_time - - - insert into hy_partner_user_platform_bind - - - platform_type, - - - platform_user_id, - - - bind_time, - - - partner_id, - - - create_time, - - - update_time, - - - - - #{record.platformType}, - - - #{record.platformUserId}, - - - #{record.bindTime}, - - - #{record.partnerId}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_partner_user_platform_bind - - - platform_type = #{record.platformType}, - - - platform_user_id = #{record.platformUserId}, - - - bind_time = #{record.bindTime}, - - - partner_id = #{record.partnerId}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPhoneLocationMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPhoneLocationMapper.xml deleted file mode 100644 index 35c031d82..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPhoneLocationMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - id, phone_number, phone_address, create_time, update_time - - - - insert into hy_phone_location - - - phone_number, - - - phone_address, - - - create_time, - - - update_time, - - - - - #{record.phoneNumber}, - - - #{record.phoneAddress}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_phone_location - - - phone_number = #{phoneNumber}, - - - phone_address = #{phoneAddress}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - where id = #{id} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml deleted file mode 100644 index 3c292c257..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - id, stage_code, stage_name, stage_order, create_time, update_time - - - insert into hy_workflow_stage - - - stage_code, - - - stage_name, - - - stage_order, - - - create_time, - - - update_time, - - - - - #{record.stageCode}, - - - #{record.stageName}, - - - #{record.stageOrder}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_workflow_stage - - - stage_code = #{record.stageCode}, - - - stage_name = #{record.stageName}, - - - stage_order = #{record.stageOrder}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/MdmAreaMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/MdmAreaMapper.xml deleted file mode 100644 index a4cb3bf1e..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/MdmAreaMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml deleted file mode 100644 index c6cedb480..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, region_id, name, parent_id, region_path, unclassified_flag, leader_user_id, order_num, - third_dept_id, create_time, create_name, update_time, update_name, deleted - - - - insert into region - - - region_id, - - - name, - - - parent_id, - - - region_path, - - - unclassified_flag, - - - leader_user_id, - - - order_num, - - - third_dept_id, - - - create_time, - - - create_name, - - - update_time, - - - update_name, - - - deleted, - - - - - #{record.regionId}, - - - #{record.name}, - - - #{record.parentId}, - - - #{record.regionPath}, - - - #{record.unclassifiedFlag}, - - - #{record.leaderUserId}, - - - #{record.orderNum}, - - - #{record.thirdDeptId}, - - - #{record.createTime}, - - - #{record.createName}, - - - #{record.updateTime}, - - - #{record.updateName}, - - - #{record.deleted}, - - - ON DUPLICATE KEY UPDATE region_id = values(region_id), name = values(name), parent_id = values(parent_id), region_path = values(region_path), leader_user_id = values(leader_user_id), order_num = values(order_num), third_dept_id = values(third_dept_id), update_time = now(), deleted = values(deleted) - - - - update region - - - region_id = #{regionId}, - - - name = #{name}, - - - parent_id = #{parentId}, - - - region_path = #{regionPath}, - - - unclassified_flag = #{unclassifiedFlag}, - - - leader_user_id = #{leaderUserId}, - - - order_num = #{orderNum}, - - - third_dept_id = #{thirdDeptId}, - - - create_time = #{createTime}, - - - create_name = #{createName}, - - - update_time = #{updateTime}, - - - update_name = #{updateName}, - - - deleted = #{deleted}, - - - where id = #{id} - - - - update region set deleted = 1 , update_time = now() where region_id not in #{regionId} - - - - - - - - - - - - - - update region set deleted = 1 where region_id = #{regionId} - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml deleted file mode 100644 index 27030549c..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - id, super_admin_user_id, deleted, create_time, update_time, create_user_id, update_user_id - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml deleted file mode 100644 index cd50cf28d..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - id, parent_id, code, name, path, sort, remark, deleted, icon, menu_type, env - - - insert into sys_menu - - - parent_id, - - - code, - - - name, - - - path, - - - sort, - - - remark, - - - deleted, - - - icon, - - - menu_type, - - - env, - - - - - #{parentId}, - - - #{code}, - - - #{name}, - - - #{path}, - - - #{sort}, - - - #{remark}, - - - #{deleted}, - - - #{icon}, - - - #{menuType}, - - - #{env}, - - - - - - update sys_menu - - - parent_id = #{record.parentId}, - - - code = #{record.code}, - - - name = #{record.name}, - - - path = #{record.path}, - - - sort = #{record.sort}, - - - remark = #{record.remark}, - - - deleted = #{record.deleted}, - - - icon = #{record.icon}, - - - menu_type = #{record.menuType}, - - - env = #{record.env}, - - - where id = #{record.id} - - - - - - - - - update - sys_menu - set - deleted = '1' - where - id in - - #{item} - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml deleted file mode 100644 index 3fece71b1..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - id, role_id, role_name, role_type, third_unique_id, deleted, create_time, update_time, create_user, - update_user - - - - insert into sys_role - - - role_id, - - - role_name, - - - role_type, - - - third_unique_id, - - - deleted, - - - create_time, - - - update_time, - - - create_user, - - - update_user, - - - - - #{record.roleId}, - - - #{record.roleName}, - - - #{record.roleType}, - - - #{record.thirdUniqueId}, - - - #{record.deleted}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - #{record.createUser}, - - - #{record.updateUser}, - - - ON DUPLICATE KEY UPDATE role_name = values(role_name), deleted = values(deleted) - - - - update sys_role - - - role_id = #{roleId}, - - - role_name = #{roleName}, - - - role_type = #{roleType}, - - - third_unique_id = #{thirdUniqueId}, - - - deleted = #{deleted}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - create_user = #{createUser}, - - - update_user = #{updateUser}, - - - where id = #{id} - - - - update sys_role set deleted = 1 where role_type = #{roleType} and role_id not in - #{roleId} - - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml deleted file mode 100644 index dbab10be3..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMenuMapper.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - id, menu_id, role_id - - - - insert into sys_role_menu - - - menu_id, - - - role_id, - - - - - #{record.menuId}, - - - #{record.roleId}, - - - - - - update sys_role_menu - - - menu_id = #{record.menuId}, - - - role_id = #{record.roleId}, - - - where id = #{record.id} - - - - - - delete from sys_role_menu where role_id=#{roleId} - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/TRTCVideoCallBackMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/TRTCVideoCallBackMapper.xml deleted file mode 100644 index b1c5b7b3e..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/TRTCVideoCallBackMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - UPDATE hy_partner_interview - SET process_info = IF(process_info IS NULL, #{videoUrl}, CONCAT(process_info, ',' ,#{videoUrl})) - WHERE interview_plan_id = ( - SELECT id - FROM hy_partner_interview_plan - WHERE room_id = #{roomId} - ) - - \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml deleted file mode 100644 index f5573a7fc..000000000 --- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time - - - - insert into user_region_mapping - - - region_id, - - - user_id, - - - type, - - - deleted, - - - create_id, - - - create_time, - - - update_id, - - - update_time, - - - - - #{record.regionId}, - - - #{record.userId}, - - - #{record.type}, - - - #{record.deleted}, - - - #{record.createId}, - - - #{record.createTime}, - - - #{record.updateId}, - - - #{record.updateTime}, - - - ON DUPLICATE KEY UPDATE type = values(type), deleted = values(deleted) - - - - update user_region_mapping - - - region_id = #{regionId}, - - - user_id = #{userId}, - - - type = #{type}, - - - deleted = #{deleted}, - - - create_id = #{createId}, - - - create_time = #{createTime}, - - - update_id = #{updateId}, - - - update_time = #{updateTime}, - - - where id = #{id} - - - - update user_region_mapping set deleted = 1 where region_id = #{regionId} and type = #{type} - - and user_id not in #{userId} - - - - - update user_region_mapping set deleted = 1 where user_id = #{userId} and type = #{type} - - and region_id not in #{regionId} - - - - - update user_region_mapping set deleted = 1 where region_id not in #{regionId} - - - - update user_region_mapping set deleted = 1 where user_id not in #{userId} - - - - update user_region_mapping set deleted = 1 where user_id = #{userId} - - - - - - - - - \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreDTO.java deleted file mode 100644 index 1db2380a5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.auth; - - -import lombok.Data; - -import java.util.List; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/12/09 - */ -@Data -public class AuthRegionStoreDTO { - String userId; - private List authRegionStoreUserList; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreUserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreUserDTO.java deleted file mode 100644 index c86f52cb6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/auth/AuthRegionStoreUserDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.dto.auth; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/10/10 - */ -@Data -public class AuthRegionStoreUserDTO { - - private String id; - - /** - * 名称 - */ - private String name; - - /** - * 是否是门店 - */ - @JsonProperty("store_flag") - private Boolean storeFlag ; - - /** - * 权限来源 create-数智门店创建 sync-钉钉同步 - */ - private String source; - - /** - * 门店类型区域对应的 门店id - */ - @JsonProperty("store_id") - private String storeId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserEventDTO.java deleted file mode 100644 index c70265f09..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserEventDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.buser; - -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: UserEventDTO - * @Description: - * @date 2023-06-09 13:53 - */ -@Data -public class UserEventDTO { - - private String eventType; - - private String userId; - - private String openId; - - private String unionId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserPositionAndUserScopeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserPositionAndUserScopeDTO.java deleted file mode 100644 index 74ea3cad7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserPositionAndUserScopeDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.buser; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: UserPositionAndUserScopeDTO - * @Description: 员工角色&获取线索范围 - * @date 2023-06-19 16:33 - */ -@Data -public class UserPositionAndUserScopeDTO { - - @ApiModelProperty("招商经理用户ids") - private List investmentUserIds; - - @ApiModelProperty("开发经理用户ids") - private List developmentUserIds; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserRoleDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserRoleDTO.java deleted file mode 100644 index 3b56aec78..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/buser/UserRoleDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.buser; - -import lombok.Data; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/11/06 - */ -@Data -public class UserRoleDTO { - private String userId; - private String roleName; - private String roleAuth; - private Long roleId; - private Integer priority; - - private String roleEnum; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/CreateCalendarEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/CreateCalendarEventDTO.java deleted file mode 100644 index fe8466aa2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/CreateCalendarEventDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.calendar; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: CreateCalendarEventDTO - * @Description: 创建用户日程到用户主日历 - * @date 2023-06-13 14:09 - */ -@Data -public class CreateCalendarEventDTO { - - @ApiModelProperty("发起人") - private String userId; - - @ApiModelProperty("日程标题") - private String summary; - - @ApiModelProperty("开始时间") - private Long startTime; - - @ApiModelProperty("截止时间") - private Long endTime; - - @ApiModelProperty("参与者") - private List joinUserIds; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/DeleteCalendarEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/DeleteCalendarEventDTO.java deleted file mode 100644 index b3efa6b69..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/DeleteCalendarEventDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.dto.calendar; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: DeleteCalendarEventDTO - * @Description: - * @date 2023-06-13 15:02 - */ -@Data -public class DeleteCalendarEventDTO { - - @ApiModelProperty("发起人id") - private String userId; - - @ApiModelProperty("日历id") - private String calendarId; - - @ApiModelProperty("事件id") - private String eventId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UpdateCalendarEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UpdateCalendarEventDTO.java deleted file mode 100644 index 396c8e656..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UpdateCalendarEventDTO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.dto.calendar; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: CreateCalendarEventDTO - * @Description: 创建用户日程到用户主日历 - * @date 2023-06-13 14:09 - */ -@Data -public class UpdateCalendarEventDTO { - - @ApiModelProperty("发起人id") - private String userId; - - @ApiModelProperty("日历id") - private String calendarId; - - @ApiModelProperty("事件id") - private String eventId; - - @ApiModelProperty("日程标题") - private String summary; - - @ApiModelProperty("开始时间") - private Long startTime; - - @ApiModelProperty("截止时间") - private Long endTime; - - @ApiModelProperty("参与者") - private List joinUserIds; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java deleted file mode 100644 index 832412c9d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserCalendarsEventDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cool.store.dto.calendar; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: UserCalendarsEventVO - * @Description: - * @date 2023-06-13 11:18 - */ -@Data -public class UserCalendarsEventDTO implements Comparable{ - - @ApiModelProperty("日历id") - private String calendarId; - - @ApiModelProperty("日程id") - private String eventId; - - @ApiModelProperty("日程标题") - private String summary; - - @ApiModelProperty("开始时间") - private Long startTime; - - @ApiModelProperty("截止时间") - private Long endTime; - - public UserCalendarsEventDTO(String calendarId, String eventId, String summary, Long startTime, Long endTime) { - this.calendarId = calendarId; - this.eventId = eventId; - this.summary = summary; - this.startTime = startTime; - this.endTime = endTime; - } - - @Override - public int compareTo(UserCalendarsEventDTO other) { - return this.startTime.compareTo(other.getStartTime()); - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserFreeBusyInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserFreeBusyInfoDTO.java deleted file mode 100644 index 72c5b24e9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/calendar/UserFreeBusyInfoDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.calendar; - -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: UserFreeBusyList - * @Description: - * @date 2023-06-13 10:06 - */ -@Data -public class UserFreeBusyInfoDTO { - - private Long startTime; - - private Long endTime; - - public UserFreeBusyInfoDTO(long startTime, long endTime) { - this.startTime = startTime; - this.endTime = endTime; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/call/CallUpDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/call/CallUpDTO.java deleted file mode 100644 index 2fd1a415e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/call/CallUpDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.call; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-08-11 15:24 - * @Description: - */ -@Data -public class CallUpDTO { - private String transNo; - private String outgoingMobile; - private String incomingMobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdParamDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdParamDTO.java deleted file mode 100644 index a2a45695f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdParamDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.common; - -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: IdParamDTO - * @Description: - * @date 2023-08-01 11:16 - */ -@Data -public class IdParamDTO { - - private Long id; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdsParamDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdsParamDTO.java deleted file mode 100644 index 7aadc11c7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/common/IdsParamDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.common; - -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: IdParamDTO - * @Description: - * @date 2023-08-01 11:16 - */ -@Data -public class IdsParamDTO { - - private List ids; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentAddDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentAddDto.java deleted file mode 100644 index 88cfb700c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentAddDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.dto.content; - -import com.cool.store.enums.ContentSubjectEnum; -import com.cool.store.enums.ContentTypeEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ContentAddDto { - - @ApiModelProperty(value = "标题", required = true) - private String contentTitle; - - @ApiModelProperty(value = "状态,0.启用1.禁用", required = true) - private String status; - - @ApiModelProperty(value = "栏目code", required = true) - private ContentSubjectEnum subject; - - @ApiModelProperty(value = "类型", required = true) - private ContentTypeEnum contentType; - - @ApiModelProperty(value = "封面地址", required = true) - private String cover; - - @ApiModelProperty(value = "内容（文字信息或视频地址）", required = true) - private String content; - - @ApiModelProperty(value = "创建用户id", required = true) - private String createUserId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java deleted file mode 100644 index 8458c06ca..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentDelDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.content; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ContentDelDto { - - @ApiModelProperty("动态id") - private String contentId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java deleted file mode 100644 index b3cff95bd..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryDetailDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.content; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ContentQueryDetailDto { - - @ApiModelProperty("动态id") - private String contentId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java deleted file mode 100644 index 64432436a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.dto.content; - -import com.cool.store.common.PageBasicInfo; -import com.cool.store.enums.ContentSubjectEnum; -import com.cool.store.enums.ContentTypeEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Data -public class ContentQueryListDto extends PageBasicInfo { - - @ApiModelProperty("标题") - private String contentTitle; - - @ApiModelProperty("栏目Code") - private ContentSubjectEnum subject; - - @ApiModelProperty("类型，默认选中全部时不传值") - private ContentTypeEnum contentType; - - @ApiModelProperty("筛选开始时间") - private String startTime; - - @ApiModelProperty("筛选结束时间") - private String endTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java deleted file mode 100644 index f0d085ade..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.content; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ContentQueryTitlesDto { - - @ApiModelProperty("用户输入标题") - private String title; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentUpdateDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentUpdateDto.java deleted file mode 100644 index 29d754498..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentUpdateDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cool.store.dto.content; - -import com.cool.store.enums.ContentSubjectEnum; -import com.cool.store.enums.ContentTypeEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class ContentUpdateDto { - - @ApiModelProperty(value = "动态id", required = true) - private String contentId; - - @ApiModelProperty("标题") - private String contentTitle; - - @ApiModelProperty("状态,0.启用1.禁用") - private String status; - - @ApiModelProperty("栏目code") - private ContentSubjectEnum subject; - - @ApiModelProperty("类型") - private ContentTypeEnum contentType; - - @ApiModelProperty("封面地址") - private String cover; - - @ApiModelProperty("内容（文字信息或视频地址）") - private String content; - - @ApiModelProperty(value = "更新用户id", required = true) - private String updateUserId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/DepartmentEventDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/DepartmentEventDTO.java deleted file mode 100644 index bbd88a665..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/DepartmentEventDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.dto.dept; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: DepartmentEventDTO - * @Description: 部门事件 - * @date 2023-06-16 15:30 - */ -@Data -public class DepartmentEventDTO { - - @ApiModelProperty("部门id") - private String departmentId; - - @ApiModelProperty("是否变更父级节点") - private Boolean isChangeParent; - - @ApiModelProperty("事件类型") - private String eventType; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/SyncTreeNode.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/SyncTreeNode.java deleted file mode 100644 index 6db8f7adc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/dept/SyncTreeNode.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.dept; - -import lombok.Data; - -import java.util.List; - -/** - * @author 邵凌志 - * @date 2020/12/2 14:17 - */ -@Data -public class SyncTreeNode { - - private String id; - - private String pid; - - private String name; - - private List child; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AgentInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AgentInfoDTO.java deleted file mode 100644 index c186905e0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AgentInfoDTO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.alibaba.fastjson.annotation.JSONField; - -public class AgentInfoDTO { - - @JSONField(name = "agentid") - private Long agentId; - - @JSONField(name = "appid") - private Long appId; - - @JSONField(name = "auth_mode") - private Integer authMode; - - public Long getAgentId() { - return agentId; - } - - public void setAgentId(Long agentId) { - this.agentId = agentId; - } - - public Long getAppId() { - return appId; - } - - public void setAppId(Long appId) { - this.appId = appId; - } - - public Integer getAuthMode() { - return authMode; - } - - public void setAuthMode(Integer authMode) { - this.authMode = authMode; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthAgentInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthAgentInfoDTO.java deleted file mode 100644 index fc4044aff..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthAgentInfoDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.alibaba.fastjson.annotation.JSONField; - -import java.util.List; - -/** - * 企业标识信息 - */ -public class AuthAgentInfoDTO { - - @JSONField(name = "agent") - private List agentInfos; - - public List getAgentInfos() { - return agentInfos; - } - - public void setAgentInfos(List agentInfos) { - this.agentInfos = agentInfos; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthCorpInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthCorpInfoDTO.java deleted file mode 100644 index 8885b400d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthCorpInfoDTO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * 授权企业信息 - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -@Data -public class AuthCorpInfoDTO { - - @JSONField(name = "corp_logo_url") - private String corpLogoUrl; - - @JSONField(name = "corp_name") - private String corpName; - - private String industry; - - @JSONField(name = "auth_channel") - private String authChannel; - - @JSONField(name = "auth_channel_type") - private String authChannelType; - - @JSONField(name = "is_authenticated") - private boolean isAuthenticated; - - @JSONField(name = "auth_level") - private int authLevel; - - @JSONField(name = "corp_province") - private String corpProvince; - @JSONField(name = "corp_city") - private String corpCity; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthInfoDTO.java deleted file mode 100644 index 88bb956d6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthInfoDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.dto.enterprise; - - -import com.alibaba.fastjson.annotation.JSONField; - -/** - * 企业开通授权信息 - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -public class AuthInfoDTO { - - @JSONField(name = "auth_corp_info") - private AuthCorpInfoDTO authCorpInfo; - - @JSONField(name = "auth_user_info") - private AuthUserInfoDTO authUserInfo; - - @JSONField(name = "auth_info") - private AuthAgentInfoDTO authAgentInfo; - - public AuthCorpInfoDTO getAuthCorpInfo() { - return authCorpInfo; - } - - public void setAuthCorpInfo(AuthCorpInfoDTO authCorpInfo) { - this.authCorpInfo = authCorpInfo; - } - - public AuthUserInfoDTO getAuthUserInfo() { - return authUserInfo; - } - - public void setAuthUserInfo(AuthUserInfoDTO authUserInfo) { - this.authUserInfo = authUserInfo; - } - - public AuthAgentInfoDTO getAuthAgentInfo() { - return authAgentInfo; - } - - public void setAuthAgentInfo(AuthAgentInfoDTO authAgentInfo) { - this.authAgentInfo = authAgentInfo; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthScopeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthScopeDTO.java deleted file mode 100644 index b6b3b6ada..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthScopeDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.dto.enterprise; - -import java.util.List; - -/** - * 钉钉通讯录授权范围 - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -public class AuthScopeDTO { - - /** - * 部门id - */ - private List deptIdList; - /** - * 用户id - */ - private List userIdList; - - public List getDeptIdList() { - return deptIdList; - } - - public void setDeptIdList(List deptIdList) { - this.deptIdList = deptIdList; - } - - public List getUserIdList() { - return userIdList; - } - - public void setUserIdList(List userIdList) { - this.userIdList = userIdList; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthUserInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthUserInfoDTO.java deleted file mode 100644 index f4d868f06..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/AuthUserInfoDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.alibaba.fastjson.annotation.JSONField; - -/** - * 授权用户信息 - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -public class AuthUserInfoDTO { - - @JSONField(name = "userId") - private String userId; - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java deleted file mode 100644 index 9f5aafcb5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.enums.FSEventTypeEnum; -import com.cool.store.enums.UserStatusEnum; -import com.cool.store.utils.UUIDUtils; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import java.io.Serializable; -import java.util.*; - -/** - * - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EnterpriseUserDTO implements Serializable { - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("用户主键id") - private Long id; - - @ApiModelProperty("钉钉用户id") - private String userId; - - @ApiModelProperty("飞书 user_id") - private String feishuUserId; - - @ApiModelProperty("手机号码") - private String mobile; - - @ApiModelProperty("") - private String name; - - @ApiModelProperty("是否是主管理员，0：否，1：是") - private Boolean mainAdmin; - - @ApiModelProperty("是否为企业的管理员, true表示是, false表示不是") - private Boolean isAdmin; - - @ApiModelProperty("员工的电子邮箱") - private String email; - - @ApiModelProperty("在当前isv全局范围内唯一标识一个用户的身份,用户无法修改") - private String unionid; - - @ApiModelProperty("是否号码隐藏, true表示隐藏, false表示不隐藏") - private Boolean isHide; - - @ApiModelProperty("职务") - private String jobTitle; - - @ApiModelProperty("员工的企业邮箱") - private String orgEmail; - - @ApiModelProperty("头像url") - private String avatar; - - @ApiModelProperty("") - private String roles; - - @ApiModelProperty("是否是部门的主管, true表示是, false表示不是") - private Boolean isLeader; - - @ApiModelProperty("用户创建时间") - private Date createTime; - - @ApiModelProperty("第三方OA系统唯一标识") - private String thirdOaUniqueFlag; - - @ApiModelProperty("") - private String orderInDepts; - - @ApiModelProperty("") - private List isLeaderInDepts; - - @ApiModelProperty("") - private String monitoredDepartments; - - @ApiModelProperty("工号") - private String jobnumber; - - private String openUserid; - - @ApiModelProperty("用户所属部门") - private List departmentLists; - - - public static List transUserDtoToDo(List userList, Map regionPathMap, Multimap leaderDeptMap, Multimap roleUserMap) { - if(CollectionUtils.isEmpty(userList)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (EnterpriseUserDTO user : userList) { - EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO(); - enterpriseUserDO.setUserId(user.getUserId()); - enterpriseUserDO.setFeishuUserId(user.getFeishuUserId()); - enterpriseUserDO.setName(user.getName()); - enterpriseUserDO.setRemark(user.getRemark()); - if(StringUtils.isNotBlank(user.getMobile())){ - enterpriseUserDO.setMobile(user.getMobile().replace("+86", "")); - } - enterpriseUserDO.setEmail(user.getEmail()); - enterpriseUserDO.setOrgEmail(user.getOrgEmail()); - enterpriseUserDO.setMainAdmin(user.getMainAdmin()); - enterpriseUserDO.setIsAdmin(user.getIsAdmin()); - enterpriseUserDO.setUnionid(user.getUnionid()); - enterpriseUserDO.setAvatar(user.getAvatar()); - enterpriseUserDO.setJobnumber(user.getJobnumber()); - enterpriseUserDO.setUserStatus(UserStatusEnum.NORMAL.getCode()); - enterpriseUserDO.setIsLeader(Boolean.FALSE); - enterpriseUserDO.setLeaderDeptIds("[]"); - List departmentLists = user.getDepartmentLists(); - List regionPaths = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(departmentLists)){ - for (String departmentId : departmentLists) { - String regionPath = regionPathMap.get(departmentId); - if(StringUtils.isNotBlank(regionPath)){ - regionPaths.add(regionPath); - } - } - } - //挂跟节点 - if(CollectionUtils.isEmpty(regionPaths)){ - regionPaths.add(CommonConstants.ROOT_REGION_PATH); - } - Collection deptIds = leaderDeptMap.get(user.getUserId()); - if(CollectionUtils.isNotEmpty(deptIds)){ - enterpriseUserDO.setIsLeader(Boolean.TRUE); - enterpriseUserDO.setLeaderDeptIds(JSONObject.toJSONString(deptIds)); - } - enterpriseUserDO.setUserRegionIds(JSONObject.toJSONString(regionPaths)); - enterpriseUserDO.setDeleted(Boolean.FALSE); - enterpriseUserDO.setCreateTime(new Date()); - if(StringUtils.isNotBlank(user.getJobTitle())){ - roleUserMap.put(user.getJobTitle(), user.getUserId()); - } - resultList.add(enterpriseUserDO); - } - return resultList; - } - - - public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map regionPathMap, Multimap leaderDeptMap, FSEventTypeEnum eventType) { - EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO(); - enterpriseUserDO.setUserId(user.getUserId()); - enterpriseUserDO.setName(user.getName()); - enterpriseUserDO.setRemark(user.getRemark()); - if(StringUtils.isNotBlank(user.getMobile())){ - enterpriseUserDO.setMobile(user.getMobile().replace("+86", "")); - } - enterpriseUserDO.setEmail(user.getEmail()); - enterpriseUserDO.setOrgEmail(user.getOrgEmail()); - enterpriseUserDO.setMainAdmin(user.getMainAdmin()); - enterpriseUserDO.setIsAdmin(user.getIsAdmin()); - enterpriseUserDO.setUnionid(user.getUnionid()); - enterpriseUserDO.setFeishuUserId(user.getFeishuUserId()); - enterpriseUserDO.setAvatar(user.getAvatar()); - enterpriseUserDO.setJobnumber(user.getJobnumber()); - enterpriseUserDO.setUserStatus(UserStatusEnum.NORMAL.getCode()); - List departmentLists = user.getDepartmentLists(); - List regionPaths = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(departmentLists)){ - for (String departmentId : departmentLists) { - String regionPath = regionPathMap.get(departmentId); - if(StringUtils.isNotBlank(regionPath)){ - regionPaths.add(regionPath); - } - } - } - if(CollectionUtils.isEmpty(regionPaths)){ - regionPaths.add(CommonConstants.ROOT_REGION_PATH); - } - //创建的时候给个默认值 - if(FSEventTypeEnum.USER_CREATED.equals(eventType)){ - enterpriseUserDO.setIsLeader(Boolean.FALSE); - enterpriseUserDO.setLeaderDeptIds("[]"); - } - Collection deptIds = leaderDeptMap.get(user.getUserId()); - if(CollectionUtils.isNotEmpty(deptIds)){ - enterpriseUserDO.setIsLeader(Boolean.TRUE); - enterpriseUserDO.setLeaderDeptIds(JSONObject.toJSONString(deptIds)); - } - enterpriseUserDO.setUserRegionIds(JSONObject.toJSONString(regionPaths)); - enterpriseUserDO.setDeleted(Boolean.FALSE); - enterpriseUserDO.setCreateTime(new Date()); - return enterpriseUserDO; - } - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserRole.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserRole.java deleted file mode 100644 index abc1cf8b1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserRole.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.dto.enterprise; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @ClassName EnterpriseUserRole - * @Description 用一句话描述什么 - * @author 首亮 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class EnterpriseUserRole { - private Long id; - private String roleId; - private String userId; - - //创建时间 - private Date createTime; - //更新时间 - public EnterpriseUserRole(String roleId, String userId) { - this.roleId = roleId; - this.userId = userId; - this.createTime = new Date(); - } - - private Date updateTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/QueryDeptChildDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/QueryDeptChildDTO.java deleted file mode 100644 index 92006bcc1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/QueryDeptChildDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.enterprise; - -import lombok.Data; - -/** - * @author 邵凌志 - * @date 2020/12/9 16:29 - */ -@Data -public class QueryDeptChildDTO { - - private String id; - - private String parentId; - - private String name; - /** - * 部门次序 - */ - private Integer departOrder; - - private String path; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java deleted file mode 100644 index 67ea3fc1b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.cool.store.dto.enterprise; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.RegionDO; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @ClassName SysDepartmentDO - * @Description - * @author 王春辉 - */ -@Data -public class SysDepartmentDTO { - /** - * 部门id - */ - private String id; - - /** - * 部门名称 - */ - private String name; - - /** - * 父部门id，根部门为1 - */ - private String parentId; - - /** - * 在父部门中的次序值 - */ - private Integer departOrder; - - /** - * 是否同步创建一个关联此部门的企业群, true表示是, false表示不是 - */ - private Boolean createDeptGroup; - - /** - * 当群已经创建后，是否有新人加入部门会自动加入该群, true表示是, false表示不是 - */ - private Boolean autoAddUser; - - /** - * 是否隐藏部门, true表示隐藏, false表示显示 - */ - private Boolean depHiding; - - /** - * 可以查看指定隐藏部门的其他部门列表，如果部门隐藏，则此值生效，取值为其他的部门id组成的的字符串，使用|符号进行分割 - */ - private String deptPerimits; - - /** - * 可以查看指定隐藏部门的其他人员列表，如果部门隐藏，则此值生效，取值为其他的人员userid组成的的字符串，使用|符号进行分割 - */ - private String userPerimits; - - /** - * 是否本部门的员工仅可见员工自己, 为true时，本部门员工默认只能看到员工自己 - */ - private Boolean outerDept; - - /** - * 本部门的员工仅可见员工自己为true时，可以配置额外可见部门，值为部门id组成的的字符串，使用|符号进行分割 - */ - private String outerPermitDepts; - - /** - * 本部门的员工仅可见员工自己为true时，可以配置额外可见人员，值为userid组成的的字符串，使用| 符号进行分割 - */ - private String outerPermitUsers; - - /** - * 企业群群主 - */ - private String orgDeptOwner; - - /** - * 部门的主管列表,取值为由主管的userid组成的字符串，不同的userid使用|符号进行分割 - */ - private List deptManagerUseridList; - - - /** - * 该部门下所有的用户数，包括子部门 - */ - private Integer userCount; - - /** - * 部门下所有未激活的用户数，包括子部门 - */ - private Integer unactiveUserCount; - - /** - * 父级部门ids - */ - private String parentIds; - - /** - * 子部门ids - */ - private String subIds; - - private String leaderUserId; - - - public SysDepartmentDTO() { - - } - - /** - * 构造函数 - * - * @param nodeId 节点Id - */ - public SysDepartmentDTO(String nodeId) { - this.id = nodeId; - } - - /** - * 构造函数 - * - * @param nodeId 节点Id - * @param parentId 父节点Id - */ - - public SysDepartmentDTO(String nodeId, String parentId) { - this.id = nodeId; - this.parentId = parentId; - } - - - /** - * 设置部门名称 - * - * @param name 部门名称 - */ - public void setName(String name) { - if (StringUtils.isNotBlank(name)) { - this.name = name.replaceAll("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]", ""); - if (StringUtils.isBlank(this.name)) { - this.name = "空"; - } - } - } - - /** - * 获取父部门id，根部门为1 - * - * @return parent_id - 父部门id，根部门为1 - */ - public String getParentId() { - if (id.equals(CommonConstants.ROOT_DEPT_ID_STR)) { - return null; - } - return parentId; - } - - @Override - public String toString() { - return "SysDepartment{" + - "id=" + id + - ", parentId=" + parentId + ",name='" + name + '\'' + - '}'; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - SysDepartmentDTO that = (SysDepartmentDTO) o; - return Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return Objects.hash(id); - } - - public static List convertRegionDO(List departmentList, Multimap leaderDeptMap){ - if(CollectionUtils.isEmpty(departmentList)){ - return Lists.newArrayList(); - } - Map parentMap = departmentList.stream().collect(Collectors.toMap(SysDepartmentDTO::getId, SysDepartmentDTO::getParentId)); - List resultList = new ArrayList<>(); - for (SysDepartmentDTO dept : departmentList) { - RegionDO region = new RegionDO(); - region.setRegionId(dept.getId()); - region.setName(dept.getName()); - region.setParentId(dept.getParentId()); - region.setUnclassifiedFlag(CommonConstants.ZERO); - region.setLeaderUserId(dept.getLeaderUserId()); - region.setOrderNum(dept.getDepartOrder()); - region.setThirdDeptId(dept.getId()); - region.setCreateTime(new Date()); - region.setUpdateTime(new Date()); - List pathIds = new ArrayList<>(); - pathIds.add(region.getRegionId()); - String parentId = parentMap.get(region.getRegionId()); - while (Objects.nonNull(parentId)){ - pathIds.add(parentId); - parentId = parentMap.get(parentId); - } - Collections.reverse(pathIds); - String regionPath = CommonConstants.PATH_SPILT + String.join(CommonConstants.PATH_SPILT, pathIds) + CommonConstants.PATH_SPILT; - region.setRegionPath(regionPath); - region.setDeleted(Boolean.FALSE); - if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){ - for (String leader : dept.getDeptManagerUseridList()) { - leaderDeptMap.put(leader, dept.getId()); - } - } - resultList.add(region); - } - return resultList; - } - - - public static RegionDO convertRegionDO(SysDepartmentDTO dept, Multimap leaderDeptMap, RegionDO parentRegion){ - RegionDO region = new RegionDO(); - region.setRegionId(dept.getId()); - region.setName(dept.getName()); - region.setParentId(dept.getParentId()); - region.setUnclassifiedFlag(CommonConstants.ZERO); - region.setLeaderUserId(dept.getLeaderUserId()); - region.setOrderNum(dept.getDepartOrder()); - region.setThirdDeptId(dept.getId()); - region.setCreateTime(new Date()); - region.setUpdateTime(new Date()); - String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT; - region.setRegionPath(regionPath); - region.setDeleted(Boolean.FALSE); - if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){ - for (String leader : dept.getDeptManagerUseridList()) { - leaderDeptMap.put(leader, dept.getId()); - } - } - return region; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/CollaboratorDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/CollaboratorDTO.java deleted file mode 100644 index ea6a58872..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/CollaboratorDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:30 - * @Version 1.0 - */ -@Data -public class CollaboratorDTO { - - private String collaborateId; - - private String collaborateName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java deleted file mode 100644 index cf7d6abfd..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:33 - * @Version 1.0 - */ -@Data -public class ExhibitionDTO { - - private String exhibitionName; - - private String location; - - private String startDate; - - private Integer id; - - private Date closeTime; - - private Integer exhibitionGroupId; - - private String collaboratorStr; - - private String creator; - - private Integer closedType; - - private List collaborators; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionEnterInterviewDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionEnterInterviewDTO.java deleted file mode 100644 index ae9065c86..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionEnterInterviewDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.exhibition; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/11/30 15:03 - * @version 1.0 - */ -@Data -public class ExhibitionEnterInterviewDTO { - - @ApiModelProperty("线索id") - private String partnerLineId; - - @ApiModelProperty("会销id") - private Integer exhibitionId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionGroupDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionGroupDTO.java deleted file mode 100644 index 0b06e3b01..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionGroupDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:57 - * @Version 1.0 - */ -@Data -public class ExhibitionGroupDTO { - - private Integer exhibitionGroupId; - - private String exhibitionGroupName; - - private List exhibitionList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java deleted file mode 100644 index b98f38f1e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.dto.exhibition; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2024/1/4 17:09 - * @version 1.0 - */ -@Data -public class ExhibitionInterviewInfoDTO { - - @ApiModelProperty("相关的会销面试发起人 userId") - private String userId; - - @ApiModelProperty("相关的会销面试发起人姓名") - private String exhibitionInterviewerName; - - @ApiModelProperty("相关的会销面试发起人手机号") - private String exhibitionInterviewerMobile; - - @ApiModelProperty("会销面试计划 id") - private String exhibitionInterviewPlanId; - - @ApiModelProperty("会销面试发起时间") - private String exhibitionInterviewTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineBaseDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineBaseDTO.java deleted file mode 100644 index 2100078ff..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineBaseDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/8 16:56 - * @Version 1.0 - */ -@Data -public class ExhibitionLineBaseDTO { - - - private String partnerName; - - private String mobile; - - private String partnerId; - - private Integer participationStatus; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java deleted file mode 100644 index c1e034d47..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/6 17:13 - * @Version 1.0 - */ -@Data -public class ExhibitionLineDTO { - - private String partnerId; - - private String partnerName; - - private String mobile; - - private String exhibitionId; - - private Long lineId; - - private Integer wantShopArea; - - private String wantShopAreaName; - - private Integer participationStatus; - - private String channelName; - - private Integer id; - - private Long planId; - - private Integer expectedVisitorsCount; - - private String expectedInformation; - - private String customerManager; - - private Integer channelId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java deleted file mode 100644 index f647f0429..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/5 16:53 - * @Version 1.0 - */ -@Data -public class ExhibitionStatisticsDTO { - - /** - * 展会code - */ - private Integer exhibitionId; - - /** - * 报名人数 - */ - private Integer signUpCount; - - /** - * 签到人数 - */ - private Integer checkInCount; - - /** - * - * 意向申请填写人数 - */ - private Integer formFillCount; - - /** - * 面试人数 - */ - private Integer interviewCount; - - public ExhibitionStatisticsDTO(){ - this.checkInCount = 0; - this.signUpCount = 0; - this.formFillCount = 0; - this.interviewCount = 0; - } - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/MyExhibitionGroupDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/MyExhibitionGroupDTO.java deleted file mode 100644 index 8d68bdbdc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/MyExhibitionGroupDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/5 20:16 - * @Version 1.0 - */ -@Data -public class MyExhibitionGroupDTO { - - /** - * 会销组名称 - */ - private String exhibitionGroupName; - - /** - * 会销组ID - */ - private Integer id; - - /** - * 创建人ID - */ - private String createId; - - /** - * 创建人名称 - */ - private String createName; - - /** - * 创建人手机号 - */ - private String mobile; - - /** - * 是否结束 - */ - private Integer closed; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java deleted file mode 100644 index 67346935c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/13 13:25 - * @Version 1.0 - */ -@Data -public class PartnerSignUpDTO { - - private Long lineId; - - private Integer count; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/SignUpExhibitionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/SignUpExhibitionDTO.java deleted file mode 100644 index 3c6d70340..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/SignUpExhibitionDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.dto.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/11 11:11 - * @Version 1.0 - */ -@Data -public class SignUpExhibitionDTO { - - private String partnerName; - - private String mobile; - - private String wantShopArea; - - private String intendedAccountManager; - - private Integer exhibitionId; - - private Integer expectedVisitorsCount; - - private String expectedInformation; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/follow/FollowTaskNumDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/follow/FollowTaskNumDTO.java deleted file mode 100644 index fe0db2757..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/follow/FollowTaskNumDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cool.store.dto.follow; - -import com.cool.store.constants.MessageConstants; -import com.cool.store.utils.StringUtil; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.text.MessageFormat; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskNumDTO - * @Description: - * @date 2023-08-14 16:01 - */ -@Data -public class FollowTaskNumDTO { - - @ApiModelProperty("任务跟进人id") - private String followUserId; - - @ApiModelProperty("未完成数量") - private Integer todoNum; - - @ApiModelProperty("逾期数量") - private Integer overdueNum; - - public static String getMessageContent(FollowTaskNumDTO followTask){ - if(followTask.getTodoNum() > 0 && followTask.getOverdueNum() > 0){ - return MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT_1, followTask.getTodoNum(), followTask.getOverdueNum()); - } - if(followTask.getTodoNum() == 0 && followTask.getOverdueNum() > 0){ - return MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT_2, followTask.getOverdueNum()); - } - if(followTask.getTodoNum() > 0 && followTask.getOverdueNum() == 0){ - return MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT_3, followTask.getTodoNum()); - } - return StringUtil.EMPTY; - } - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java deleted file mode 100644 index 8e960b269..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.dto.inspection.interview; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author Fun Li - * @version 1.0 - * @date 2023/7/19 17:47 - */ -@Data -public class InspectionRevocationDTO { - - @ApiModelProperty("稽核信息Id") - private Long inspectionId; - - @ApiModelProperty("操作说明") - private String description; - - @ApiModelProperty("多凭证文件链接集合") - private List files; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java deleted file mode 100644 index 398bd3741..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.dto.inspection.interview; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author Fun Li - * @version 1.0 - * @date 2023/7/19 17:05 - */ -@Data -public class InspectionSubmissionDTO { - - @ApiModelProperty(value = "稽核信息表id", required = true) - private Long inspectionId; - - @ApiModelProperty(value = "是否合格，0为不合格，1为合格", required = true) - private Integer whetherPass; - - @ApiModelProperty("稽核说明，仅当不合格时为必传项") - private String description; - - @ApiModelProperty("稽核多凭证文件链接") - private List files; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java deleted file mode 100644 index 565a7028f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/AddInspectionSettingDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.dto.inspection.setting; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: AddInspectionSettingDTO - * @Description: 新增稽核区域设置 - * @date 2023-07-17 14:40 - */ -@Data -public class AddInspectionSettingDTO { - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("稽核人id") - private String inspectionUserId; - - @ApiModelProperty("归属地ids") - private List openAreaMappingIds; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/CheckInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/CheckInspectionSettingDTO.java deleted file mode 100644 index cec1e1d22..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/CheckInspectionSettingDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.inspection.setting; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: DeleteInspectionSettingDTO - * @Description: 删除稽核区域设置 - * @date 2023-07-17 14:41 - */ -@Data -public class CheckInspectionSettingDTO { - - @ApiModelProperty("id") - private Long inspectionSettingId; - - @ApiModelProperty("归属地ids") - private List openAreaMappingIds; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java deleted file mode 100644 index c17c18a4c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/DeleteInspectionSettingDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.inspection.setting; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: DeleteInspectionSettingDTO - * @Description: 删除稽核区域设置 - * @date 2023-07-17 14:41 - */ -@Data -public class DeleteInspectionSettingDTO { - - @ApiModelProperty("id") - private Long inspectionSettingId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java deleted file mode 100644 index e2e130b08..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/setting/UpdateInspectionSettingDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.dto.inspection.setting; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: UpdateInspectionSettingDTO - * @Description: 更新稽核区域设置 - * @date 2023-07-17 14:41 - */ -@Data -public class UpdateInspectionSettingDTO { - - @ApiModelProperty("id") - private Long inspectionSettingId; - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("稽核人id") - private String inspectionUserId; - - @ApiModelProperty("归属地ids") - private List openAreaMappingIds; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelAddDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelAddDTO.java deleted file mode 100644 index 2f3bda9d8..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelAddDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/10 15:55 - * @version 1.0 - */ -@Data -public class LabelAddDTO { - - @ApiModelProperty(value = "标签名称", required = true) - private String labelName; - - @ApiModelProperty(value = "标签组id", required = true) - private Long labelGroupId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelDeleteDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelDeleteDTO.java deleted file mode 100644 index a7ce64ffc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelDeleteDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/10 16:43 - * @version 1.0 - */ -@Data -public class LabelDeleteDTO { - - @ApiModelProperty(value = "标签id", required = true) - private Long id; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupAddDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupAddDTO.java deleted file mode 100644 index c1bb425b4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupAddDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author Fun Li 2023/8/10 13:28 - * @version 1.0 - */ -@Data -public class LabelGroupAddDTO { - - @ApiModelProperty(value = "标签组名称", required = true) - private @NotBlank(message = "镖标签组名称不能为空") - String labelGroupName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupDeleteDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupDeleteDTO.java deleted file mode 100644 index c0506da42..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupDeleteDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/10 13:29 - * @version 1.0 - */ -@Data -public class LabelGroupDeleteDTO { - - @ApiModelProperty("id") - private Long id; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupListDTO.java deleted file mode 100644 index beb94ff57..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupListDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.label; - -import com.cool.store.common.PageBasicInfo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author Fun Li 2023/8/10 13:29 - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LabelGroupListDTO extends PageBasicInfo { - - @ApiModelProperty(value = "标签组名称", required = false) - private String labelGroupName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupUpdateDTO.java deleted file mode 100644 index a3a19c9d7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelGroupUpdateDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author Fun Li 2023/8/10 13:30 - * @version 1.0 - */ -@Data -public class LabelGroupUpdateDTO { - - @ApiModelProperty(value = "id", required = true) - private Long id; - - @ApiModelProperty(value = "标签组名称", required = true) - private @NotBlank(message = "标签组名称不能为空") - String labelGroupName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelListDTO.java deleted file mode 100644 index a4668055b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelListDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.label; - -import com.cool.store.common.PageBasicInfo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author Fun Li 2023/8/10 14:46 - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class LabelListDTO extends PageBasicInfo { - - @ApiModelProperty(value = "标签名称") - private String labelName; - - @ApiModelProperty(value = "标签组id") - private Long labelGroupId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelUpdateDTO.java deleted file mode 100644 index 1a50d8f92..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/label/LabelUpdateDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.label; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/10 16:03 - * @version 1.0 - */ -@Data -public class LabelUpdateDTO { - - @ApiModelProperty(value = "标签id", required = true) - private Long id; - - @ApiModelProperty(value = "标签名称", required = true) - private String labelName; - - @ApiModelProperty(value = "标签组id", required = true) - private Long labelGroupId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AddTagsDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AddTagsDTO.java deleted file mode 100644 index fa6039957..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AddTagsDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/7/4 10:05 - * @Version 1.0 - */ -@Data -@Builder -public class AddTagsDTO { - - private String operateTime; - - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private List addLabels; - - private List removeLabels; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AllocationInvestmentManagerLogDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AllocationInvestmentManagerLogDTO.java deleted file mode 100644 index c65626221..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AllocationInvestmentManagerLogDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/27 15:52 - * @Version 1.0 - */ -@Data -@Builder -public class AllocationInvestmentManagerLogDTO { - - private String allocationUserId; - - private String allocationUsername; - - private String mobile; - - private String operateTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ApproveAppointmentDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ApproveAppointmentDTO.java deleted file mode 100644 index 48912a129..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ApproveAppointmentDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @author Fun Li 2023/12/12 15:48 - * @version 1.0 - */ -@Data -@Builder -public class ApproveAppointmentDTO { - - private String operateTime; - - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private String rawInterviewDateTime; - - private String interviewPlanId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java deleted file mode 100644 index e45e6fdf0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/AutoOpenInterviewRoomDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @author Fun Li 2023/12/12 17:53 - * @version 1.0 - */ -@Data -@Builder -public class AutoOpenInterviewRoomDTO { - - private String operateTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/BlackListLogDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/BlackListLogDTO.java deleted file mode 100644 index 986b0c06e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/BlackListLogDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/27 16:51 - * @Version 1.0 - */ -@Data -@Builder -public class BlackListLogDTO { - - - private String operateTime; - - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private String reason; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CallUpLogDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CallUpLogDTO.java deleted file mode 100644 index d120f80b5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CallUpLogDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.log; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-08-16 11:41 - * @Description: - */ -@Data -@SuperBuilder -public class CallUpLogDTO extends LogBasicDTO{ - private String transNo; - private String incomingUserId; - private String incomingUserName; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CloseOrPassFollowLogDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CloseOrPassFollowLogDTO.java deleted file mode 100644 index cdc669963..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CloseOrPassFollowLogDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/27 19:46 - * @Version 1.0 - */ -@Data -@Builder -public class CloseOrPassFollowLogDTO { - - private String operateTime; - - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private String passReason; - - private String certifyFile; - - private String rejectPublicReason; - - private String rejectRealReason; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CreateQualifyVerifyDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CreateQualifyVerifyDTO.java deleted file mode 100644 index 183120a54..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/CreateQualifyVerifyDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:54 - * @Description: - */ -@Data -@SuperBuilder -public class CreateQualifyVerifyDTO extends LogBasicDTO{ - private String summary; - private String qualiVerifyContent; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/EntrustOthersDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/EntrustOthersDTO.java deleted file mode 100644 index ef66954fc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/EntrustOthersDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:31 - * @Description: - */ -@Data -@SuperBuilder -public class EntrustOthersDTO extends LogBasicDTO{ - private String beforeInterviwerName; - private String beforeInterviwerMobile; - private String afterInterviwerName; - private String afterInterviwerMobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java deleted file mode 100644 index c5349d800..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LineLogInfo.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.cool.store.dto.log; - -import com.alibaba.fastjson.JSONObject; -import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; -import com.cool.store.entity.HyPartnerTaskInfoLogDO; -import com.cool.store.enums.OperateLogFieldValueEnum; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowStatusEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - -import java.util.*; - -/** - * @author zhangchenbiao - * @FileName: LineLogInfo - * @Description: - * @date 2023-06-27 13:44 - */ -@Slf4j -@Data -public class LineLogInfo { - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - - @ApiModelProperty("操作人id") - private String operateUserId; - - @ApiModelProperty("操作人姓名") - private String operateUsername; - - @ApiModelProperty("操作类型") - private OperateTypeEnum operateType; - - @ApiModelProperty("流程阶段：意向申请审核、预约面试时间、加盟资格面试、分配选址开发经理、商圈点位评估、上传店铺租赁信息、完善加盟签约信息、支付加盟费用、签订加盟合同") - private WorkflowStageEnum workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("备注") - private String message; - - @ApiModelProperty("数据处理字段") - private T data; - - public LineLogInfo(){ - - } - public LineLogInfo(String partnerId, Long partnerLineId, String operateUserId, String operateUsername, - OperateTypeEnum operateType, WorkflowStageEnum workflowStage, - String workflowStatus, String message) { - this.partnerId = partnerId; - this.partnerLineId = partnerLineId; - this.operateUserId = operateUserId; - this.operateUsername = operateUsername; - this.operateType = operateType; - this.workflowStage = workflowStage; - this.workflowStatus = workflowStatus; - this.message = message; - } - - public static boolean checkParams(LineLogInfo params){ - //部分操作没有操作人，这里不再校验操作人 - if(StringUtils.isAnyBlank(params.getPartnerId())){ - log.info("lineLogInfo string:{}", JSONObject.toJSONString(params)); - return false; - } - if(Objects.isNull(params.getOperateType()) || Objects.isNull(params.getWorkflowStage()) || Objects.isNull(params.getWorkflowStatus())){ - log.info("lineLogInfo enum is null:{}", JSONObject.toJSONString(params)); - return false; - } - return true; - } - - public static HyPartnerTaskInfoLogDO convertDO(LineLogInfo params){ - OperateTypeEnum operateType = params.getOperateType(); - HyPartnerTaskInfoLogDO result = new HyPartnerTaskInfoLogDO(); - result.setPartnerId(params.getPartnerId()); - result.setPartnerLineId(params.getPartnerLineId()); - result.setOperateType(params.getOperateType().getCode()); - result.setWorkflowStage(params.getWorkflowStage().getCode()); - result.setWorkflowStatus(params.getWorkflowStatus()); - result.setOperateUserId(params.getOperateUserId()); - result.setOperateUsername(params.getOperateUsername()); - result.setMessage(params.getMessage()); - result.setCreateTime(new Date()); - result.setUpdateTime(new Date()); - Object data = params.getData(); - JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data)); - List filedList = operateType.getFiledList(); - List> fieldMapList = new ArrayList<>(); - for (OperateLogFieldValueEnum field : filedList) { - Map fieldMap = new HashMap<>(); - if(jsonObject.get(field.getCode())==null){ - continue; - } - fieldMap.put("code",field.getCode()); - fieldMap.put("name",field.getName()); - fieldMap.put("value",jsonObject.get(field.getCode())); - fieldMapList.add(fieldMap); - } - result.setFieldCopy(JSONObject.toJSONString(fieldMapList)); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogBasicDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogBasicDTO.java deleted file mode 100644 index e40242f56..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogBasicDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-06-27 23:00 - * @Description: - */ -@Data -@SuperBuilder -public class LogBasicDTO { - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private String operateTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogFieldDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogFieldDTO.java deleted file mode 100644 index f6982c254..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/LogFieldDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-28 15:32 - * @Description: - */ -@Data -public class LogFieldDTO { - private String code; - private String name; - private String value; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ModifyInterviewTimeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ModifyInterviewTimeDTO.java deleted file mode 100644 index c78613219..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ModifyInterviewTimeDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:23 - * @Description: - */ -@Data -@SuperBuilder -public class ModifyInterviewTimeDTO extends LogBasicDTO{ - private String beforeInterviewTime; - private String afterInterviewTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ReInterviewDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ReInterviewDTO.java deleted file mode 100644 index 71d560ec0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/ReInterviewDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; -import lombok.experimental.SuperBuilder; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:43 - * @Description: - */ -@Data -@SuperBuilder -public class ReInterviewDTO extends LogBasicDTO{ - private String rejectRealReason; - private String certifyFile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/RejectInterviewDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/RejectInterviewDTO.java deleted file mode 100644 index bbea1d415..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/RejectInterviewDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:43 - * @Description: - */ -@Data -@SuperBuilder -public class RejectInterviewDTO extends LogBasicDTO{ - private List certifyFile; - - private String rejectPublicReason; - - private String rejectRealReason; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/TransferInvestmentManagerLogDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/TransferInvestmentManagerLogDTO.java deleted file mode 100644 index ab3299ea6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/TransferInvestmentManagerLogDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Builder; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/27 20:20 - * @Version 1.0 - */ -@Data -@Builder -public class TransferInvestmentManagerLogDTO { - - private String operateTime; - - private String operateUsername; - - private String operateUserId; - - private String mobile; - - private String beforeInvestmentManagerUsername; - - private String beforeInvestmentManagerMobile; - - private String afterInvestmentManagerUsername; - - private String afterInvestmentManagerMobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/UserInfoUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/UserInfoUpdateDTO.java deleted file mode 100644 index ca6500985..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/UserInfoUpdateDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @Author: wxp - * @Date: 2023-06-30 10:23 - * @Description: - */ -@Data -@SuperBuilder -public class UserInfoUpdateDTO extends LogBasicDTO{ - private UserInfoUpdate beforeUserinfoUpdate; - private UserInfoUpdate afterUserinfoUpdate; - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class UserInfoUpdate{ - private String username; - private String mobile; - private String liveArea; - private String wantShopArea; - private Integer acceptAdjustType; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java deleted file mode 100644 index 5bc8267dd..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.cool.store.dto.log; - -import lombok.Data; -import lombok.experimental.SuperBuilder; - -import java.util.Date; -import java.util.List; - -/** - * @Author: wxp - * @Date: 2023-06-30 10:23 - * @Description: - */ -@Data -@SuperBuilder -public class WantInfoUpdateDTO extends LogBasicDTO{ - - private BaseInfoUpdate beforeBaseInfoUpdate; - private BaseInfoUpdate afterBaseInfoUpdate; - - private IntentInfoUpdate beforeIntentInfoUpdate; - private IntentInfoUpdate afterIntentInfoUpdate; - - private List beforeClerkUpdate; - private List afterClerkUpdate; - - @Data - public static class BaseInfoUpdate{ - private Long id; - private String partnerId; - private Long partnerLineId; - private String mobile; - private String username; - private Integer sex; - private String nation; - private Date birthdate; - private String idCard; - private String idCardPhotoFront; - private String idCardPhotoBlack; - private String liveAddress; - private String userPortrait; - private Integer status; - private String latestLogMessage; - private String passReason; - private String certifyFile; - private Date passTime; - private String passUserId; - } - - @Data - public static class IntentInfoUpdate{ - private Long id; - private String partnerId; - private Long partnerLineId; - private String liveArea; - private String wantShopArea; - private Integer acceptAdjustType; - private Integer isHaveWantShop; - private String wantShopInfo; - private String maxBudget; - private String moneySource; - private String moneyProve; - private String education; - private String workYear; - private Integer isHaveWorkExp; - private String workExp; - private Integer isConsumer; - private String otherBand; - private String brandStrength; - private String needImprove; - private String strength; - private String weakness; - private String passCause; - private Date passTime; - private String passUser; - private String passCertifyFile; - } - - @Data - public static class ClerkUpdate{ - private Long id; - private Long partnerLineId; - private String partnerId; - private String username; - private String relationship; - private Integer age; - private String chooseReason; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/FeiShuLoginDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/FeiShuLoginDTO.java deleted file mode 100644 index 00c15fda9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/FeiShuLoginDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.login; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: FeiShuLoginDTO - * @Description: - * @date 2023-05-19 19:25 - */ -@Data -public class FeiShuLoginDTO { - - @ApiModelProperty("code") - private String code; - - @ApiModelProperty("应用id") - private String appId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserIdInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserIdInfoDTO.java deleted file mode 100644 index 4cfe3f283..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/login/UserIdInfoDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.dto.login; - -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: UserIdInfoDTO - * @Description: - * @date 2023-05-29 10:58 - */ -@Data -public class UserIdInfoDTO { - - private String openId; - - private String unionId; - - private String userId; - - public UserIdInfoDTO(String openId, String unionId, String userId) { - this.openId = openId; - this.unionId = unionId; - this.userId = userId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AccessTokenDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AccessTokenDTO.java deleted file mode 100644 index 661d936d2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AccessTokenDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.dto.mdm; - -/** - * @Author: young.yu - * @Date: 2023-06-15 13:35 - * @Description: - */ -public class AccessTokenDTO { - private Long expiresIn; - private String accessToken; - - public Long getExpiresIn() { - return expiresIn; - } - - public void setExpiresIn(Long expiresIn) { - this.expiresIn = expiresIn; - } - - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java deleted file mode 100644 index bbf1078bc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/AreaSonDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.mdm; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class AreaSonDTO { - - @ApiModelProperty("父级code") - private String code; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/CallbackDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/CallbackDto.java deleted file mode 100644 index 54cba17a6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/mdm/CallbackDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.dto.mdm; - -import lombok.Data; - - -@Data -public class CallbackDto { -// -// private Owner owner; -// -// private long modifiedTime; -// -// private Creator creator; -// -// private CreatorDepartment creatorDepartment; -// -// private String authCode; -// -// private Modifier modifier; -// -// private int amtDeposit; -// -// private FraSource fraSource; -// -// private String intendedSignerTel; -// -// private String sequenceNo; -// -// private String sequenceStatus; -// -// private String instanceId; -// -// private OwnerDepartment ownerDepartment; -// -// private SelfObject selfObject; -// -// private String name; -// -// private long createdTime; -// -// private String id; -// -// private long intendedSignDate; -// -// private String intendedSigner; -// -// private String systemsource; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java deleted file mode 100644 index 691a72ce7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.dto.menu; - - -import com.cool.store.entity.SysMenuDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.MenuTypeEnum; -import com.cool.store.exception.ServiceException; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - - -@Data -public class AddMenuDTO { - - @NotBlank(message = "名称不能为空") - private String name; - - @JsonProperty("parent_id") - @NotNull(message = "父Id不能为空") - private Long parentId; - - @NotBlank(message = "地址不能为空") - private String path; - - private String component; - - private String target; - - private String icon; - - private String env; - - private String code; - - public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){ - SysMenuDO sysMenuDO = new SysMenuDO(); - sysMenuDO.setParentId(param.getParentId()); - sysMenuDO.setName(param.getName()); - sysMenuDO.setCode(param.getCode()); - sysMenuDO.setPath(param.getPath()); - sysMenuDO.setIcon(param.getIcon()); - sysMenuDO.setMenuType(menuTypeEnum.getCode()); - return sysMenuDO; - } - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/RemindInterviewMsgDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/message/RemindInterviewMsgDTO.java deleted file mode 100644 index 8191c1ecd..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/RemindInterviewMsgDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.message; - -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-30 11:02 - * @Description: - */ -@Data -public class RemindInterviewMsgDTO { - private String partnerId; - private String interviewerId; - private String partnerName; - private String partnerMobile; - private String startTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java deleted file mode 100644 index 0989766f2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/message/SendCardMessageDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.message; - -import com.cool.store.enums.FeiShuNoticeMsgEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: SendCardMessageDTO - * @Description:发送卡片消息 - * @date 2023-06-15 11:05 - */ -@Data -public class SendCardMessageDTO { - - @ApiModelProperty("消息接收人") - private List userIds; - - @ApiModelProperty("消息链接") - private String messageUrl; - - @ApiModelProperty("消息标题") - private String title; - - @ApiModelProperty("消息内容") - private String content; - - @ApiModelProperty("消息类型, FeiShuNoticeMsgEnum") - private FeiShuNoticeMsgEnum messageType; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/AddNumberDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/AddNumberDTO.java deleted file mode 100644 index da99c51fb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/AddNumberDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.outbound; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/9 17:44 - * @version 1.0 - */ -@Data -public class AddNumberDTO { - - @ApiModelProperty("11位外呼号码") - private String outboundNumber; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/DeleteNumberDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/DeleteNumberDTO.java deleted file mode 100644 index 4518e687e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/DeleteNumberDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.dto.outbound; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/9 18:38 - * @version 1.0 - */ -@Data -public class DeleteNumberDTO { - - @ApiModelProperty("id") - private Long id; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/OutboundListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/OutboundListDTO.java deleted file mode 100644 index 6038b337e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/OutboundListDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cool.store.dto.outbound; - -import com.cool.store.common.PageBasicInfo; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @author Fun Li 2023/8/9 15:49 - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class OutboundListDTO extends PageBasicInfo { -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/UpdateNumberDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/UpdateNumberDTO.java deleted file mode 100644 index 373466d3a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/outbound/UpdateNumberDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.outbound; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/8/9 18:05 - * @version 1.0 - */ -@Data -public class UpdateNumberDTO { - - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("11位外呼号码") - private String newOutboundNumber; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/AdvanceLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/AdvanceLineDTO.java deleted file mode 100644 index 139e320c4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/AdvanceLineDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/7/5 15:52 - * @Version 1.0 - */ -@Data -public class AdvanceLineDTO { - - - private String date; - - private Integer count; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ApplyReservationProvinceDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ApplyReservationProvinceDTO.java deleted file mode 100644 index fd32b7f5f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ApplyReservationProvinceDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/7 17:27 - * @Version 1.0 - */ -@Data -public class ApplyReservationProvinceDTO { - - private String areaName; - - private Integer applyCount; - - private Integer reservationCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/DescribePhoneNumberDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/DescribePhoneNumberDTO.java deleted file mode 100644 index 5ca976af0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/DescribePhoneNumberDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: DescribePhoneNumberDTO - * @Description:手机号归属 - * @date 2023-06-15 20:07 - */ -@Data -public class DescribePhoneNumberDTO { - - @ApiModelProperty("基础运营商") - public String basicCarrier; - - @ApiModelProperty("实际运营商") - public String carrier; - - @ApiModelProperty("是否携号转网") - public Boolean isNumberPortability; - - @ApiModelProperty("号码归属号段") - public Long numberSegment; - - @ApiModelProperty("号码归属城市") - public String city; - - @ApiModelProperty("号码归属省份") - public String province; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java deleted file mode 100644 index 6eb2646c3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class EnterInterviewDto { - - @ApiModelProperty(value = "会议计划id", required = true) - private String interviewPlanId; - - @ApiModelProperty(value = "用户id", required = true) - private String userId; - - @ApiModelProperty(value = "1.面试官2.加盟商3.其他", required = true) - private Integer userType; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/InviteCodeDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/InviteCodeDetailDTO.java deleted file mode 100644 index c1ff3e496..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/InviteCodeDetailDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/16 17:38 - * @Version 1.0 - */ -@Data -public class InviteCodeDetailDTO { - @ApiModelProperty("推荐加盟商名称") - private String partnerName; - @ApiModelProperty("推荐加盟商手机号码") - private String partnerPhone; - @ApiModelProperty("邀请码") - private String inviteCode; - @ApiModelProperty("门店名称") - private String storeName; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineCountDTO.java deleted file mode 100644 index c7256636e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineCountDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/15 21:19 - * @Version 1.0 - */ -@Data -public class LineCountDTO { - - private String partnerId; - - private Integer followCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java deleted file mode 100644 index 4a42dbcd4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/7 16:28 - * @Version 1.0 - */ -@Data -public class LineInterviewDTO { - - private Integer id; - - private Long lineId; - - private Integer lineStatus; - - private String investmentManager; - - private String investmentManagerName; - - private String investmentManagerMobile; - - private String interviewer; - - private String interviewerName; - - private String interviewerMobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineQueryInterviewDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineQueryInterviewDto.java deleted file mode 100644 index bf01e58bc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineQueryInterviewDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class LineQueryInterviewDto { - - @ApiModelProperty("加盟商线索id") - private String partnerLineId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java deleted file mode 100644 index 1fc2a3ad1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/MobileCheckDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.dto.partner; - - -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * @author hxd - */ -@Data -@Accessors(chain = true) -public class MobileCheckDTO { - - private String partnerId; - private String mobile; - private Integer lineStatus; - private String workflowStage; - private String workflowStatus; - private String closeTime; - private String investmentManager; - private String investmentManagerName; - private Long lineId; - private String partnerName; - - private String investmentManagerMobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java deleted file mode 100644 index 67ded3f27..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/13 10:26 - * @Version 1.0 - */ -@Data -public class PartnerBlackListDTO { - - private Long lineId; - - private String partnerId; - - private String mobile; - - private String partnerUserName; - - private Date createTime; - - private String closeUserId; - - private Date closeTime; - - private String joinBlackReason; - - private String phoneAddress; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java deleted file mode 100644 index 160f9e4b4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerGetPassLetterDetailDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class PartnerGetPassLetterDetailDto { - - @ApiModelProperty("面试计划id") - private String interviewPlanId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java deleted file mode 100644 index ba3864b21..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/9 15:37 - * @Version 1.0 - */ -@Data -public class PartnerIntentApplyInfoDTO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - private String mobile; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("截止时间") - private Date deadline; - - @ApiModelProperty("阶段提交时间") - private Date partnerSubmitTime; - - @ApiModelProperty("所属阶段") - private String workflowStage; - - @ApiModelProperty("子流程状态") - private String workflowStatus; - - @ApiModelProperty("上次跟进时间") - private String lastFollowTime; - - @ApiModelProperty("接通状态") - private Integer callStatus; - - @ApiModelProperty("来源名称") - private String userChannelName; - - private Integer userChannelId; - - private String userPortrait; - - private String ecWantShopArea; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java deleted file mode 100644 index 20336a5eb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/9 19:40 - * @Version 1.0 - */ -@Data -public class PartnerInterviewInfoDTO { - - @ApiModelProperty("hy_partner_interview.id") - private Long interviewId; - - @ApiModelProperty("hy_partner_interview_plan.id") - private Long id; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝") - private Integer status; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; - - @ApiModelProperty("截止时间") - private Date deadline; - - @ApiModelProperty("审批发起时间") - private Date approveTime; - - @ApiModelProperty("意向合同号") - private String intentionContractNo; - - @ApiModelProperty("面试开始时间") - private Date startTime; - - @ApiModelProperty("面试结束时间") - private Date endTime; - - @ApiModelProperty("面试官ID") - private String interviewer; - - @ApiModelProperty("面试官名称") - private String interviewerName; - - @ApiModelProperty("预约时间") - private Date createTime; - - @ApiModelProperty("房间号") - private String roomId; - - @ApiModelProperty("过程信息") - private String processInfo; - - @ApiModelProperty("上次跟进时间") - private Date lastFollowTime; - - @ApiModelProperty("接通状态") - private Integer callStatus; - - private String userPortrait; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java deleted file mode 100644 index 160478b52..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/12 16:05 - * @Version 1.0 - */ -@Data -public class PartnerLineInfoAndBaseInfoDTO { - @ApiModelProperty("线索ID") - private Long id; - - @ApiModelProperty("加盟申请基本信息 添加tags使用该ID") - private Long partnerBaseInfoId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("加盟商用户ID") - private String partnerUserId; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("手机号归属地") - private String phoneAddress; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("招商经理手机号") - private String investmentManagerPhone; - @ApiModelProperty("用户画像") - - private String userPortrait; - - @ApiModelProperty("通过原因") - private String passCause; - - @ApiModelProperty("通过时间") - private Date passTime; - - @ApiModelProperty("通过人名称") - private String passUserName; - - @ApiModelProperty("通过人ID") - private String passUserId; - - @ApiModelProperty("通过证明") - private String certifyFile; - - private Integer lineStatus; - - @ApiModelProperty("是否处在会销中") - private Boolean whetherInExhibition; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("EC意向开店区域") - private String ecWantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - private String channelName; - - private String idCard; - - private String education; - - private String developmentDirector; - - @ApiModelProperty("详细地址") - private String detailedAddress; - - @ApiModelProperty("邮箱") - private String email; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java deleted file mode 100644 index 1d0e07cef..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerQueryInterviewDto.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class PartnerQueryInterviewDto { - - @ApiModelProperty("加盟商用户id") - private String partnerId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerSimpleInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerSimpleInfoDTO.java deleted file mode 100644 index 32c0d594f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerSimpleInfoDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: PartnerSimpleInfoDTO - * @Description: - * @date 2023-08-10 14:04 - */ -@Data -public class PartnerSimpleInfoDTO { - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("加盟商姓名") - private String username; - - @ApiModelProperty("加盟商手机号") - private String mobile; - - @ApiModelProperty("加盟商id") - private String partnerId; - - @ApiModelProperty("线索阶段") - private String workflowStage; - - @ApiModelProperty("线索状态") - private Integer lineStatus; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java deleted file mode 100644 index 295a40fee..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.cool.store.dto.partner; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/19 15:30 - * @Version 1.0 - */ -@Data -public class PrivateSeaLineDTO { - - - @ApiModelProperty("线索ID") - private Long lineId; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("截止时间") - private Date deadline; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("招商经理名称") - private String investmentManagerName; - - - @ApiModelProperty("开发经理") - private String developmentManager; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("门店编码") - private String storeCode; - - @ApiModelProperty("门店名称") - private String storeName; - - @ApiModelProperty("线索状态") - private Integer lineStatus; - - @ApiModelProperty("是否在会销中") - private Boolean whetherInExhibition; - - @ApiModelProperty("推荐加盟商ID") - private String recommendPartnerId; - - @ApiModelProperty("推荐加盟商名称") - private String recommendPartnerName; - - private Long interviewPlanId; - - private Date startTime; - - private String investmentManagerMobile; - - private String recommendPartnerMobile; - - private Integer userChannelId; - - private String userPortrait; - - private String ecWantShopArea; - - private String allotTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PublicSeaLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PublicSeaLineDTO.java deleted file mode 100644 index fcc076420..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PublicSeaLineDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/15 20:21 - * @Version 1.0 - */ -@Data -public class PublicSeaLineDTO { - - private Date createTime; - - private Long lineId; - - private String partnerId; - - private String userName; - - private String mobile; - - private String wantShopArea; - - private String ecWantShopArea; - - private String acceptAdjustType; - - private Date updateTime; - - private String phoneAddress; - - private Integer userChannelId; - - private String userPortrait; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java deleted file mode 100644 index fd311757d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/SpecialDateRangeInterviewCountDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/8 16:38 - * @Version 1.0 - */ -@Data -public class SpecialDateRangeInterviewCountDTO { - - private Integer currentDayInterviewCount; - - private Integer lastSevenDayInterviewCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java deleted file mode 100644 index f3f7bd017..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/StageCountDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/9 10:16 - * @Version 1.0 - */ -@Data -public class StageCountDTO { - /** - * 意向申请待处理或者待跟进数量 - */ - private Integer intentApplyApproveCount; - /** - * 预约面试阶段 待跟进数量 - */ - private Integer reservationInterviewCount; - /** - * 合格资格面试 待处理或者待跟进数量 - */ - private Integer qualifiedInterviewCount; - - public StageCountDTO(Integer intentApplyApproveCount, Integer reservationInterviewCount, Integer qualifiedInterviewCount) { - this.intentApplyApproveCount = intentApplyApproveCount; - this.reservationInterviewCount = reservationInterviewCount; - this.qualifiedInterviewCount = qualifiedInterviewCount; - } - - public StageCountDTO(Integer intentApplyApproveCount, Integer qualifiedInterviewCount) { - this.intentApplyApproveCount = intentApplyApproveCount; - this.qualifiedInterviewCount = qualifiedInterviewCount; - } - - public StageCountDTO() { - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java deleted file mode 100644 index 2f96a22ec..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserChannelDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/8/10 11:12 - * @Version 1.0 - */ -@Data -public class UserChannelDTO { - - private Long userChannelId; - - private String userChannelName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserPortraitDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserPortraitDTO.java deleted file mode 100644 index 355c9f2ca..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/UserPortraitDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/8/14 17:08 - * @Version 1.0 - */ -@Data -public class UserPortraitDTO { - - private Long userPortraitId; - - private String userPortraitName; - - public UserPortraitDTO(Long userPortraitId, String userPortraitName) { - this.userPortraitId = userPortraitId; - this.userPortraitName = userPortraitName; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ZoneCheckDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ZoneCheckDTO.java deleted file mode 100644 index a01b0274f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/ZoneCheckDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.dto.partner; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/14 16:35 - * @Version 1.0 - */ -@Data -public class ZoneCheckDTO { - - private Long openAreaMappingId; - - private Long zoneId; - - private String areaName; - - private String zoneName; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/DictResultDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/response/DictResultDTO.java deleted file mode 100644 index bfa56ca50..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/DictResultDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.dto.response; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author HXD - */ -@Data -@Accessors(chain = true) -public class DictResultDTO { - private String id; - private String createdBy; - private String createdTime; - private String groupCode; - private String code; - private String name; - private String type; - private String enabled; - private String remark; - private List configList; - - @Data - @Accessors(chain = true) - public static class Dict{ - private String id; - private String dictId; - private String code; - private String name; - private String parentId; - private Boolean enabled; - private String remark; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/MDMResultDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/response/MDMResultDTO.java deleted file mode 100644 index ed0593839..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/MDMResultDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.dto.response; - -/** - * @Author: young.yu - * @Date: 2023-06-14 16:39 - * @Description: - */ -public class MDMResultDTO extends ResultDTO{ - private Object bizKey; - - private String traceId; - - public Object getBizKey() { - return bizKey; - } - - public void setBizKey(Object bizKey) { - this.bizKey = bizKey; - } - - public String getTraceId() { - return traceId; - } - - public void setTraceId(String traceId) { - this.traceId = traceId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/ResultDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/response/ResultDTO.java deleted file mode 100644 index fe9524de2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/response/ResultDTO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.cool.store.dto.response; - - -import java.io.Serializable; - -/** - * rpc统一返回实体类 - * - * @author byd - */ -public class ResultDTO implements Serializable { - - private static final long serialVersionUID = -2217360460304088285L; - - private boolean success = true; - /** - * 返回码 - */ - private int code; - - /** - * 返回信息 - */ - private String message; - - /** - * 返回数据 - */ - private T data; - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } - - public ResultDTO() { - super(); - } - - public ResultDTO(T data) { - super(); - this.data = data; - } - - public ResultDTO(int code, String message, T data) { - this.code = code; - this.message = message; - this.data = data; - } - - public ResultDTO(int code, String message) { - this.code = code; - this.message = message; - } - - public static ResultDTO successResult() { - return new ResultDTO(200000, "请求成功"); - } - - public static ResultDTO successResult(Object data) { - return new ResultDTO(200000, "请求成功", data); - } - - public static ResultDTO failResult(String msg) { - return new ResultDTO(400000, msg); - } - - public static ResultDTO failResult(int code, String msg) { - return new ResultDTO(code, msg); - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/role/RoleUpdateDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/role/RoleUpdateDTO.java deleted file mode 100644 index f3ac30ca3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/role/RoleUpdateDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.dto.role; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: RoleUpdateDTO - * @Description: - * @date 2023-07-25 15:03 - */ -@Data -public class RoleUpdateDTO { - - @ApiModelProperty("角色id") - private String roleId; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("菜单ids") - private List menuIds; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/sms/SendInvateMsgDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/sms/SendInvateMsgDTO.java deleted file mode 100644 index 897925ded..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/sms/SendInvateMsgDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.dto.sms; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-10-20 14:51 - * @Description: - */ -@Data -@ApiModel(description = "发送邀请短信") -public class SendInvateMsgDTO { - @ApiModelProperty(value = "手机号", required = true) - private String mobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackPayLoad.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackPayLoad.java deleted file mode 100644 index dbba60d62..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackPayLoad.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.dto.trtc; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class TRTCVideoCallBackPayLoad { - @ApiModelProperty("参数:" + - "0：代表本录制文件正常上传至点播平台" + - "1：代表本录制文件滞留在服务器或者备份存储上" + - "2：代表本录制文件上传点播任务异常") - private String Status; - - @ApiModelProperty("audio 音频 / video 纯视频 / audio_video 音视频") - private String TrackType; - - @ApiModelProperty("主辅流标识，main代表主流（摄像头），aux代表辅流（屏幕分享），mix代表混流录制") - private String MediaId; - - @ApiModelProperty("statue 不为0时，对应的错误信息") - private String Errmsg; - - @ApiModelProperty("TencentVod") - private TRTCVideoCallBackTencentVod TencentVod; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackTencentVod.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackTencentVod.java deleted file mode 100644 index 2f2f7f73f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/TRTCVideoCallBackTencentVod.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.dto.trtc; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class TRTCVideoCallBackTencentVod { - - @ApiModelProperty("本录制文件在点播平台的播放地址") - private String VideoUrl; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/VideoCallBackEventInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/VideoCallBackEventInfo.java deleted file mode 100644 index d5c7d0177..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/VideoCallBackEventInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.dto.trtc; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class VideoCallBackEventInfo { - - @ApiModelProperty("房间号") - private String RoomId; - - @ApiModelProperty("信息参数") - private TRTCVideoCallBackPayLoad PayLoad; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/EventInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/EventInfo.java deleted file mode 100644 index 808eab265..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/EventInfo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.dto.trtc.callback; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-29 01:17 - * @Description: - */ -public class EventInfo { - @JsonProperty("RoomId") - private String roomId; - @JsonProperty("EventTs") - private long eventTs; - @JsonProperty("UserId") - private String userId; - @JsonProperty("TaskId") - private String taskId; - @JsonProperty("Payload") - private Payload payload; - - public String getRoomId() { - return roomId; - } - - public void setRoomId(String roomId) { - this.roomId = roomId; - } - - public long getEventTs() { - return eventTs; - } - - public void setEventTs(long eventTs) { - this.eventTs = eventTs; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getTaskId() { - return taskId; - } - - public void setTaskId(String taskId) { - this.taskId = taskId; - } - - public Payload getPayload() { - return payload; - } - - public void setPayload(Payload payload) { - this.payload = payload; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/Payload.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/Payload.java deleted file mode 100644 index 0906a7d48..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/Payload.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.dto.trtc.callback; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-29 01:17 - * @Description: - */ -public class Payload { - @JsonProperty("Status") - private int status; - @JsonProperty("TencentVod") - private TencentVod tencentVod; - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public TencentVod getTencentVod() { - return tencentVod; - } - - public void setTencentVod(TencentVod tencentVod) { - this.tencentVod = tencentVod; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java deleted file mode 100644 index 9191bfa47..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.cool.store.dto.trtc.callback; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-29 01:18 - * @Description: - */ -public class TencentVod { - @JsonProperty("UserId") - private String userId; - @JsonProperty("TrackType") - private String trackType; - @JsonProperty("MediaId") - private String mediaId; - @JsonProperty("FileId") - private String fileId; - @JsonProperty("VideoUrl") - private String videoUrl; - @JsonProperty("CacheFile") - private String cacheFile; - @JsonProperty("StartTimeStamp") - private long startTimeStamp; - @JsonProperty("EndTimeStamp") - private long endTimeStamp; - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getTrackType() { - return trackType; - } - - public void setTrackType(String trackType) { - this.trackType = trackType; - } - - public String getMediaId() { - return mediaId; - } - - public void setMediaId(String mediaId) { - this.mediaId = mediaId; - } - - public String getFileId() { - return fileId; - } - - public void setFileId(String fileId) { - this.fileId = fileId; - } - - public String getVideoUrl() { - return videoUrl; - } - - public void setVideoUrl(String videoUrl) { - this.videoUrl = videoUrl; - } - - public String getCacheFile() { - return cacheFile; - } - - public void setCacheFile(String cacheFile) { - this.cacheFile = cacheFile; - } - - public long getStartTimeStamp() { - return startTimeStamp; - } - - public void setStartTimeStamp(long startTimeStamp) { - this.startTimeStamp = startTimeStamp; - } - - public long getEndTimeStamp() { - return endTimeStamp; - } - - public void setEndTimeStamp(long endTimeStamp) { - this.endTimeStamp = endTimeStamp; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/VideoCallBackDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/VideoCallBackDTO.java deleted file mode 100644 index 104f93004..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/VideoCallBackDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.dto.trtc.callback; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-29 01:16 - * @Description: - */ -public class VideoCallBackDTO { - @JsonProperty("EventGroupId") - private int eventGroupId; - @JsonProperty("EventType") - private int eventType; - @JsonProperty("CallbackTs") - private long callbackTs; - @JsonProperty("EventInfo") - private EventInfo eventInfo; - - public int getEventGroupId() { - return eventGroupId; - } - - public void setEventGroupId(int eventGroupId) { - this.eventGroupId = eventGroupId; - } - - public int getEventType() { - return eventType; - } - - public void setEventType(int eventType) { - this.eventType = eventType; - } - - public long getCallbackTs() { - return callbackTs; - } - - public void setCallbackTs(long callbackTs) { - this.callbackTs = callbackTs; - } - - public EventInfo getEventInfo() { - return eventInfo; - } - - public void setEventInfo(EventInfo eventInfo) { - this.eventInfo = eventInfo; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/CodeSessionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/CodeSessionDTO.java deleted file mode 100644 index 333a8a6ba..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/CodeSessionDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.dto.wx; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: CodeSessionDTO - * @Description: - * @date 2023-05-29 14:28 - */ -@Data -public class CodeSessionDTO extends WXBaseResultDTO{ - - @JSONField(name = "session_key") - private String sessionKey; - - @JSONField(name = "openid") - private String openid; - - @JSONField(name = "unionid") - private String unionId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkDTO.java deleted file mode 100644 index 7595de0e3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.dto.wx; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-09-12 14:48 - * @Description: - */ -@Data -public class MiniAppUrlLinkDTO extends WXBaseResultDTO{ - @JSONField(name = "url_link") - private String urlLink; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkReqDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkReqDTO.java deleted file mode 100644 index f9db13499..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniAppUrlLinkReqDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.dto.wx; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-09-12 14:48 - * @Description: - */ -@Data -public class MiniAppUrlLinkReqDTO{ - private String path; - private String query; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java deleted file mode 100644 index 39daacacb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.dto.wx; - -import com.cool.store.enums.UserChannelEnum; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author zhangchenbiao - * @FileName: MiniProgramLoginDTO - * @Description: - * @date 2023-05-29 14:28 - */ -@Data -public class MiniProgramLoginDTO { - - @NotBlank(message = "jsCode不能为空") - private String jsCode; - - @NotBlank(message = "手机号code不能为空") - private String mobileCode; - - @NotBlank(message = "用户encryptedData不能为空") - private String encryptedData; - - @NotBlank(message = "ivStr不能为空") - private String ivStr; - - private String userChannelEnum; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramMsgDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramMsgDTO.java deleted file mode 100644 index 6fa13281c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramMsgDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.dto.wx; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author zhangchenbiao - * @FileName: MiniProgramMsgDTO - * @Description: - * @date 2023-05-29 14:28 - */ -@Data -public class MiniProgramMsgDTO { - - @NotBlank(message = "appid不能为空") - private String appid; - - @NotBlank(message = "encryptedData不能为空") - private String encryptedData; - - @NotBlank(message = "ivStr不能为空") - private String ivStr; - - @NotBlank(message = "openid不能为空") - private String openid; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/PhoneInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/PhoneInfoDTO.java deleted file mode 100644 index a424549e9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/PhoneInfoDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.dto.wx; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author wxp - * @FileName: PhoneInfoDTO - * @Description: - * @date 2023-06-14 14:28 - */ -@Data -public class PhoneInfoDTO extends WXBaseResultDTO{ - - @JSONField(name = "phone_info") - private PhoneInfo phoneInfo; - - @Data - public static class PhoneInfo{ - /** - * 用户绑定的手机号（国外手机号会有区号） - */ - private String phoneNumber; - - /** - * 没有区号的手机号 - */ - private String purePhoneNumber; - - /** - * 区号 - */ - private String countryCode; - - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/WXBaseResultDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/WXBaseResultDTO.java deleted file mode 100644 index b608a32dc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wx/WXBaseResultDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.dto.wx; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: WXBaseResultDTO - * @Description: - * @date 2023-05-29 14:52 - */ -@Data -public class WXBaseResultDTO { - - private static final String SUCCESS_CODE = "0"; - - @JSONField(name = "errcode") - private String errCode; - - @JSONField(name = "errmsg") - private String errMsg; - - public boolean isSuccess() { - return this.errCode == null || this.errCode.isEmpty() || this.errCode.equals("0"); - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java deleted file mode 100644 index 19e320d21..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BeautyCameraSettingDO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-09-11 02:20 - */ -@Table(name = "beauty_camera_setting") -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class BeautyCameraSettingDO implements Serializable { - @ApiModelProperty("主键id") - private Long id; - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("美颜度") - private Integer beauty; - - @ApiModelProperty("明亮度") - private Integer brightness; - - @ApiModelProperty("红润") - private Integer ruddy; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("用户创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/CallRecordDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/CallRecordDO.java deleted file mode 100644 index 38fa1abb5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/CallRecordDO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-08-11 01:03 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class CallRecordDO implements Serializable { - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("请求编号") - private String transNo; - - @ApiModelProperty("呼出人手机号") - private String outgoingMobile; - - @ApiModelProperty("呼出人用户id") - private String outgoingUserId; - - @ApiModelProperty("接听人手机号") - private String incomingMobile; - - @ApiModelProperty("接听人用户id") - private String incomingUserId; - - @ApiModelProperty("通话开始时间") - private Date callStartTime; - - @ApiModelProperty("通话结束时间") - private Date callEndTime; - - @ApiModelProperty("录音地址") - private String recordUrl; - - @ApiModelProperty("0.待呼叫1.呼叫接听2.呼叫未接听3.呼叫失败") - private Integer callStatus; - - @ApiModelProperty("失败原因") - private String failReason; - - @ApiModelProperty("创建人") - private String creater; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新人") - private String updater; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("备注") - private String remark; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/DingdingUserDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/DingdingUserDO.java deleted file mode 100644 index 826abc262..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/DingdingUserDO.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-15 10:03 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class DingdingUserDO implements Serializable { - @ApiModelProperty("") - private Integer id; - - @ApiModelProperty("用户id") - private String userid; - - @ApiModelProperty("") - private String unionid; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("是不是老板") - private Integer isBoss; - - @ApiModelProperty("入职时间【毫秒时间戳】") - private String hiredDate; - - @ApiModelProperty("是否是高管") - private Integer isSenior; - - @ApiModelProperty("分机号") - private String tel; - - @ApiModelProperty("办公地点") - private String workPlace; - - @ApiModelProperty("员工电子邮箱") - private String email; - - @ApiModelProperty("是否已经激活，true表示已激活，false表示未激活") - private Integer active; - - @ApiModelProperty("头像url") - private String avatar; - - @ApiModelProperty("是否为企业的管理员，true表示是，false表示不是") - private Integer isAdmin; - - @ApiModelProperty("是否号码隐藏，true表示隐藏，false表示不隐藏") - private Integer isHide; - - @ApiModelProperty("员工工号") - private String jobNumber; - - @ApiModelProperty("员工名字") - private String name; - - @ApiModelProperty("国家地区码") - private String stateCode; - - @ApiModelProperty("是否实名认证") - private Integer realAuthed; - - @ApiModelProperty("数据库更新时间") - private Date dbUpdateTimestamp; - - @ApiModelProperty("职位") - private String position; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("审核状态[0、待审核；1、已审核；2、拒绝审核；3、首次同步不处理]") - private Integer checkStatus; - - @ApiModelProperty("工作状态[1、在职；0、离职]") - private Integer jobStatus; - - @ApiModelProperty("所在组织") - private Integer configCodeId; - - @ApiModelProperty("json格式的【是不是部门老大，多部门所以json】") - private String isLeaderInDepts; - - @ApiModelProperty("所属部门id") - private String department; - - @ApiModelProperty("扩展属性") - private String extattr; - - @ApiModelProperty("用户角色信息") - private String roles; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java deleted file mode 100644 index 593358d5e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-06 02:29 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EnterpriseUserDO implements Serializable { - @ApiModelProperty("用户主键id") - private Long id; - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("飞书 user_id") - private String feishuUserId; - - @ApiModelProperty("") - private String name; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("手机号码") - private String mobile; - - @ApiModelProperty("员工的电子邮箱") - private String email; - - @ApiModelProperty("员工的企业邮箱") - private String orgEmail; - - @ApiModelProperty("是否是主管理员，0：否，1：是") - private Boolean mainAdmin; - - @ApiModelProperty("是否为企业的管理员, true表示是, false表示不是") - private Boolean isAdmin; - - @ApiModelProperty("在当前isv全局范围内唯一标识一个用户的身份,用户无法修改") - private String unionid; - - @ApiModelProperty("头像url") - private String avatar; - - @ApiModelProperty("工号") - private String jobnumber; - - @ApiModelProperty("是否是部门的主管, true表示是, false表示不是") - private Boolean isLeader; - - @ApiModelProperty("管理的部门列表") - private String leaderDeptIds; - - @ApiModelProperty("人脸照片url") - private String faceUrl; - - @ApiModelProperty("用户状态 0待审核 1正常 2冻结") - private Integer userStatus; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("用户创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("部门集合（region_ids）") - private String userRegionIds; - - @ApiModelProperty("在线状态") - private Integer onlineStatus; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserRoleDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserRoleDO.java deleted file mode 100644 index efcf08159..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserRoleDO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cool.store.entity; - -import com.cool.store.enums.DataSourceEnum; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; - -/** - * - * @author zhangchenbiao - * @date 2023-06-08 10:54 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EnterpriseUserRoleDO implements Serializable { - @ApiModelProperty("主键id") - private Integer id; - - @ApiModelProperty("角色id") - private String roleId; - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("type") - private Integer type; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - public static List convertSyncDO(String roleId, List userIds){ - if(CollectionUtils.isEmpty(userIds)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (String userId : userIds) { - EnterpriseUserRoleDO userRole = new EnterpriseUserRoleDO(); - userRole.setRoleId(roleId); - userRole.setUserId(userId); - userRole.setType(DataSourceEnum.SYNC.getCode()); - userRole.setDeleted(Boolean.FALSE); - userRole.setCreateTime(new Date()); - userRole.setUpdateTime(new Date()); - resultList.add(userRole); - } - return resultList; - } -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyAdvancedSettingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyAdvancedSettingDO.java deleted file mode 100644 index 361ccedcf..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyAdvancedSettingDO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:49 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyAdvancedSettingDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("链接地址") - private String partnerUrl; - - @ApiModelProperty("线索分配 职位 ,1,12,33,") - private String allocationRoles; - - @ApiModelProperty("腾讯会议账号") - private String tencentVideoAccount; - - @ApiModelProperty("腾讯会议秘钥") - private String tencentVideoKey; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java deleted file mode 100644 index 1bcb014f4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.cool.store.entity; - -import com.cool.store.enums.ContentSubjectEnum; -import com.cool.store.enums.ContentTypeEnum; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyContentInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("内容标题") - private String contentTitle; - - @ApiModelProperty("栏目CODE") - private ContentSubjectEnum subject; - - @ApiModelProperty("类型 image-图文 video-视频") - private ContentTypeEnum contentType; - - @ApiModelProperty("封面URL") - private String cover; - - @ApiModelProperty("状态 0-启用 1-禁用") - private Integer status; - - @ApiModelProperty("删除标志 0-正常 1-删除") - private Integer deleted; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("更新时间") - private String updateTime; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; - - @ApiModelProperty("图文内容或者视频文件URL") - private String content; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java deleted file mode 100644 index 1fa244e53..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-11-30 11:47 - */ -@Table(name = "hy_exhibition") -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyExhibitionDO implements Serializable { - @ApiModelProperty("") - private Integer id; - - @ApiModelProperty("关联会销组id，hy_exhibition_group.id") - private Integer exhibitionGroupId; - - @ApiModelProperty("会销编号") - private String exhibitionCode; - - @ApiModelProperty("会销名称") - private String exhibitionName; - - @ApiModelProperty("举办日期") - private Date startDate; - - @ApiModelProperty("举办日期str") - private String startDateStr; - - @ApiModelProperty("举办地点") - private String location; - - @ApiModelProperty("0表示未结束，1表示自动结束，2表示手动结束") - private Integer closedType; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("创建人user_id，enterprise_user.user_id") - private String creator; - - @ApiModelProperty("更新人user_id，enterprise_user.user_id") - private String updater; - - @ApiModelProperty("删除标志，0表示未删除") - private Boolean deleted; - - @ApiModelProperty("结束时间") - private Date closeTime; - - @ApiModelProperty("协作人user_id，enterprise_user.user_id，以英文逗号分隔") - private String collaborators; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java deleted file mode 100644 index 6acd5cc6c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-11-30 11:55 - */ -@Table(name = "hy_exhibition_group") -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyExhibitionGroupDO implements Serializable { - @ApiModelProperty("") - private Integer id; - - @ApiModelProperty("会销组名称，20个字") - private String exhibitionGroupName; - - @ApiModelProperty("0表示未结束，1表示结束") - private Boolean closed; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("创建人user_id，enterprise_user.user_id") - private String creator; - - @ApiModelProperty("更新人user_id，enterprise_user.user_id") - private String updater; - - @ApiModelProperty("删除标志，0表示未删除") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java deleted file mode 100644 index 61b0d822d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyFollowTaskDO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-08-10 10:10 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyFollowTaskDO implements Serializable { - - @ApiModelProperty("跟进任务id") - private Long id; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("任务跟进人id") - private String followUserId; - - @ApiModelProperty("任务标题") - private String taskTitle; - - @ApiModelProperty("沟通方式: 0:电话、1:短信、2:微信、3:QQ、4:邮件、5:拜访、6:提醒") - private Integer communicationType; - - @ApiModelProperty("任务截止时间") - private Date deadline; - - @ApiModelProperty("计划沟通内容") - private String communicationContent; - - @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废、4逾期完成、5逾期作废") - private Integer taskStatus; - - @ApiModelProperty("完成时间") - private Date finishTime; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionDO.java deleted file mode 100644 index d4e446222..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionDO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyInspectionDO { - - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("面试计划Id") - private Long interviewPlanId; - - @ApiModelProperty("稽核人user_id") - private String operatorUserId; - - @ApiModelProperty("稽核类型，0面试稽核，后续可能有其他稽核") - private Integer type; - - @ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）") - private Integer status; - - @ApiModelProperty("多个凭证文件（以英文逗号分隔）") - private String files; - - @ApiModelProperty("稽核说明") - private String description; - - @ApiModelProperty("稽核时间") - private String inspectionTime; - - @ApiModelProperty("enterprise_user.user_id，创建人") - private String creator; - - @ApiModelProperty("enterprise_user.user_id，修改人") - private String updator; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("是否删除（0表示未删除，1表示删除）") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("修改时间") - private String updateTime; - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingDO.java deleted file mode 100644 index 91919a103..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingDO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-07-18 04:27 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyInspectionSettingDO implements Serializable { - @ApiModelProperty("主键id") - private Long id; - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("关联稽核人user_id") - private String inspectionUserId; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("删除标识") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingMappingDO.java deleted file mode 100644 index 5c04d619f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionSettingMappingDO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-07-18 04:28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyInspectionSettingMappingDO implements Serializable { - @ApiModelProperty("主键id") - private Long id; - - @ApiModelProperty("稽核区域配置表id,hy_inspection_setting.id") - private Long inspectionSettingId; - - @ApiModelProperty("hy_open_area_info.id") - private Long openAreaMappingId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("修改时间") - private Date updateTime; - - @ApiModelProperty("删除标识") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevZoneInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevZoneInfoDO.java deleted file mode 100644 index e22d6c402..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevZoneInfoDO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyIntendDevZoneInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("关联区域ID 酷店掌系统区域ID") - private String associatedRegionId; - - @ApiModelProperty("区分意向区域OR开发区域 intend-意向区域 developement-开发区域") - private String type; - - @ApiModelProperty("最近的分配人ID") - private String lastAllotUserId; - - @ApiModelProperty("删除标志 0-正常 1-删除") - private Integer deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java deleted file mode 100644 index e0ffe6f63..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:50 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyIntendDevelopementMappingDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_intend_developement_zone_info.id") - private Long mappingId; - - @ApiModelProperty("hy_open_area_info.id或者区域ID") - private String openAreaMappingId; - - @ApiModelProperty("区分意向区域OR开发区域 intend-意向区域 developement-开发区域") - private String type; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLogDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLogDO.java deleted file mode 100644 index ee554434e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLogDO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyInterviewInspectionLogDO { - - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("enterprise_user.user_id，操作人用户id") - private String operatorUserId; - - @ApiModelProperty("稽核信息表id(hy_inspection.id)") - private Long inspectionId; - - @ApiModelProperty("操作类型（0为合格，1为不合格，2为撤销）") - private Integer operationType; - - @ApiModelProperty("操作说明") - private String description; - - @ApiModelProperty("多个凭证文件，以英文逗号分隔") - private String files; - - @ApiModelProperty("操作时间") - private String operationTime; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("修改时间") - private String updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewRemindDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewRemindDO.java deleted file mode 100644 index 9c47a712c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewRemindDO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author Fun Li 2023/9/22 10:52 - * @version 1.0 - * 面试提醒短信所需信息 - */ -@Data -public class HyInterviewRemindDO implements Serializable { - - @ApiModelProperty("面试开始时间") - private Date startTime; - - @ApiModelProperty("加盟商手机号") - private String mobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOpenAreaInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOpenAreaInfoDO.java deleted file mode 100644 index 83fe719f9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOpenAreaInfoDO.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyOpenAreaInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("parent.id") - private Long parentId; - - @ApiModelProperty("区域名称") - private String areaName; - - @ApiModelProperty("区域路径") - private String areaPath; - - @ApiModelProperty("背景图URL 重点区域时候必填") - private String backgroundBanner; - - @ApiModelProperty("详情banner URL 重点区域时候必填") - private String detailBanner; - - @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") - private String areaStatus; - - @ApiModelProperty("删除标志 0-正常 1-删除") - private Integer deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("更新人") - private String updateUserId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java deleted file mode 100644 index 61ff2c796..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyOutboundMobileDO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** -* @author Fun Li -* @date 2023/08/09 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyOutboundMobileDO { - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("") - private String mobile; - - @ApiModelProperty("编辑人user_id（enterprise_user.user_id）") - private String editUserId; - - @ApiModelProperty("备注（保留字段）") - private String remark; - - @ApiModelProperty("创建人user_id（enterprise_user.user_id）") - private String createUserId; - - @ApiModelProperty("修改人user_id（enterprise_user.user_id）") - private String updateUserId; - - @ApiModelProperty("是否删除，0表示未删除") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java deleted file mode 100644 index 2ea642854..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerBaseInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("姓名") - private String username; - - @ApiModelProperty("1男 2女") - private Integer sex; - - @ApiModelProperty("民族") - private String nation; - - @ApiModelProperty("出生日期") - private Date birthdate; - - @ApiModelProperty("身份证") - private String idCard; - - @ApiModelProperty("身份证正面") - private String idCardPhotoFront; - - @ApiModelProperty("身份证反面") - private String idCardPhotoBlack; - - @ApiModelProperty("住址") - private String liveAddress; - - @ApiModelProperty("用户画像") - private String userPortrait; - - @ApiModelProperty("0待提交、1待审核、2已通过、3未通过") - private Integer status; - - @ApiModelProperty("最近的日志消息") - private String latestLogMessage; - - @ApiModelProperty("通过原因") - private String passReason; - - @ApiModelProperty("证明文件或凭证") - private String certifyFile; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - private Date passTime; - - private String passUserId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java deleted file mode 100644 index 8d0e43279..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerCertificationInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_interview.id") - private Long partnerInterviewId; - - @ApiModelProperty("资质审核流程id") - private String qualifyVerifyId; - - @ApiModelProperty("意向合同编号") - private String intentionContractNo; - - @ApiModelProperty("数据来源") - private String dataSource; - - @ApiModelProperty("发起资质审核信息记录json字段") - private String certificationInfoRecordJson; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerClerkDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerClerkDO.java deleted file mode 100644 index f59bbc788..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerClerkDO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:51 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerClerkDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("伙伴姓名") - private String username; - - @ApiModelProperty("关系") - private String relationship; - - @ApiModelProperty("年龄") - private Integer age; - - @ApiModelProperty("选择原因") - private String chooseReason; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerEcTrackLogDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerEcTrackLogDO.java deleted file mode 100644 index 3e5335a1f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerEcTrackLogDO.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.cool.store.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.cool.store.enums.TrajectoryTypeEnum; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; -import org.apache.commons.lang3.StringUtils; - -/** - * hy_partner_ec_track_log - * @author - */ -@Data -@Accessors(chain = true) -public class HyPartnerEcTrackLogDO implements Serializable { - private Long id; - - /** - * 跟进ID - */ - private String trajectoryId; - - /** - * 操作人id - */ - private String userId; - - /** - * 操作人姓名 - */ - private String userName; - - /** - * 客户id - */ - private String crmId; - - private String partnerId; - - - /** - * 客户手机号 - */ - private String mobile; - - /** - * 接收人id - */ - private String receiveUserIds; - - /** - * 接收人姓名 - */ - private String receiveUser; - - /** - * 跟进类型 - */ - private Integer trajectoryType; - - /** - * 跟进类型名称 - */ - private String trajectoryTypeContent; - - /** - * 轨迹内容 - */ - private String content; - - - - /** - * 轨迹内容(拼接) - */ - private String detailContent; - - - /** - * 操作时间 - */ - @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8") - private Date operateTime; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8") - private Date updateTime; - - /** - * 备注 - */ - private String remark; - - /** - * 获取拼接好的内容 - * @param ecLogVo - * @return - */ - public static String getDetailContentJoint(HyPartnerEcTrackLogDO ecLogVo){ - if (StringUtils.isNotEmpty(ecLogVo.getContent())) { - String str = ecLogVo.getContent(); - if (str.contains("[mobile]")||str.contains("[/mobile]")) { - str = str.replaceAll("\\[mobile]", "").replaceAll("\\[/mobile]", ""); - } - return str; - } - StringBuilder detailContent = new StringBuilder(); - Integer trajectoryType = ecLogVo.getTrajectoryType(); - if (trajectoryType.equals(TrajectoryTypeEnum.TRANSFER_CUSTOMER.getValue())) { - detailContent.append(TrajectoryTypeEnum.TRANSFER_CUSTOMER.getJointText()).append(ecLogVo.getReceiveUser()); - } - if (trajectoryType.equals(TrajectoryTypeEnum.ALLOCATION_CUSTOMER.getValue())) { - detailContent.append(TrajectoryTypeEnum.ALLOCATION_CUSTOMER.getJointText()).append(ecLogVo.getReceiveUser()); - } - if (trajectoryType.equals(TrajectoryTypeEnum.GET_CUSTOMER.getValue())) { - detailContent.append(ecLogVo.getUserName()).append(TrajectoryTypeEnum.GET_CUSTOMER.getJointText()); - } - if (StringUtils.isEmpty(detailContent)) { - detailContent.append(TrajectoryTypeEnum.getShowText(trajectoryType)); - } - return detailContent.toString(); - } - - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java deleted file mode 100644 index fe992d735..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.Table; -import java.io.Serializable; -import java.util.Date; - -/** - * - * @author zhangchenbiao - * @date 2023-11-30 11:55 - */ -@Table(name = "hy_partner_exhibition") -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerExhibitionDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("报名的展会id，hy_exhibition.id") - private Integer exhibitionId; - - @ApiModelProperty("进行面试的会销创建人姓名") - private String exhibitionCreatorName; - - @ApiModelProperty("进行面试的会销创建人手机号") - private String exhibitionCreatorMobile; - - @ApiModelProperty("线索id，hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("客户经理名字") - private String investmentManagerName; - - @ApiModelProperty("预计到访人数") - private Integer expectedVisitorsCount; - - @ApiModelProperty("期望了解的信息") - private String expectedInformation; - - @ApiModelProperty("参加会销状态，0为已报名，1为已签到，2为已提交申请，3为面试中，4为面试完成，5为通过，6为不通过，7为取消报名") - private Integer participationStatus; - - @ApiModelProperty("线索参加的面试计划id，hy_partner_interview_plan.id") - private Long interviewPlanId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("签到时间") - private Date checkInTime; - - @ApiModelProperty("创建人user_id，enterprise_user.user_id") - private String creator; - - @ApiModelProperty("更新人user_id，enterprise_user.user_id") - private String updater; - - @ApiModelProperty("删除标识，0标识未删除") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java deleted file mode 100644 index 3b66677bb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionInterviewDO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/12/7 18:12 - * @version 1.0 - * 线索参加会销面试相关信息 - */ -@Data -public class HyPartnerExhibitionInterviewDO { - - @ApiModelProperty("会销id") - private Integer exhibitionId; - - @ApiModelProperty("会销名") - private String exhibitionName; - - @ApiModelProperty("会销日期") - private String exhibitionDate; - - @ApiModelProperty("面试计划id") - private Long interviewPlanId; - - @ApiModelProperty("进行面试的会销创建人姓名") - private String exhibitionCreatorName; - - @ApiModelProperty("进行面试的会销创建人手机号") - private String exhibitionCreatorMobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerFraSourceDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerFraSourceDO.java deleted file mode 100644 index 4bb91cdf2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerFraSourceDO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.entity; - -import java.io.Serializable; -import java.util.Date; - -import lombok.Data; -import lombok.experimental.Accessors; - - - -/** - * hy_partner_fra_source - * @author - */ -@Data -@Accessors(chain = true) -public class HyPartnerFraSourceDO implements Serializable { - private Long id; - - /** - * 来源名称 - */ - private String name; - - /** - * 来源code - */ - private String code; - - /** - * 所属字典枚举组的id - */ - private String dictId; - - /** - * 数据的id - */ - private String sourceId; - - /** - * 启用标识 - */ - private Boolean enabled; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 备注 - */ - private String remark; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java deleted file mode 100644 index 6e50ea613..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerIntentInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("是否有意向铺位") - private Integer isHaveWantShop; - - @ApiModelProperty("意向铺位信息,json字段,最多5个") - private String wantShopInfo; - - @ApiModelProperty("最大预算") - private String maxBudget; - - @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代") - private String moneySource; - - @ApiModelProperty("资金证明") - private String moneyProve; - - @ApiModelProperty("学历") - private String education; - - @ApiModelProperty("工作年限") - private String workYear; - - @ApiModelProperty("是否具有工作经验") - private Integer isHaveWorkExp; - - @ApiModelProperty("工作或经商经验") - private String workExp; - - @ApiModelProperty("是否是消费者") - private Integer isConsumer; - - @ApiModelProperty("其他品牌") - private String otherBand; - - @ApiModelProperty("品牌优势") - private String brandStrength; - - @ApiModelProperty("需要改进") - private String needImprove; - - @ApiModelProperty("优势") - private String strength; - - @ApiModelProperty("劣势") - private String weakness; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("通过原因") - private String passCause; - - @ApiModelProperty("通过时间") - private Date passTime; - - @ApiModelProperty("通过人ID") - private String passUser; - - @ApiModelProperty("通过证明") - private String passCertifyFile; - - @ApiModelProperty("详细地址") - private String detailedAddress; - - @ApiModelProperty("邮箱地址") - private String email; - - @ApiModelProperty("征信证明") - private String creditProve; - - private Integer acquaintanceFlag; - - private String acquaintanceName; - - private Integer acquaintanceRelationshipType; - - private String otherRelationshipType; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewBookSituation.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewBookSituation.java deleted file mode 100644 index 265390466..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewBookSituation.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @author Fun Li 2023/11/7 17:06 - * @version 1.0 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerInterviewBookSituation { - - @ApiModelProperty("预约人数") - private Integer bookingCount; - - @ApiModelProperty("预约的面试开始时间") - private String startTime; - - @ApiModelProperty("预约的面试结束时间") - private String endTime; - - @ApiModelProperty("是否已被预定成功") - private Boolean booked; - - @ApiModelProperty("预约成功人的 partnerId") - private String bookedPartnerId; - - public HyPartnerInterviewBookSituation(Integer bookingCount, Boolean booked) { - this.bookingCount = bookingCount; - this.booked = booked; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java deleted file mode 100644 index 7619a41eb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-09 05:51 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerInterviewDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("预约状态 0 待预约;1预约时间待审核2.待面试;3已开始;4待审核;5审批中;6审批通过;7拒绝") - private Integer status; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_interview_plan.id") - private Long interviewPlanId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("截止时间") - private Date deadline; - - @ApiModelProperty("面试官") - private String interviewer; - - @ApiModelProperty("记录人") - private String recorder; - - @ApiModelProperty("过程信息") - private String processInfo; - - @ApiModelProperty("记录时间") - private Date recordTime; - - @ApiModelProperty("面试总结") - private String summary; - - @ApiModelProperty("授权码") - private String authCode; - - @ApiModelProperty("通过函编码") - private String passCode; - - @ApiModelProperty("函文件Pdf url") - private String passPdfUrl; - - @ApiModelProperty("函文件image url") - private String passImageUrl; - - @ApiModelProperty("审核通过时间") - private Date passTime; - - @ApiModelProperty("有效期") - private String expiryDate; - - @ApiModelProperty("最近的日志消息") - private String latestLogMessage; - - @ApiModelProperty("通过原因") - private String passReason; - - @ApiModelProperty("证明文件或凭证") - private String certifyFile; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("审批发起时间") - private Date approveTime; - - @ApiModelProperty("加盟商进入面试时间") - private Date partnerEnterTime; - - @ApiModelProperty("面试官进入面试时间") - private Date interviewerEnterTime; - - @ApiModelProperty("删除标识") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java deleted file mode 100644 index 3358ec262..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerInterviewPlanDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("面试日期") - private Date interviewDate; - - @ApiModelProperty("面试开始时间") - private Date startTime; - - @ApiModelProperty("面试结束时间") - private Date endTime; - - @ApiModelProperty("0未参加，1参加") - private Integer isPartnerInterview; - - @ApiModelProperty("实际开始时间") - private Date actualStartTime; - - @ApiModelProperty("实际结束时间") - private Date actualEndTime; - - @ApiModelProperty("房间号") - private String roomId; - - @ApiModelProperty("房间密码") - private String roomPassword; - - @ApiModelProperty("面试官") - private String interviewer; - - @ApiModelProperty("房间状态:0待开放;1已开放; 2已关闭") - private Integer roomStatus; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("预约是否通过审核：0.未审核1.通过审核") - private Integer applicationApproved; - - @ApiModelProperty("飞书日历id") - private String feishuCalendarId; - - @ApiModelProperty("飞书日程id") - private String feishuScheduleId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java deleted file mode 100644 index 6dc765b14..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelDO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** -* @author Fun Li - * @date 2023/08/10 -*/ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerLabelDO { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("标签组id hy_partner_label_group.id") - private Long labelGroupId; - - @ApiModelProperty("标签名") - private String labelName; - - @ApiModelProperty("编辑人user_id（enterprise_user.user_id）") - private String editUserId; - - @ApiModelProperty("编辑时间") - private Date editDate; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("创建人") - private String createUserId; - - @ApiModelProperty("更新人") - private String updateUserId; - - @ApiModelProperty("备注") - private String remark; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelGroupDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelGroupDO.java deleted file mode 100644 index b46f428f5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLabelGroupDO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @author Fun Li 2023/8/10 13:31 - * @version 1.0 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerLabelGroupDO { - - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("标签组名称") - - private String labelGroupName; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("编辑人user_id（enterprise_user.user_id）") - private String editUserId; - - @ApiModelProperty("编辑时间") - private Date editDate; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("创建人（enterprise_user.user_id）") - private String createUserId; - - @ApiModelProperty("更新人（enterprise_user.user_id）") - private String updateUserId; - - @ApiModelProperty("备注") - private String remark; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineDO.java deleted file mode 100644 index 19b6136c6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineDO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.entity; - -import com.cool.store.annotation.Excel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * - * @author hxd - * @date 2023-05-29 03:52 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerLineDO implements Serializable { - - @Excel(name = "*姓名（必填）" ) - @ApiModelProperty("姓名") - private String partnerName; - - @Excel(name = "*手机号（必填）") - @ApiModelProperty("手机号") - private String mobile; - - @Excel(name = "*常驻区域（必填）",width =18) - @ApiModelProperty("常驻区域") - private String liveAreaReplace; - - private String liveArea; - - @Excel(name = "*意向区域（必填）",width =18) - @ApiModelProperty("意向区域") - private String wantShopAreaReplace; - - private Long wantShopArea; - - @Excel(name = "*是否接受调剂（必填）",width =18) - @ApiModelProperty("是否接受调剂") - private String acceptAdjustTypeReplace; - - private Integer acceptAdjustType; - - @Excel(name = "分配招商经理",width =18) - @ApiModelProperty("分配招商经理") - private String investmentManagerReplace; - - private String investmentManager; - - - @Excel(name = "错误信息",width =26) - @ApiModelProperty("错误信息") - private String errorInfo; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java deleted file mode 100644 index 6536a9221..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:52 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerLineInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单") - private Integer lineStatus; - - @ApiModelProperty("是否处在会销中") - private Boolean whetherInExhibition; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("开发主管") - private String developmentDirector; - - @ApiModelProperty("开发经理") - private String developmentManager; - - @ApiModelProperty("截止时间") - private Date deadline; - - @ApiModelProperty("通过原因") - private String passReason; - - @ApiModelProperty("公开拒绝原因") - private String rejectPublicReason; - - @ApiModelProperty("真实拒绝原因") - private String rejectRealReason; - - @ApiModelProperty("证明文件或凭证") - private String certifyFile; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("结束跟进时间") - private Date closeTime; - - @ApiModelProperty("结束跟进人员ID") - private String closeUserId; - - @ApiModelProperty("加入黑名单原因") - private String joinBlackReason; - - @ApiModelProperty("移除黑名单原因") - private String removeBlackReason; - - @ApiModelProperty("hy_partner_user_channel.channel_id") - private Integer userChannelId; - - @ApiModelProperty("创建人") - private String createUserId; - - @ApiModelProperty("创建人手机号") - private String createUserMobile; - - @ApiModelProperty("操作类型") - private String operatorType; - - @ApiModelProperty("更新人") - private String updateUserId; - - @ApiModelProperty("分配时间") - private Date allotTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java deleted file mode 100644 index 51f30265a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerTaskInfoLogDO implements Serializable { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("操作人id") - private String operateUserId; - - @ApiModelProperty("操作人姓名") - private String operateUsername; - - @ApiModelProperty("操作类型 参考代码中OperateTypeEnum") - private String operateType; - - @ApiModelProperty("流程阶段：意向申请审核、预约面试时间、加盟资格面试、分配选址开发经理、商圈点位评估、上传店铺租赁信息、完善加盟签约信息、支付加盟费用、签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("备注") - private String message; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("字段备份") - private String fieldCopy; - - public HyPartnerTaskInfoLogDO(String partnerId, Long partnerLineId, String workflowStage, String workflowStatus, String operateUserId, String operateUsername, String message) { - this.partnerId = partnerId; - this.partnerLineId = partnerLineId; - this.workflowStage = workflowStage; - this.workflowStatus = workflowStatus; - this.operateUserId = operateUserId; - this.operateUsername = operateUsername; - this.message = message; - } -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserChannelDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserChannelDO.java deleted file mode 100644 index 6485b4628..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserChannelDO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.alibaba.fastjson.annotation.JSONField; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.naming.Name; - -/** - * hy_partner_user_channel - * @author - */ -@Data -@Accessors(chain = true) -public class HyPartnerUserChannelDO implements Serializable { - - private Long id; - - /** - * 来源id - */ - private Long channelId; - - /** - * 来源名称 - */ - private String channelName; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java deleted file mode 100644 index 265345a71..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; - -import io.swagger.models.auth.In; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class HyPartnerUserInfoDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("申请人姓名") - private String username; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("邀请码") - private String inviteCode; - - @ApiModelProperty("是否填写加盟需知") - private Integer isWritePartnerKnow; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("店铺编码") - private String shopCode; - - @ApiModelProperty("店铺名称") - private String shopName; - - @ApiModelProperty("店铺ID") - private String shopId; - - @ApiModelProperty("推荐加盟商id") - private String recommendPartnerId; - - @ApiModelProperty("推荐加盟商姓名") - private String recommendPartnerName; - - @ApiModelProperty("推荐加盟商手机号") - private String recommendPartnerMobile; - - @ApiModelProperty("hy_partner_user_channel.channel_id") - private Integer userChannelId; - - - @ApiModelProperty("ec意向区域") - private String ecWantShopArea; - - @ApiModelProperty("ec创建时间") - private Date crmCreateTime; - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserPlatformBindDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserPlatformBindDO.java deleted file mode 100644 index 02e191022..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserPlatformBindDO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPartnerUserPlatformBindDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("平台类型:wechat、douyin、weibo") - private String platformType; - - @ApiModelProperty("平台内用户标识") - private String platformUserId; - - @ApiModelProperty("绑定时间") - private Date bindTime; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPhoneLocationDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPhoneLocationDO.java deleted file mode 100644 index 6c368f0b8..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPhoneLocationDO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-30 02:47 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyPhoneLocationDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("手机号") - private String phoneNumber; - - @ApiModelProperty("手机号归属地") - private String phoneAddress; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyWorkflowStageDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyWorkflowStageDO.java deleted file mode 100644 index 79af2ae62..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyWorkflowStageDO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-29 03:53 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HyWorkflowStageDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("阶段code") - private String stageCode; - - @ApiModelProperty("阶段name") - private String stageName; - - @ApiModelProperty("阶段顺序") - private Integer stageOrder; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java deleted file mode 100644 index 415d328ec..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/MDMAreaDO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class MDMAreaDO { - - @ApiModelProperty("id") - private Integer id; - - @ApiModelProperty("业务对象ID") - private String instanceId; - - @ApiModelProperty("地区编码") - private String code; - - @ApiModelProperty("地区名") - private String areaName; - - @ApiModelProperty("地区父级编号") - private String parentCode; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java deleted file mode 100644 index 815eb047a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-07 02:07 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class RegionDO implements Serializable { - @ApiModelProperty("自增ID") - private Long id; - - @ApiModelProperty("区域ID") - private String regionId; - - @ApiModelProperty("名称") - private String name; - - @ApiModelProperty("父区域id") - private String parentId; - - @ApiModelProperty("区域路径") - private String regionPath; - - @ApiModelProperty("未分组标志 0 分组 1 未分组") - private Integer unclassifiedFlag; - - @ApiModelProperty("部门负责人") - private String leaderUserId; - - @ApiModelProperty("排序") - private Integer orderNum; - - @ApiModelProperty("第三方唯一id") - private String thirdDeptId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("创建人") - private String createName; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("更新人") - private String updateName; - - @ApiModelProperty("删除标记") - private Boolean deleted; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java deleted file mode 100644 index aed084113..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import javax.persistence.Table; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-11-09 02:24 - */ -@Table(name = "super_admin_config") -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class SuperAdminConfigDO implements Serializable { - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("超管用户ID") - private String superAdminUserId; - - @ApiModelProperty("删除标志 0-正常 1-删除") - private Integer deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java deleted file mode 100644 index 4c739aaa7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.entity; - -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class SyncEcCustomerDO { - - private Long id; - - private String customername; - - private String customermobile; - - private String followname; - - private String followmobile; - - private Integer channelId; - - private Integer followCount; - - private Integer lineStatus; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerLabelDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerLabelDO.java deleted file mode 100644 index 05e5e6c24..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerLabelDO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.entity; - -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -public class SyncEcCustomerLabelDO { - - - private String mobile; - - private String userPortrait; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java deleted file mode 100644 index d9f6b198a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-08 04:38 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class SysMenuDO implements Serializable { - @ApiModelProperty("自增id") - private Long id; - - @ApiModelProperty("父级菜单") - private Long parentId; - - @ApiModelProperty("菜单编号") - private String code; - - @ApiModelProperty("菜单名称") - private String name; - - @ApiModelProperty("请求地址(前端路由)") - private String path; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("是否已删除") - private Boolean deleted; - - @ApiModelProperty("图标") - private String icon; - - @ApiModelProperty("菜单类型 1菜单 2权限") - private Integer menuType; - - @ApiModelProperty("环境") - private String env; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleDO.java deleted file mode 100644 index 3bae1ec36..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleDO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cool.store.entity; - -import cn.hutool.crypto.digest.MD5; -import com.cool.store.constants.CommonConstants; -import com.cool.store.enums.DataSourceEnum; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-06-08 10:54 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class SysRoleDO implements Serializable { - @ApiModelProperty("自增id") - private Long id; - - @ApiModelProperty("角色id") - private String roleId; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("角色类型 0-同步 1-自建") - private Integer roleType; - - @ApiModelProperty("第三方唯一id") - private String thirdUniqueId; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("创建人") - private String createUser; - - @ApiModelProperty("更新人") - private String updateUser; - - public static SysRoleDO convertSyncDO(String roleName){ - SysRoleDO role = new SysRoleDO(); - role.setRoleId(MD5.create().digestHex(roleName)); - role.setRoleName(roleName); - role.setRoleType(DataSourceEnum.SYNC.getCode()); - role.setDeleted(Boolean.FALSE); - role.setCreateTime(new Date()); - role.setUpdateTime(new Date()); - return role; - } -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleMenuDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleMenuDO.java deleted file mode 100644 index c731536b7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysRoleMenuDO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.entity; - -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * - * @author zhangchenbiao - * @date 2023-05-19 03:01 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class SysRoleMenuDO implements Serializable { - - @ApiModelProperty("自增id") - private Long id; - - @ApiModelProperty("菜单id") - private Long menuId; - - @ApiModelProperty("角色id") - private String roleId; -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java deleted file mode 100644 index 1970d919b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cool.store.entity; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.enterprise.EnterpriseUserDTO; -import com.cool.store.enums.DataSourceEnum; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -/** - * - * @author zhangchenbiao - * @date 2023-06-07 02:07 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class UserRegionMappingDO implements Serializable { - @ApiModelProperty("主键") - private Integer id; - - @ApiModelProperty("映射主键（区域或者是门店）") - private String regionId; - - @ApiModelProperty("用户ID") - private String userId; - - @ApiModelProperty("类型") - private Integer type; - - @ApiModelProperty("删除标识") - private Boolean deleted; - - @ApiModelProperty("创建人") - private String createId; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新人") - private String updateId; - - @ApiModelProperty("更新时间") - private Date updateTime; - - public static List convertSyncDO(String regionId, List departmentUsers){ - if(CollectionUtils.isEmpty(departmentUsers)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (EnterpriseUserDTO departmentUser : departmentUsers) { - UserRegionMappingDO userRegion = new UserRegionMappingDO(); - userRegion.setRegionId(regionId); - userRegion.setUserId(departmentUser.getUserId()); - userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(new Date()); - userRegion.setUpdateTime(new Date()); - userRegion.setDeleted(Boolean.FALSE); - resultList.add(userRegion); - } - return resultList; - } - - public static List convertSyncDO(List regionIds, String userId){ - if(CollectionUtils.isEmpty(regionIds) || StringUtils.isBlank(userId)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (String regionId : regionIds) { - UserRegionMappingDO userRegion = new UserRegionMappingDO(); - userRegion.setRegionId(regionId); - userRegion.setUserId(userId); - userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(new Date()); - userRegion.setUpdateTime(new Date()); - userRegion.setDeleted(Boolean.FALSE); - resultList.add(userRegion); - } - return resultList; - } - - - public static List convertSyncDO(List userList){ - if(CollectionUtils.isEmpty(userList)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (EnterpriseUserDO user : userList) { - List userRegionIds = JSONObject.parseArray(user.getUserRegionIds(), String.class).stream().distinct().collect(Collectors.toList()); - for (String userRegionId : userRegionIds) { - if(StringUtils.isNotBlank(userRegionId)){ - continue; - } - String[] split = userRegionId.split(CommonConstants.PATH_SPILT); - if(split.length == 0){ - continue; - } - UserRegionMappingDO userRegion = new UserRegionMappingDO(); - userRegion.setRegionId(split[split.length-1]); - userRegion.setUserId(user.getUserId()); - userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(new Date()); - userRegion.setUpdateTime(new Date()); - userRegion.setDeleted(Boolean.FALSE); - resultList.add(userRegion); - } - } - return resultList; - } -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java deleted file mode 100644 index 16cf95a3b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.request; - - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.*; -import java.util.List; - -/** - * @Author hxd - * @Date 2023/5/31 11:19 - * @Version 1.0 - */ -@Data -@ApiModel -@Accessors(chain = true) -public class AddLineRequest { - - - @NotBlank(message = "姓名不能为空") - @ApiModelProperty("姓名") - @Size(max = 10,message = "姓名过长") - private String partnerName; - - @Pattern(regexp = "(?:0|86|\\+86)?1[3-9]\\d{9}",message = "手机号码不正确，请检查后重试") - @ApiModelProperty("手机号") - private String mobile; - - @NotBlank(message = "常驻区域为空") - @ApiModelProperty("常驻区域") - private String liveArea; - - @NotBlank(message = "意向区域不能为空") - @ApiModelProperty("意向区域") - private String wantShopArea; - - - /** - * (0不接受调剂、1全国调剂、2省内调剂、3市内调剂)* - */ - @NotNull(message = "是否接受调剂不能为空") - @ApiModelProperty("是否接受调剂") - private Integer acceptAdjustType; - - - @ApiModelProperty("分配招商经理") - private String investmentManager; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java deleted file mode 100644 index 0f76c6ae6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 11:19 - * @Version 1.0 - */ -@Data -@ApiModel -public class AddTagsRequest { - - @ApiModelProperty("加盟申请基本信息ID") - private Long partnerBaseInfoId; - @ApiModelProperty("标签列表") - private List tags; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java deleted file mode 100644 index b7b89ef75..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:58 - * @Version 1.0 - */ -@Data -@ApiModel -public class AdvancedSettingRequest { - - private Long id; - - private String partnerUrl; - - private String tencentVideoAccount; - - private String tencentVideoKey; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AllocationInvestmentManagerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AllocationInvestmentManagerRequest.java deleted file mode 100644 index b364c2d0f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AllocationInvestmentManagerRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:22 - * @Version 1.0 - */ -@Data -@ApiModel -public class AllocationInvestmentManagerRequest { - - private List lineIdList; - - private String userId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ApproveAppointmentReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ApproveAppointmentReq.java deleted file mode 100644 index d159744a3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ApproveAppointmentReq.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-18 19:54 - * @Description: - */ -@ApiModel(description = "同意面试预约") -public class ApproveAppointmentReq { - - @ApiModelProperty(value = "面试安排ID", required = true) - private String interviewPlanId; - @ApiModelProperty(value = "面试官ID", required = true) - private String interviewerId; - - @ApiModelProperty(value = "线索ID", required = true) - private Long partnerLineId; - - public Long getPartnerLineId() { - return partnerLineId; - } - - public void setPartnerLineId(Long partnerLineId) { - this.partnerLineId = partnerLineId; - } - - public String getInterviewPlanId() { - return interviewPlanId; - } - - public void setInterviewPlanId(String interviewPlanId) { - this.interviewPlanId = interviewPlanId; - } - - public String getInterviewerId() { - return interviewerId; - } - - public void setInterviewerId(String interviewerId) { - this.interviewerId = interviewerId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java deleted file mode 100644 index d71637874..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 9:49 - * @Version 1.0 - */ -@Data -@ApiModel -public class BaseUserInfoRequest { - - @ApiModelProperty("partnerId") - private String partnerId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("申请人姓名") - private String username; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域ID") - private String wantShopArea; - - @ApiModelProperty("意向开店区域Name") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("邀请码") - private String inviteCode; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BasicReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BasicReq.java deleted file mode 100644 index ff6d87bec..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BasicReq.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-22 19:31 - * @Description: - */ -@Data -public class BasicReq { - @ApiModelProperty(value = "操作人Id", required = true) - private String operatorId; - - @ApiModelProperty(value = "操作人姓名", required = true) - private String operatorName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BatchTransferInvestmentManagerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BatchTransferInvestmentManagerRequest.java deleted file mode 100644 index 41d2d1c7e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BatchTransferInvestmentManagerRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/8/11 14:30 - * @Version 1.0 - */ -@Data -@ApiModel -public class BatchTransferInvestmentManagerRequest { - - private List lineIds; - - private String userId; - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CallFinishBackReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CallFinishBackReq.java deleted file mode 100644 index 3e6704dc5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CallFinishBackReq.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-08-11 15:46 - * @Description: - */ -@Data -@ApiModel(description = "呼叫信息") -public class CallFinishBackReq { - @ApiModelProperty(value = "请求编号", required = true) - private String transNo; - - @ApiModelProperty(value = "呼叫状态: 1-呼叫接听, 2-呼叫未接听, 3-呼叫失败", required = true) - private Integer callStatus; - - @ApiModelProperty(value = "呼叫失败的情况下必传，说明呼叫失败的原因") - private String failReason; - - @ApiModelProperty(value = "呼叫接听情况下必传，通话开始时间，格式：yyyy-MM-dd HH:mm:ss") - private String callStartTime; - - @ApiModelProperty(value = "呼叫接听情况下必传，通话结束时间，格式：yyyy-MM-dd HH:mm:ss") - private String callEndTime; -} - diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java deleted file mode 100644 index 794bd9ab2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CallRecordBackReq.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(description = "呼叫记录信息") -public class CallRecordBackReq { - - @ApiModelProperty(value = "请求编号", required = true) - private String transNo; - - @ApiModelProperty(value = "录音上传地址", required = true) - private String recordUrl; - - @ApiModelProperty(value = "呼叫状态: 1-呼叫接听, 2-呼叫未接听, 3-呼叫失败", required = true) - private Integer callStatus; - - @ApiModelProperty(value = "呼叫失败的情况下必传，说明呼叫失败的原因") - private String failReason; - - @ApiModelProperty(value = "呼叫接听情况下必传，通话开始时间，格式：yyyy-MM-dd HH:mm:ss") - private String callStartTime; - - @ApiModelProperty(value = "呼叫接听情况下必传，通话结束时间，格式：yyyy-MM-dd HH:mm:ss") - private String callEndTime; - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CallUpReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CallUpReq.java deleted file mode 100644 index 90447ade0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CallUpReq.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-08-10 19:24 - * @Description: - */ -@Data -@ApiModel -public class CallUpReq { - @ApiModelProperty(value = "线索id", required = true) - private String lineId; - - @ApiModelProperty(value = "呼出人用户id", required = true) - private String outgoingUserId; - - @ApiModelProperty(value = "呼出人手机号", required = true) - private String outgoingMobile; - - @ApiModelProperty(value = "接听人用户id", required = true) - private String incomingUserId; - - @ApiModelProperty(value = "接听人手机号", required = true) - private String incomingMobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/City.java b/coolstore-partner-model/src/main/java/com/cool/store/request/City.java deleted file mode 100644 index fe388a2bd..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/City.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/6 16:48 - * @Version 1.0 - */ -@Data -public class City { - - private String name; - - private List area; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getArea() { - return area; - } - - public void setArea(List area) { - this.area = area; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java deleted file mode 100644 index 0583e8508..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 11:01 - * @Version 1.0 - */ -@Data -@ApiModel -public class CloseFollowRequest { - - - @ApiModelProperty("线索ID") - private Long lineId; - @ApiModelProperty("公开拒绝原因") - private String rejectPublicReason; - @ApiModelProperty("真实拒绝原因") - private String rejectRealReason; - @ApiModelProperty("证明文件与凭证") - private List certifyFile; - @ApiModelProperty("通过原因") - private String passReason; - @ApiModelProperty("通过-pass 拒绝-reject") - private String type; - - @ApiModelProperty("是否是拉入黑名单操作，1 是 ，0 不是") - private Integer whetherBlackList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java deleted file mode 100644 index a9c4b0057..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CoolDownFirstLoginFlagDelRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @Author wxp - * @Date 2023/6/21 14:27 - * @Version 1.0 - */ -@Data -@ApiModel -public class CoolDownFirstLoginFlagDelRequest { - - @NotBlank(message = "线索id不能为空") - @ApiModelProperty("线索id") - private Long lineId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java deleted file mode 100644 index a9c238c42..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -@ApiModel(description = "面试预约") -public class CreateAppointmentReq { - @ApiModelProperty(value = "加盟商用户ID", required = true) - private String partnerId; - @ApiModelProperty(value = "面试官id，PC 端招商经理主动预约可以不传") - private String interviewerId; - - @ApiModelProperty(value = "预约开始时间 (YYYY-MM-DD hh:mm:ss)", required = true) - private String startBookingTime; - - @ApiModelProperty(value = "预约结束时间 (YYYY-MM-DD hh:mm:ss)", required = true) - private String endBookingTime; - @ApiModelProperty(value = "线索id(如果面试官id，会根据加盟商id和线索id查询面试官)", required = true) - private Long partnerLineId; - - public String getPartnerId() { - return partnerId; - } - - public void setPartnerId(String partnerId) { - this.partnerId = partnerId; - } - - public String getInterviewerId() { - return interviewerId; - } - - public void setInterviewerId(String interviewerId) { - this.interviewerId = interviewerId; - } - - public Long getPartnerLineId() { - return partnerLineId; - } - - public void setPartnerLineId(Long partnerLineId) { - this.partnerLineId = partnerLineId; - } - - public String getStartBookingTime() { - return startBookingTime; - } - - public void setStartBookingTime(String startBookingTime) { - this.startBookingTime = startBookingTime; - } - - public String getEndBookingTime() { - return endBookingTime; - } - - public void setEndBookingTime(String endBookingTime) { - this.endBookingTime = endBookingTime; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java deleted file mode 100644 index 3aac56002..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.cool.store.request; - -import com.cool.store.request.data.flow.IdName; -import com.cool.store.request.data.flow.KeyText; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-14 14:18 - * @Description: - */ -@Data -@ApiModel(description = "发起加盟商资质审核请求") -public class CreateQualifyVerifyReq { - @ApiModelProperty(value = "线索id", required = true) - private String lineId; - - @ApiModelProperty(value = "会议安排id", required = true) - private String interviewPlanId; - - @ApiModelProperty(value = "会议id", required = true) - private String interviewId; - - @ApiModelProperty(value = "加盟商id", required = true) - private String partnerId; - - @ApiModelProperty(value = "开发主管用户id", required = true) - private String devtDirectorId; - - @ApiModelProperty(value = "面试表现记录", required = true) - private String summary; - - @ApiModelProperty(value = "加盟商类型", required = true) - private KeyText fraType; - - @ApiModelProperty(value = "是否是新加盟商", example = "YES") - private KeyText whetherNewFranchisee; - - @ApiModelProperty(value = "是否需要设备分期", example = "yes") - private KeyText needEquipmentInstallment; - - @ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes") - private KeyText fraFeePayMethod; - - @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}") - private KeyText innerbrandtype; - - @ApiModelProperty(value = "请求来源", required = true) - private KeyText fraSource; - - @ApiModelProperty(value = "合作关系", required = true) - private KeyText partnership; - - @ApiModelProperty(value = "意向人email", required = true) - private String intendedEmail; - - @ApiModelProperty(value = "意向人联系地址", required = true) - private String intendedAddress; - - @ApiModelProperty(value = "意向人身份证号", required = true) - private String intendedDCardNum; - - @ApiModelProperty(value = "意向签约时间", required = true, example = "YYYY-MM-DD") - private String wantSignTime; - - @ApiModelProperty(value = "数据来源", required = true) - private String dataSource; - - @ApiModelProperty(value = "加盟费", required = true) - private Integer partnerFee; - - @ApiModelProperty(value = "保证金", required = true) - private Integer securityFund; - - @ApiModelProperty(value = "技术服务费", required = true) - private Integer technicalServiceFee; - - @ApiModelProperty(value = "意向金金额", required = true) - private Integer intentionMoney; - - @ApiModelProperty(value = "意向签约人姓名", required = true) - private String intentionSignerUsername; - - @ApiModelProperty(value = "意向签约人手机号", required = true) - private String intentionSignerMobile; - - @ApiModelProperty(value = "意向签约人学历", required = true) - private KeyText intentionEdu; - - @ApiModelProperty(value = "实控人姓名", required = true) - private String realControlUsername; - - @ApiModelProperty(value = "实控人身份证", required = true) - private String realControlIdcard; - - @ApiModelProperty(value = "实控人与签约人关系", required = true) - private KeyText signerRealControlRelation; - - @ApiModelProperty(value = "其他实控人与签约人关系") - private String signerOtherRealControlRelation; - - @ApiModelProperty(value = "实控人与签约人关系证明(文件上传地址，多个以英文逗号隔开)", required = true) - private String signerRealControlRelationCert; - - @ApiModelProperty(value = "省", required = true) - private IdName linkProv; - - @ApiModelProperty(value = "省编码", required = true) - private String provID; - - @ApiModelProperty(value = "市", required = true) - private IdName linkCity; - - @ApiModelProperty(value = "市编码", required = true) - private String cityID; - - @ApiModelProperty(value = "所属大区", required = true) - private IdName linkOrgRegion; - - @ApiModelProperty(value = "业务战区", required = true) - private IdName linkbuArea; - - @ApiModelProperty(value = "实控人手机号", required = true) - private String skrPhone; - - @ApiModelProperty(value = "是否由会销发起审批", required = false) - private Boolean whetherExhibition; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CustomerInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CustomerInfoRequest.java deleted file mode 100644 index 0d3cd8871..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CustomerInfoRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -import java.util.Date; - -/** - * @author hxd - * @since 2023/2/28 - */ -@Data -public class CustomerInfoRequest { - - - private Long crmId; - - private String mobile; - - private String name; - - private String channel; - - private String followUserMobile; - - private Long lastFollowUserId; - - private String followUserName; - - - private String labelIds; - - private String ecWantShopArea; - - - private String crmCreateTime; - - private Date updateTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java deleted file mode 100644 index 8dcda1890..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/EditBaseInfoRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: EditBaseInfoRequest - * @Description: - * @date 2023-09-13 10:29 - */ -@Data -public class EditBaseInfoRequest { - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("姓名") - private String username; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("意向区域") - private String wantShopArea; - - @ApiModelProperty("调剂方式") - private Integer acceptAdjustType; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/EnterpriseUserRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/EnterpriseUserRequest.java deleted file mode 100644 index cf5dbe0b7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/EnterpriseUserRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.request; - - -import com.cool.store.entity.EnterpriseUserDO; -import lombok.Data; - -import java.util.List; - -/** - * @ClassName EnterpriseUserDO - * @Description 用于封装EnterpriseUserDO和部门字段 - * @author 首亮 - */ -@Data -public class EnterpriseUserRequest { - - private EnterpriseUserDO enterpriseUserDO; - - private String department; - - private String departments; - - private List departmentLists; - - private List leaderInDepts; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/EntrustOthersReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/EntrustOthersReq.java deleted file mode 100644 index c4a965a61..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/EntrustOthersReq.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-09 15:41 - * @Description: - */ -@Data -@ApiModel -public class EntrustOthersReq { - @ApiModelProperty("会议安排编号") - private String interviewPlanId; - - @ApiModelProperty("新面试官编号") - private String newInterviewerId; - - @ApiModelProperty(value = "线索ID", required = true) - private Long partnerLineId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FinishInterviewReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FinishInterviewReq.java deleted file mode 100644 index fd0043d65..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/FinishInterviewReq.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-12 17:43 - * @Description: - */ -@Data -@ApiModel -public class FinishInterviewReq { - @ApiModelProperty("会议安排编号") - private String interviewPlanId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetFreeBusyListReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetFreeBusyListReq.java deleted file mode 100644 index d64656c6e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetFreeBusyListReq.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:08 - * @Description: - */ -@Data -@ApiModel -public class GetFreeBusyListReq { - @ApiModelProperty(value = "开始时间", required = true) - private String startDate; - @ApiModelProperty(value = "结束时间",required = true) - private String endDate; - @ApiModelProperty(value = "线索id", required = true) - private String lineId; - @ApiModelProperty(value = "加盟商用户ID", required = true) - private String partnerId; - @ApiModelProperty(value = "面试官ID", required = false) - private String interviewerId; - @ApiModelProperty(value = "是否是PC端请求", required = true) - private Boolean whetherPC; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionListReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionListReq.java deleted file mode 100644 index 94167076c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionListReq.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.cool.store.request; - -import com.cool.store.common.PageBasicInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @Author: hxd - * @Date: 2023-06-06 15:50 - * @Description: - */ -@Data -@ApiModel -@Accessors(chain = true) -public class GetInterviewInspectionListReq extends PageBasicInfo { - - @ApiModelProperty("面试官姓名") - private String interviewerName; - - - @ApiModelProperty("面试官手机号") - private String interviewerMobile; - - - @ApiModelProperty("被面试人姓名") - private String intervieweeName; - - - @ApiModelProperty("被面试人手机号") - private String intervieweeMobile; - - - @ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）") - private Integer status; - - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - - @ApiModelProperty("面试开始时间") - private String startTime; - - - @ApiModelProperty("面试结束时间") - private String endTime; - - /** - * 地区编码 - */ - private List codeList; - - private String userId; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionResultListReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionResultListReq.java deleted file mode 100644 index 87f129d7b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewInspectionResultListReq.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.request; - - -import com.cool.store.common.PageBasicInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @Author: hxd - * @Date: 2023-06-06 15:50 - * @Description: - */ -@Data -@ApiModel -@Accessors(chain = true) -public class GetInterviewInspectionResultListReq extends PageBasicInfo { - - @ApiModelProperty("被面试人姓名") - private String intervieweeName; - - - @ApiModelProperty("被面试人手机号") - private String intervieweeMobile; - - - @ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）") - private Integer status; - - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - - @ApiModelProperty("面试开始时间") - private String startTime; - - - @ApiModelProperty("面试结束时间") - private String endTime; - - /** - * 地区编码 - */ - private List codeList; - - private String userId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewListReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewListReq.java deleted file mode 100644 index 9e8d2cd0e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetInterviewListReq.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.request; - -import com.cool.store.common.PageBasicInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-06 15:50 - * @Description: - */ -@Data -@ApiModel -public class GetInterviewListReq extends PageBasicInfo { - @ApiModelProperty("加盟商姓名") - private String partnerName; - @ApiModelProperty("加盟商手机号") - private String partnerMobile; - @ApiModelProperty("房间号") - private String roomId; - @ApiModelProperty("面试官姓名") - private String interviewerName; - @ApiModelProperty("面试官手机号") - private String interviewerMobile; - @ApiModelProperty("房间状态:0待开放;1已开放; 2已关闭") - private Integer roomStatus; - @ApiModelProperty("开始时间") - private String startTime; - @ApiModelProperty("结束时间") - private String endTime; - @ApiModelProperty("删除标识") - private Boolean deleted; - @ApiModelProperty("面试状态 0待预约;1预约面试待审核2待面试;3已开始;4待审核;5审批中;6审批通过;7拒绝8.超时未预约") - private Integer status; - @ApiModelProperty("0未参加，1参加") - private Integer isPartnerInterview; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetTagRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetTagRequest.java deleted file mode 100644 index d1dba4f3d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetTagRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author hxd - */ -@Data -@Accessors(chain = true) -public class GetTagRequest { - private Long groupId; - private String groupName; - private Integer sort; - private Integer type; - private List list; - - @Data - @Accessors(chain = true) - public static class GetTagItem{ - private Long classId; - private String className; - private int sort; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/GetTipsInfoReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/GetTipsInfoReq.java deleted file mode 100644 index 9ccc69a68..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/GetTipsInfoReq.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.request; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -/** - * @Author: young.yu - * @Date: 2023-06-28 15:05 - * @Description: - */ -@Data -@ApiModel -public class GetTipsInfoReq { - @ApiModelProperty("线索id") - private String partnerLineId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/IndustryCognitionInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/IndustryCognitionInfoRequest.java deleted file mode 100644 index f72bfd05b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/IndustryCognitionInfoRequest.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:14 - * @Version 1.0 - */ -@Data -@ApiModel -public class IndustryCognitionInfoRequest { - - @ApiModelProperty("线索表ID") - private Long partnerLineId; - - @ApiModelProperty("加盟商C端用户表ID partnerId ") - private String partnerId; - - @ApiModelProperty("学历") - private String education; - - @ApiModelProperty("工作年限") - private String workYear; - - @ApiModelProperty("是否具有工作经验") - private Integer isHaveWorkExp; - - @ApiModelProperty("工作或经商经验") - private String workExp; - - @ApiModelProperty("是否是消费者") - private Integer isConsumer; - - @ApiModelProperty("其他品牌") - private String otherBand; - - @ApiModelProperty("品牌优势") - private String brandStrength; - - @ApiModelProperty("需要改进") - private String needImprove; - - @ApiModelProperty("优势") - private String strength; - - @ApiModelProperty("劣势") - private String weakness; - - @ApiModelProperty("提交标识 提交-true 暂存-false") - private Boolean submitFlag; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java deleted file mode 100644 index 4009e80c5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:44 - * @Version 1.0 - */ -@Data -@ApiModel -public class IntentAreaSettingRequest { - - @ApiModelProperty("意向区域-intent 开发区域=dev") - private String type; - @ApiModelProperty("Id") - private Long id; - @ApiModelProperty("战区名称") - private String zoneName; - @ApiModelProperty("组织机构ID集合") - private List orgIdList; - @ApiModelProperty("开放区域id集合") - private List openAreaIdList; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineBlackListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineBlackListRequest.java deleted file mode 100644 index 15ec26858..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineBlackListRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:50 - * @Version 1.0 - */ -@Data -@ApiModel -public class LineBlackListRequest { - - @ApiModelProperty("线索ID") - private Long lineId; - - @ApiModelProperty("加入/移出 黑名单原因") - private String cause; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java deleted file mode 100644 index 7dfe7979e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:08 - * @Version 1.0 - */ -@Data -@ApiModel -public class LineRequest extends PageInfoRequest{ - - - @ApiModelProperty("用户名关键字") - private String userNameKeyword; - - @ApiModelProperty("手机号关键字") - private String phoneKeyword; - - @ApiModelProperty("意向区域") - private String intentArea; - - @ApiModelProperty("调剂类型") - private Integer acceptAdjustType; - - @ApiModelProperty("更新开始时间") - private String updateStartTime; - - @ApiModelProperty("更新结束时间") - private String updateEndTime; - - @ApiModelProperty("创建开始时间") - private String createStartTime; - - @ApiModelProperty("创建结束时间") - private String createEndTime; - - @ApiModelProperty("线索id") - private Long lineId; - - - /** - * pageTurn: previous(上一页) next(下一页) - */ - @ApiModelProperty("排序顺序") - private String pageTurn; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MDMUploadFileReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MDMUploadFileReq.java deleted file mode 100644 index 9797eb59a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MDMUploadFileReq.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -@Data -@ApiModel -public class MDMUploadFileReq { - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MobileUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MobileUpdateRequest.java deleted file mode 100644 index 57b92a74b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MobileUpdateRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @Author wxp - * @Date 2023/5/31 11:01 - * @Version 1.0 - */ -@Data -@ApiModel -public class MobileUpdateRequest { - - - @NotBlank(message = "手机号code不能为空") - @ApiModelProperty("手机号code") - private String mobileCode; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ModifyInterviewTimeReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ModifyInterviewTimeReq.java deleted file mode 100644 index c22d13788..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ModifyInterviewTimeReq.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-12 17:43 - * @Description: - */ -@Data -@ApiModel -public class ModifyInterviewTimeReq { - @ApiModelProperty("会议安排编号") - private String interviewPlanId; - @ApiModelProperty("新预约开始时间") - private String newStartBookingTime; - @ApiModelProperty("新预约结束时间") - private String newEndBookingTime; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java deleted file mode 100644 index 3d748c4d4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:27 - * @Version 1.0 - */ -@Data -@ApiModel -public class OpenAreaRequest { - - @ApiModelProperty("开发区域ID集合") - private List idList; - - @ApiModelProperty("开放区域状态") - private String status; - - @ApiModelProperty("背景banner") - private String backgroundBanner; - - @ApiModelProperty("详细Banner") - private String detailBanner; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PageInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PageInfoRequest.java deleted file mode 100644 index 780ec3281..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PageInfoRequest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 20:33 - * @Version 1.0 - */ -@Data -public class PageInfoRequest { - - private Integer pageSize; - - private Integer pageNum; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java deleted file mode 100644 index d18451ffe..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:09 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerBaseInfoRequest { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("姓名") - private String username; - - @ApiModelProperty("1男 2女") - private Integer sex; - - @ApiModelProperty("民族") - private String nation; - - @ApiModelProperty("出生日期") - private Date birthdate; - - @ApiModelProperty("身份证") - private String idCard; - - @ApiModelProperty("身份证正面") - private String idCardPhotoFront; - - @ApiModelProperty("身份证反面") - private String idCardPhotoBlack; - - @ApiModelProperty("住址") - private String liveAddress; - - - @ApiModelProperty("提交标识 提交-true 暂存-false") - private Boolean submitFlag; - - - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java deleted file mode 100644 index acd1061c6..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkInfoRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:27 - * @Version 1.0 - */ -@ApiModel -@Data -public class PartnerClerkInfoRequest { - - - @ApiModelProperty("线索表ID") - private Long partnerLineId; - - @ApiModelProperty("加盟商C端用户表ID partnerId ") - private String partnerId; - - @ApiModelProperty("加盟商店员信息列表") - private List partnerClerkRequestList; - - @ApiModelProperty("提交标识 提交-true 暂存-false") - private Boolean submitFlag; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java deleted file mode 100644 index 63dae051b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerClerkRequest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:19 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerClerkRequest { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("伙伴姓名") - private String username; - - @ApiModelProperty("关系") - private String relationship; - - @ApiModelProperty("年龄") - private Integer age; - - @ApiModelProperty("选择原因") - private String chooseReason; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java deleted file mode 100644 index 26cd35ac5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import org.springframework.boot.context.properties.bind.DefaultValue; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/8/16 16:57 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerIntentApplyRequest { - private String type; - private String keyword; - private Integer callStatus; - private List userPortraitIdList; - private Long lastFollowStartTime; - private Long lastFollowEndTime; - private List userChannelIdList; - - private Integer pageNumber = 1; - private Integer pageSize = 10; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java deleted file mode 100644 index adaad2a43..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:14 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerIntentInfoRequest { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("线索表ID") - private Long partnerLineId; - - @ApiModelProperty("加盟商C端用户表ID partnerId ") - private String partnerId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("详细地址") - private String detailedAddress; - - @ApiModelProperty("邮箱地址") - private String email; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("是否有意向铺位") - private Integer isHaveWantShop; - - @ApiModelProperty("意向铺位信息,json字段,最多5个") - private List wantShopInfo; - - @ApiModelProperty("最大预算") - private String maxBudget; - - @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代") - private String moneySource; - - @ApiModelProperty("资金证明") - private List moneyProve; - - @ApiModelProperty("征信证明") - private List creditProve; - - @ApiModelProperty("学历") - private String education; - - @ApiModelProperty("工作年限") - private String workYear; - - @ApiModelProperty("是否具有工作经验") - private Integer isHaveWorkExp; - - @ApiModelProperty("工作或经商经验") - private String workExp; - - @ApiModelProperty("是否是消费者") - private Integer isConsumer; - - @ApiModelProperty("其他品牌") - private String otherBand; - - @ApiModelProperty("品牌优势") - private String brandStrength; - - @ApiModelProperty("需要改进") - private String needImprove; - - @ApiModelProperty("优势") - private String strength; - - @ApiModelProperty("劣势") - private String weakness; - - @ApiModelProperty("提交标识 提交-true 暂存-false") - private Boolean submitFlag; - - private Integer acquaintanceFlag; - - private String acquaintanceName; - - private Integer acquaintanceRelationshipType; - - private String otherRelationshipType; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java deleted file mode 100644 index cab60b301..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerUserInfoRequest.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 9:49 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerUserInfoRequest { - - @ApiModelProperty("partnerId") - private String partnerId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("申请人姓名") - private String username; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域ID") - private String wantShopArea; - - @ApiModelProperty("意向开店区域Name") - private Long wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("邀请码") - private String inviteCode; - - @ApiModelProperty("店铺编码") - private String shopCode; - - @ApiModelProperty("店铺名称") - private String shopName; - - @ApiModelProperty("店铺ID") - private String shopId; - - @ApiModelProperty("推荐加盟商id") - private String recommendPartnerId; - - @ApiModelProperty("推荐加盟商姓名") - private String recommendPartnerName; - - @ApiModelProperty("推荐加盟商手机号") - private String recommendPartnerMobile; - - @ApiModelProperty("招商经理ID") - private String investmentManager; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerWantShopInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerWantShopInfoRequest.java deleted file mode 100644 index 38c63882e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerWantShopInfoRequest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author wxp - * @Date 2023/5/30 15:14 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerWantShopInfoRequest { - - @ApiModelProperty("线索表ID") - private Long partnerLineId; - - @ApiModelProperty("加盟商C端用户表ID partnerId ") - private String partnerId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("是否有意向铺位") - private Integer isHaveWantShop; - - @ApiModelProperty("意向铺位信息,json字段,最多5个") - private List wantShopInfo; - - @ApiModelProperty("最大预算") - private String maxBudget; - - @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代") - private String moneySource; - - @ApiModelProperty("资金证明") - private List moneyProve; - - @ApiModelProperty("提交标识 提交-true 暂存-false") - private Boolean submitFlag; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java deleted file mode 100644 index 1e5930d82..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:27 - * @Version 1.0 - */ -@Data -@ApiModel -public class PrivateSeaLineListRequest extends PageInfoRequest { - - @ApiModelProperty("【用户姓名】、【手机号】、【招商经理姓名】或【招商经理手机号】 搜索关键字") - private String keyword; - - @ApiModelProperty("name:表示用户姓名/招商经理姓名 mobile 用户手机号/招商经理手机号") - private String keywordType; - - @ApiModelProperty("一级下拉列表选择当前意向阶段") - private String workflowStage; - - @ApiModelProperty("二级下拉列表可选项为当前一级下拉列表选中的意向阶段的状态") - private String workflowStatus; - - @ApiModelProperty("截止时间_开始") - private String deadlineStart; - - @ApiModelProperty("截止时间_结束") - private String deadlineEnd; - - @ApiModelProperty("调剂方式") - private Integer acceptAdjustType; - - @ApiModelProperty("加盟商姓名") - private String partnerName; - - @ApiModelProperty("加盟商手机号") - private String partnerMobile; - - @ApiModelProperty("招商经理ID") - private String investmentManagerId; - - @ApiModelProperty("意向区域（type为空的时候不需要传值）") - private String intentAreaId; - - @ApiModelProperty("意向区域 包含-contains/不包含-notContains/为空-blank") - private String intentAreaQueryType; - - @ApiModelProperty("【推荐店铺编码】、【推荐店铺名称】、【加盟商姓名】或【手机号】") - private String storeKeyword; - @ApiModelProperty("【storeCode -推荐店铺编码】、【storeName 推荐店铺名称】、【partnerName 加盟商姓名】或【partnerMobile 手机号】") - private String storeKeywordType; - - @ApiModelProperty("用户画像ID列表(type为空的时候不需要传值)") - private List userPortraitIdList; - - @ApiModelProperty("用户画像 包含-contains/不包含-notContains/为空-blank") - private String userPortraitQueryType; - - @ApiModelProperty("线索来源ID列表(type为空的时候不需要传值)") - private List userChannelIdList; - - @ApiModelProperty("线索来源 包含-contains/不包含-notContains/为空-blank") - private String userChannelQueryType; - - @ApiModelProperty("更新开始时间") - private String updateStartTime; - - @ApiModelProperty("更新结束时间") - private String updateEndTime; - - @ApiModelProperty("创建时间_开始") - private String lineStartTime; - - @ApiModelProperty("创建时间_结束") - private String lineEndTime; - - @ApiModelProperty("线索id") - private Long lineId; - - @ApiModelProperty("是否会销中") - private Boolean whetherInExhibition; - - /** - * deadline 截至时间 - * updateTime 更新时间 - * allotTime 分配时间 - */ - @ApiModelProperty("排序字段") - private String sortField; - - /** - * sortOrder: descend(降序) ascend(升序) - */ - @ApiModelProperty("排序顺序") - private String sortOrder; - - /** - * pageTurn: previous(上一页) next(下一页) - */ - @ApiModelProperty("排序顺序") - private String pageTurn; - - @ApiModelProperty("招商经理用户ids") - private List userIdList; - - @ApiModelProperty("开发经理用户ids") - private List developmentManagerList; - - private String intentAreaName; - - private Integer limit1; - - private Integer limit2; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java deleted file mode 100644 index be49a5e0e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@Api("资质审核回调入参") -public class QualificationCallbackReq { - - @ApiModelProperty(value = "审核流程id", required = true) - private String instanceId; - - @ApiModelProperty(value = "流程状态 已完成：FINISHED, 已作废：CANCELED", required = true) - private String instanceStatus; - - @ApiModelProperty(value = "意向签约人", required = true) - private String intendedSigner; - - @ApiModelProperty(value = "审核通过时间", required = true) - private long modifiedTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java deleted file mode 100644 index 08be52e8c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-09 15:41 - * @Description: - */ -@Data -@ApiModel -public class QueryByInterviewPlanIdReq { - @ApiModelProperty("会议计划编号") - private String interviewPlanId; - - @ApiModelProperty(value = "是否是需要查询战区主管的页面", required = true) - private Boolean needDevelopmentDirector; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ReInterviewReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ReInterviewReq.java deleted file mode 100644 index 28e17bf48..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ReInterviewReq.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author: young.yu - * @Date: 2023-06-19 15:31 - * @Description: - */ - -@Data -@ApiModel(description = "重新面试") -public class ReInterviewReq { - @ApiModelProperty(value = "会议安排ID", required = true, example = "12345") - private String interviewPlanId; - - @ApiModelProperty(value = "重新面试原因", required = true, example = "候选人前次面试未通过") - private String reason; - - @ApiModelProperty(value = "证明文件地址（多个文件英文逗号隔开）", example = "https://example.com/file1.pdf,https://example.com/file2.pdf") - private String certifyFile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RejectInterviewReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RejectInterviewReq.java deleted file mode 100644 index eb8f62c65..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RejectInterviewReq.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(description = "拒绝面试") -public class RejectInterviewReq extends BasicReq{ - @ApiModelProperty(value = "会议安排ID", required = true, example = "12345") - private String interviewPlanId; - - @ApiModelProperty(value = "线索ID", required = true, example = "67890") - private String lineId; - - @ApiModelProperty(value = "会议ID", required = true, example = "54321") - private String interviewId; - - @ApiModelProperty(value = "公开拒绝原因", required = true, example = "候选人不符合岗位要求") - private String rejectPublicReason; - - @ApiModelProperty(value = "真实拒绝原因", required = true, example = "候选人技术能力不足") - private String rejectRealReason; - - @ApiModelProperty(value = "证明文件地址（多个文件英文逗号隔开）", example = "https://example.com/file1.pdf,https://example.com/file2.pdf") - private String certifyFile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java deleted file mode 100644 index d4f361955..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.cool.store.request; - -import com.cool.store.request.data.flow.IdName; -import com.cool.store.request.data.flow.KeyText; -import com.cool.store.request.data.flow.SkrRelshipProve; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-14 15:06 - * @Description: - */ -@Data -public class RpcCreateQualifyVerifyReq { - - @lombok.Data - public class Data { - - @ApiModelProperty(value = "意向签约时间", required = true) - private String intendedSignDate; - - @ApiModelProperty(value = "请求来源", required = false) - private KeyText fraSource; - - @ApiModelProperty(value = "保证金（元）", required = true, example = "5000") - private Integer amtDeposit; - - @ApiModelProperty(value = "授权码", required = true) - private String authCode; - - @ApiModelProperty(value = "意向签约人", required = true) - private String intendedSigner; - - @ApiModelProperty(value = "意向签约人手机号", required = true) - private String intendedSignerTel; - - @ApiModelProperty(value = "系统来源", required = false) - private String systemsource; - - @ApiModelProperty(value = "合作关系", required = true) - private KeyText partnership; - - @ApiModelProperty(value = "所属大区", required = true) - private IdName linkOrgRegion; - - @ApiModelProperty(value = "省", required = true) - private IdName linkProv; - - @ApiModelProperty(value = "省编码", required = true) - private String provID; - - @ApiModelProperty(value = "市", required = true) - private IdName linkCity; - - @ApiModelProperty(value = "市编码", required = true) - private String cityID; - - @ApiModelProperty(value = "加盟商类型", required = true) - private KeyText fraType; - - @ApiModelProperty(value = "是否是新加盟商", example = "YES") - @JsonProperty("IsNewFranchisee") - private KeyText IsNewFranchisee; - - @ApiModelProperty(value = "是否需要设备分期", example = "yes") - private KeyText needEquipmentInstallment; - - @ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes") - private KeyText fraFeePayMethod; - - @ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}") - private KeyText innerbrandtype; - - @ApiModelProperty(value = "意向人email", required = true) - private String intendedEmail; - - @ApiModelProperty(value = "意向人联系地址", required = true) - private String intendedAddress; - - @ApiModelProperty(value = "意向人身份证号", required = true) - private String intendedDCardNum; - - @ApiModelProperty(value = "签约人学历", required = true) - private KeyText signerEdu; - - @ApiModelProperty(value = "实控人", required = true) - private String skrName; - - @ApiModelProperty(value = "实控人身份证号", required = true) - private String skrIDCard; - - @ApiModelProperty(value = "实控人与签约人关系", required = true) - private KeyText skrRelship; - - @ApiModelProperty("实控人与签约人关系证明文件") - private List skrRelshipProve; - - @ApiModelProperty("其他实控人与签约人关系") - private String skrRelshipOther; - - @ApiModelProperty(value = "加盟费（元）", required = true) - private Integer amtJoin; - - @ApiModelProperty(value = "技术服务费", required = true) - private Integer amtTechSer; - - @ApiModelProperty(value = "意向金金额", required = true) - private Integer amtIntended; - - @ApiModelProperty(value = "业务战区", required = true) - private IdName linkbuArea; - - @ApiModelProperty(value = "实控人手机号", required = true) - private String skrPhone; - - @ApiModelProperty("客户/招商经理钉钉id") - private String userCustDingUserId; - - @ApiModelProperty("选址开发主管钉钉id") - private String userSiteDevDingUserId; - - } - - @ApiModelProperty(value = "数据体", required = true) - private Data data; - - @ApiModelProperty(value = "钉钉用户id", required = true) - private String dingUserId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcGetMdmTokenReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcGetMdmTokenReq.java deleted file mode 100644 index ae8e202e8..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcGetMdmTokenReq.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.request; - -/** - * @Author: young.yu - * @Date: 2023-06-15 13:28 - * @Description: - */ -public class RpcGetMdmTokenReq { - private String appKey; - private String appSecret; - - public String getAppKey() { - return appKey; - } - - public void setAppKey(String appKey) { - this.appKey = appKey; - } - - public String getAppSecret() { - return appSecret; - } - - public void setAppSecret(String appSecret) { - this.appSecret = appSecret; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SmsSendRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SmsSendRequest.java deleted file mode 100644 index 51c6b39b8..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SmsSendRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -/** - * - * @author zw.yang - * @date 2023-07-03 - * @Description:普通短信发送实体类 - */ -@Data -public class SmsSendRequest { - /** - * 用户账号，必填 - */ - private String account; - /** - * 用户密码，必填 - */ - private String password; - /** - * 短信内容。长度不能超过536个字符，必填 - */ - private String msg; - /** - * 手机号码和变量参数，多组参数使用英文分号;区分，必填 - */ - private String params; - - /** - * 定时发送短信时间。格式为yyyyMMddHHmm，值小于或等于当前时间则立即发送，默认立即发送，选填 - */ - private String sendtime; - /** - * 是否需要状态报告（默认false），选填 - */ - private String report; - /** - * 下发短信号码扩展码，纯数字，建议1-3位，选填 - */ - private String extend; - /** - * 该条短信在您业务系统内的ID，如订单号或者短信发送记录流水号，选填 - */ - private String uid; - - public SmsSendRequest(String account, String password, String msg, String params) { - this.account = account; - this.password = password; - this.msg = msg; - this.params = params; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java deleted file mode 100644 index dfb6598da..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/StageCountRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 19:50 - * @Version 1.0 - */ -@Data -@ApiModel -public class StageCountRequest extends PageInfoRequest { - - @ApiModelProperty("类型 待处理-Pending 待跟进-follow") - private String type; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TRTCVideoCallBackReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TRTCVideoCallBackReq.java deleted file mode 100644 index 8280551a0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/TRTCVideoCallBackReq.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.request; - -import com.cool.store.dto.trtc.VideoCallBackEventInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@ApiModel(description = "腾讯音视频录制文件上传回调") -public class TRTCVideoCallBackReq { - - @ApiModelProperty("回调通知的事件类型，311 为音视频上传事件") - private String EventType; - - @ApiModelProperty("事件信息") - private VideoCallBackEventInfo EventInfo; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TestRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TestRequest.java deleted file mode 100644 index 27fb6893f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/TestRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/6 16:21 - * @Version 1.0 - */ -@Data -public class TestRequest { - - private String name; - - private List city; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java deleted file mode 100644 index 07c11a6e1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/TransferInvestmentManagerRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.request; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:22 - * @Version 1.0 - */ -@Data -@ApiModel -public class TransferInvestmentManagerRequest { - - private Long lineId; - - private String userId; - - private String userName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java deleted file mode 100644 index 145c40467..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/UserOnlineStatusRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cool.store.request; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/10/20 10:59 - * @Version 1.0 - */ -@Data -public class UserOnlineStatusRequest { - - private Integer onlineStatus; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java deleted file mode 100644 index d58220b70..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.request; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/21 22:07 - * @Version 1.0 - */ -@Data -public class WantShopInfoRequest { - - - private ShopInfo shopInfo; - - - private String uuid; - - - - @Data - static class ShopInfo{ - private ShopAddress shopAddress; - - private String storeIsTakeDown; - - private String takeDown; - - } - - @Data - static class ShopAddress{ - - private String address; - - private String longitude; - - private String latitude; - - } - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java deleted file mode 100644 index f1f62fe3e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/beauty/AddBeautyCameraSettingRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.request.beauty; - -import com.cool.store.entity.BeautyCameraSettingDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author zhangchenbiao - * @FileName: AddBeautyCameraSettingRequest - * @Description: 新增美颜配置 - * @date 2023-09-11 14:31 - */ -@Data -public class AddBeautyCameraSettingRequest { - - @ApiModelProperty("美颜度") - private Integer beauty; - - @ApiModelProperty("明亮度") - private Integer brightness; - - @ApiModelProperty("红润") - private Integer ruddy; - - - public static BeautyCameraSettingDO convertDO(String userId, AddBeautyCameraSettingRequest request){ - BeautyCameraSettingDO result = new BeautyCameraSettingDO(); - result.setUserId(userId); - result.setBeauty(request.getBeauty()); - result.setBrightness(request.getBrightness()); - result.setRuddy(request.getRuddy()); - result.setCreateTime(new Date()); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/IdName.java b/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/IdName.java deleted file mode 100644 index b9f7204da..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/IdName.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.request.data.flow; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 800 发起审批入参用 - * 对应 800 系统中需要入参格式为 - * "linkProv": { - * "id": "1645610037222441004", - * "name": "广东省" - * }, - * 的地方 - * 暂时使用，后期应该使用各字段对应的枚举类 - */ -@Data -public class IdName { - - @ApiModelProperty(value = "id", required = true) - private String id; - - @ApiModelProperty(value = "name", required = true) - private String name; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/KeyText.java b/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/KeyText.java deleted file mode 100644 index 20f0bbe2a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/KeyText.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.request.data.flow; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 800 发起审批入参用 - * 对应 800 系统中需要入参格式为 - * "fraType": { - * "key": "LEGAL", - * "text": "法人" - * }, - * 的地方 - * 暂时使用，后期应该使用各字段对应的枚举类 - */ -@Data -public class KeyText { - - @ApiModelProperty(value = "id", required = true) - private String key; - - @ApiModelProperty(value = "text", required = true) - private String text; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/SkrRelshipProve.java b/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/SkrRelshipProve.java deleted file mode 100644 index 47fa4b1b2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/data/flow/SkrRelshipProve.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.request.data.flow; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 实控人与签约人关系证明文件 - */ -@Data -public class SkrRelshipProve { - - @ApiModelProperty("id") - private String id; - - @ApiModelProperty("文件名") - private String name; - - @ApiModelProperty("大小") - private String size; - - @ApiModelProperty("文件后缀") - private String suffix; - - @ApiModelProperty("文件类型") - private String type; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/event/CreateSingleEventRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/event/CreateSingleEventRequest.java deleted file mode 100644 index 2f3eb1876..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/event/CreateSingleEventRequest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.request.event; - -import lombok.Builder; -import lombok.Data; - -/** - * @author Fun Li 2023/10/23 10:41 - * @version 1.0 - */ -@Data -@Builder -public class CreateSingleEventRequest { - - /** - * 事件 id - */ - private String thirdPartyId; - - /** - * 系统来源 - */ - private String bizSource; - - /** - * 事件类型 - */ - private String eventType; - - /** - * 事件请求内容 - */ - private String content; - - /** - * 事件主题，可选 - */ - private String subject; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/event/SendMsgRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/event/SendMsgRequest.java deleted file mode 100644 index d2519a80a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/event/SendMsgRequest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.request.event; - -import lombok.Builder; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @author Fun Li 2023/10/23 11:27 - * @version 1.0 - * 携带消息参数 - */ -@Data -@Builder -public class SendMsgRequest { - - /** - * 消息参数，短信为 手机号：参数1,参数2 (按顺序)，飞书消息卡片为 参数名：参数 - */ - private Map cardParams; - - /** - * FEISHU 或者 SHORT_MESSAGE - */ - private String platform; - - /** - * 接收者 id，飞书为 user_id，不是 open_id，短信不填 - */ - private List receiverIds; - - /** - * 加盟商全生命周期只发送这种类型的消息 - */ - private final String msgType = "INTERACTIVE_CARD"; - - private String templateId; - - /** - * 加盟商全生命周期只给个人发送消息 - */ - private final String receiverType = "INDIVIDUAL"; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowLogRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowLogRequest.java deleted file mode 100644 index 60226cdb9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowLogRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cool.store.request.follow; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * @author zhangchenbiao - * @FileName: AddFollowLogRequest - * @Description:新增跟进日志 - * @date 2023-08-08 15:38 - */ -@Data -public class AddFollowLogRequest { - - @NotNull - @ApiModelProperty("线索id") - private Long partnerLineId; - - @NotBlank - @Length(max = 200) - @ApiModelProperty("跟进日志") - private String followLog; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowTaskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowTaskRequest.java deleted file mode 100644 index b822de2a5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/AddFollowTaskRequest.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cool.store.request.follow; - -import com.cool.store.entity.HyFollowTaskDO; -import com.cool.store.enums.FollowTaskStatusEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskPageVO - * @Description:新增跟进任务 - * @date 2023-08-08 14:47 - */ -@Data -public class AddFollowTaskRequest { - - @NotNull - @ApiModelProperty("线索id") - private Long partnerLineId; - - @NotBlank - @Length(max = 50) - @ApiModelProperty("任务标题") - private String taskTitle; - - @NotNull - @Min(0) - @Max(6) - @ApiModelProperty("沟通方式: 0:电话、1:短信、2:微信、3:QQ、4:邮件、5:拜访、6:提醒") - private Integer communicationType; - - @NotBlank - @Length(max = 300) - @ApiModelProperty("计划沟通内容") - private String communicationContent; - - @NotNull - @ApiModelProperty("任务截止时间") - private Date deadline; - - public static HyFollowTaskDO convertDO(AddFollowTaskRequest request){ - HyFollowTaskDO result = new HyFollowTaskDO(); - result.setPartnerLineId(request.getPartnerLineId()); - result.setTaskTitle(request.getTaskTitle()); - result.setCommunicationType(request.getCommunicationType()); - result.setDeadline(request.getDeadline()); - result.setCommunicationContent(request.getCommunicationContent()); - result.setTaskStatus(FollowTaskStatusEnum.TODO.getCode()); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/FollowTaskIdRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/FollowTaskIdRequest.java deleted file mode 100644 index 52b5a0a12..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/FollowTaskIdRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.request.follow; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskPageVO - * @Description:新增跟进任务 - * @date 2023-08-08 14:47 - */ -@Data -public class FollowTaskIdRequest { - - @NotNull - @ApiModelProperty("跟进任务Id") - private Long followTaskId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java deleted file mode 100644 index 3fceba0f4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/follow/UpdateFollowTaskRequest.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cool.store.request.follow; - -import com.cool.store.entity.HyFollowTaskDO; -import com.cool.store.enums.FollowTaskStatusEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskPageVO - * @Description:新增跟进任务 - * @date 2023-08-08 14:47 - */ -@Data -public class UpdateFollowTaskRequest { - - @NotNull - @ApiModelProperty("跟进任务Id") - private Long followTaskId; - - @NotBlank - @Length(max = 50) - @ApiModelProperty("任务标题") - private String taskTitle; - - @NotNull - @Min(0) - @Max(6) - @ApiModelProperty("沟通方式: 0:电话、1:短信、2:微信、3:QQ、4:邮件、5:拜访、6:提醒") - private Integer communicationType; - - @NotBlank - @Length(max = 300) - @ApiModelProperty("计划沟通内容") - private String communicationContent; - - @NotNull - @ApiModelProperty("任务截止时间") - private Date deadline; - - public static HyFollowTaskDO convertDO(Long partnerLineId, String followUserId, UpdateFollowTaskRequest request){ - HyFollowTaskDO result = new HyFollowTaskDO(); - result.setId(request.getFollowTaskId()); - result.setPartnerLineId(partnerLineId); - result.setFollowUserId(followUserId); - result.setTaskTitle(request.getTaskTitle()); - result.setCommunicationType(request.getCommunicationType()); - result.setDeadline(request.getDeadline()); - result.setCommunicationContent(request.getCommunicationContent()); - if(request.getDeadline().getTime() > System.currentTimeMillis()){ - result.setTaskStatus(FollowTaskStatusEnum.TODO.getCode()); - }else{ - result.setTaskStatus(FollowTaskStatusEnum.OVERDUE.getCode()); - } - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java deleted file mode 100644 index 3fd74f2ae..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:58 - * @Version 1.0 - */ -@Data -@ApiModel -public class AdvancedSettingVO { - - private Long id; - - private String partnerUrl; - - private String tencentVideoAccount; - - private String tencentVideoKey; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java deleted file mode 100644 index 2d2ec6b44..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author wxp - * @Date 2023/6/25 9:49 - * @Version 1.0 - */ -@Data -@ApiModel -public class ApplyBaseInfoVO { - - @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") - private String selectAreaStatus; - - @ApiModelProperty("所选省内是否含有开放城市") - private Boolean provinceHasOpenArea; - - @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单") - private Integer lineStatus; - - @ApiModelProperty("线索id") - private Long partnerLineId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BatchTransferVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BatchTransferVO.java deleted file mode 100644 index 9586fe670..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BatchTransferVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.vo; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/8/30 15:16 - * @Version 1.0 - */ -@Data -public class BatchTransferVO { - - private String partnerUserName; - - private String partnerMobile; - - private String errorMessage; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java deleted file mode 100644 index 8c3fda571..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/2 16:06 - * @Version 1.0 - */ -@Data -@ApiModel -public class BlackListVO { - - @ApiModelProperty("线索ID") - private Long id; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("手机号归属地") - private String phoneAddress; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("操作时间") - private String closeTime; - - @ApiModelProperty("操作人ID") - private String closeUserId; - - @ApiModelProperty("操作人名称") - private String closeUserName; - - @ApiModelProperty("结束人员手机号") - private String closeUserPhone; - - @ApiModelProperty("加入黑名单原因") - private String joinBlackReason; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java deleted file mode 100644 index f533bc6ac..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class EnterInterviewVO { - - @ApiModelProperty("userSig 进入会议需要的用户签名") - private String userSign; - - @ApiModelProperty("面试官id") - private String interviewerId; - - @ApiModelProperty("面试官姓名") - private String interviewerName; - - @ApiModelProperty("加盟商姓名") - private String partnerName; - - private Long interviewPlanId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserBaseInfoVO.java deleted file mode 100644 index b44f6a17b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserBaseInfoVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 员工基本信息（名字 + 电话） - */ -@Data -public class EnterpriseUserBaseInfoVO { - - @ApiModelProperty("名字") - private String name; - - @ApiModelProperty("电话") - private String Mobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java deleted file mode 100644 index 1c1e80cb5..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.entity.EnterpriseUserDO; -import com.google.common.collect.Lists; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/15 14:31 - * @Version 1.0 - */ -@Data -public class EnterpriseUserSingleInfoVO { - - private String userId; - - private String userName; - - private String mobile; - - public static List convertVO(List userList){ - if(CollectionUtils.isEmpty(userList)){ - return Lists.newArrayList(); - } - Map userIdMap = new HashMap<>(); - List resultList = new ArrayList<>(); - for (EnterpriseUserDO enterpriseUser : userList) { - String userId = enterpriseUser.getUserId(); - boolean isContains = userIdMap.containsKey(userId); - if(!isContains){ - EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO(); - result.setUserId(userId); - result.setUserName(enterpriseUser.getName()); - result.setMobile(enterpriseUser.getMobile()); - resultList.add(result); - userIdMap.put(userId, userId); - } - } - return resultList; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java deleted file mode 100644 index 2a0a1aa06..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.enums.ContentSubjectEnum; -import com.cool.store.enums.ContentTypeEnum; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class HyContentInfoVO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("内容标题") - private String contentTitle; - - @ApiModelProperty("栏目CODE") - private ContentSubjectEnum subject; - - @ApiModelProperty("类型 image-图文 video-视频") - private ContentTypeEnum contentType; - - @ApiModelProperty("封面URL") - private String cover; - - @ApiModelProperty("状态 0-启用 1-禁用") - private Integer status; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("更新时间") - private String updateTime; - - @ApiModelProperty("新建人ID") - private String createUserId; - - @ApiModelProperty("更新人ID") - private String updateUserId; - - @ApiModelProperty("更新人姓名") - private String updateUserName; - - @ApiModelProperty("更新人电话") - private String updateUserPhone; - - @ApiModelProperty("图文内容或者视频文件URL") - private String content; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/HyOutboundVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/HyOutboundVo.java deleted file mode 100644 index 261ff113d..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/HyOutboundVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author Fun Li 2023/8/9 15:38 - * @version 1.0 - */ -@Data -public class HyOutboundVo { - - @ApiModelProperty("id") - private Long id; - - @ApiModelProperty("外呼手机号码") - private String outboundNumber; - - @ApiModelProperty("编辑人姓名") - private String updaterName; - - @ApiModelProperty("编辑人手机号") - private String updaterMobile; - - @ApiModelProperty("编辑时间") - private Date updateTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java deleted file mode 100644 index 47f17fd2b..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:47 - * @Version 1.0 - */ -@Data -@ApiModel -public class IntentAreaSettingVO { - - private Long id; - - private String zoneName; - - private List orgVOS; - - private Date updateTime; - - private String updateUserId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java deleted file mode 100644 index ab8af8074..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewDetailInfoVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/8 16:12 - * @Version 1.0 - */ -@Data -@ApiModel -public class InterviewDetailInfoVO { - @ApiModelProperty("面试者ID") - private String userId; - @ApiModelProperty("面试者名称") - private String userName; - @ApiModelProperty("面试者手机号") - private String userPhone; - @ApiModelProperty("线索ID") - private Long lineId; - @ApiModelProperty("面试开始时间") - private Date startTime; - - private Long interviewPlanId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java deleted file mode 100644 index eb951a7b9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewPlanVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/8 14:39 - * @Version 1.0 - */ -@Data -@ApiModel -public class InterviewPlanVO { - - private Boolean hasInterview; - - private Boolean hasAdventLine; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java deleted file mode 100644 index df1acec7f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InterviewScheduleInfoVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 17:30 - * @Version 1.0 - */ -@Data -@ApiModel -public class InterviewScheduleInfoVO { - - @ApiModelProperty("当前日期面试数量") - private Integer currentDayInterviewCount; - @ApiModelProperty("当前日期后七天面试数量") - private Integer lastSevenDayInterviewCount; - @ApiModelProperty("面试日程列表") - private List interviewDetailInfoVOS; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java deleted file mode 100644 index f6662fad0..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/31 10:50 - * @Version 1.0 - */ -@Data -@ApiModel -public class InviteCodeDetailVO { - - @ApiModelProperty("推荐加盟商名称") - private String partnerName; - @ApiModelProperty("推荐加盟商手机号码") - private String partnerPhone; - @ApiModelProperty("邀请码") - private String inviteCode; - @ApiModelProperty("门店编码") - private String storeCode; - @ApiModelProperty("门店名称") - private String storeName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java deleted file mode 100644 index c17c12106..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupListVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @author Fun Li 2023/8/10 13:33 - * @version 1.0 - */ -@Data -public class LabelGroupListVo { - - @ApiModelProperty("标签组id") - private long id; - - @ApiModelProperty("标签组名称") - private String labelGroupName; - - @ApiModelProperty("编辑人姓名") - private String editName; - - @ApiModelProperty("编辑人电话") - private String editMobile; - - @ApiModelProperty("编辑时间") - private Date editDate; - - @ApiModelProperty("标签列表") - private List labelList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java deleted file mode 100644 index c741ab911..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -@Data -public class LabelGroupVO { - @ApiModelProperty(value = "标签组ID") - private Long id; - @ApiModelProperty(value = "标签组名称") - private String labelGroupName; - @ApiModelProperty(value = "标签组创建时间") - private Date groupCreateTime; - @ApiModelProperty(value = "标签列表") - private List labelList; - @Data - public static class LabelVO { - @ApiModelProperty(value = "标签ID") - private Long id; - @ApiModelProperty(value = "标签名称") - private String labelName; - @ApiModelProperty(value = "标签创建时间") - private Date labelCreateTime; - } -} - diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java deleted file mode 100644 index daabcdc7c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @author Fun Li 2023/8/10 14:42 - * @version 1.0 - */ -@Data -public class LabelListVo { - - @ApiModelProperty(value = "标签名称") - private String labelName; - - @ApiModelProperty(value = "标签组名称") - private String labelGroupName; - - @ApiModelProperty(value = "编辑人姓名") - private String editName; - - @ApiModelProperty(value = "编辑人电话") - private String editMobile; - - @ApiModelProperty(value = "编辑时间") - private Date editDate; - - @ApiModelProperty(value = "标签id") - private Long id; - - @ApiModelProperty(value = "标签分组id") - private Long labelGroupId; - - @ApiModelProperty(value = "标签创建时间") - private Date labelCreateTime; - - @ApiModelProperty(value = "标签组创建时间") - private Date groupCreateTime; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java deleted file mode 100644 index acdd84729..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/5/31 10:54 - * @Version 1.0 - */ -@Data -@ApiModel -public class LineFollowHistoryVO { - - @ApiModelProperty("开始跟进时间") - private String startTime; - @ApiModelProperty("结束跟进时间") - private String closeTime; - @ApiModelProperty("结束原因") - private String closeCause; - - - - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePageInfoVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePageInfoVo.java deleted file mode 100644 index 6cee107ae..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePageInfoVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.vo; - - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; - -/** - * @Author hxd - */ -@Data -@ApiModel -@Slf4j -public class LinePageInfoVo { - - @ApiModelProperty("线索ID") - private Long lineId; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaSingleVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaSingleVO.java deleted file mode 100644 index 38c592ef7..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaSingleVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/14 11:28 - * @Version 1.0 - */ -@Data -@ApiModel -public class OpenAreaSingleVO { - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("parent.id") - private Long parentId; - - @ApiModelProperty("区域名称") - private String areaName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java deleted file mode 100644 index 281d0794a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.enums.AreaStatusEnum; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/2 10:55 - * @Version 1.0 - */ -@Data -@ApiModel -@Slf4j -public class OpenAreaTreeVO { - - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("parent.id") - private Long parentId; - - @ApiModelProperty("区域名称") - private String areaName; - - @ApiModelProperty("区域路径") - private String areaPath; - - @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") - private String areaStatus; - - private String backgroundBanner; - - private String detailBanner; - - @ApiModelProperty("子区域") - private List childNode; - - - public static List convertTree(List allOpenArea, String keyword, Boolean applyFlag){ - long startTime = System.currentTimeMillis(); - List firstArea = allOpenArea.stream().filter(o -> Objects.isNull(o.getParentId())).collect(Collectors.toList()); - Map> openAreaParentMap = allOpenArea.stream().distinct().filter(o->Objects.nonNull(o.getParentId())).collect(Collectors.groupingBy(k -> k.getParentId())); - List allTree = new ArrayList<>(); - for (HyOpenAreaInfoDO openAreaInfo : firstArea) { - OpenAreaTreeVO node = copyProperties(openAreaInfo); - List childList = dealChild(openAreaInfo, openAreaParentMap); - node.setChildNode(childList); - allTree.add(node); - } - //不需要过滤 直接返回 - if(StringUtils.isBlank(keyword) && (Objects.isNull(applyFlag) || !applyFlag)){ - return allTree; - } - log.info("1#耗时：{}", System.currentTimeMillis() - startTime); - Map> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode())); - List filterList = allOpenArea.stream().filter(o -> (StringUtils.isBlank(keyword) || o.getAreaPath().contains(keyword)) - && (Objects.isNull(applyFlag) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()))) - .collect(Collectors.toList()); - Map openAreaMap = allOpenArea.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); - List filterAndParentList = new ArrayList<>(); - //向上处理节点 - for (HyOpenAreaInfoDO openAreaInfo : filterList) { - filterAndParentList.add(openAreaInfo); - while (Objects.nonNull(openAreaInfo) && Objects.nonNull(openAreaInfo.getParentId())){ - openAreaInfo = openAreaMap.get(openAreaInfo.getParentId()); - if(Objects.nonNull(openAreaInfo) && !filterAndParentList.contains(openAreaInfo)){ - filterAndParentList.add(openAreaInfo); - } - } - } - log.info("2#耗时：{}", System.currentTimeMillis() - startTime); - List resultList = new ArrayList<>(); - List filterFirstArea = filterAndParentList.stream().filter(o -> Objects.isNull(o.getParentId())).collect(Collectors.toList()); - Map> filterOpenAreaParentMap = filterAndParentList.stream().filter(Objects::nonNull).filter(o->Objects.nonNull(o.getParentId())).collect(Collectors.groupingBy(k -> k.getParentId())); - for (HyOpenAreaInfoDO openAreaInfo : filterFirstArea) { - Long id = openAreaInfo.getId(); - OpenAreaTreeVO node = copyProperties(openAreaInfo); - List childList = dealChild(openAreaInfo, filterOpenAreaParentMap); - if(CollectionUtils.isEmpty(childList)){ - childList = childMap.get(node.getId()); - } - node.setChildNode(childList); - resultList.add(node); - } - log.info("2#耗时：{}", System.currentTimeMillis() - startTime); - return resultList; - } - - public static List dealChild(HyOpenAreaInfoDO areaInfo, Map> openAreaParentMap){ - List childList = openAreaParentMap.get(areaInfo.getId()); - if(CollectionUtils.isEmpty(childList)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (HyOpenAreaInfoDO hyOpenAreaInfo : childList) { - OpenAreaTreeVO openAreaTree = copyProperties(hyOpenAreaInfo); - openAreaTree.setChildNode(dealChild(hyOpenAreaInfo, openAreaParentMap)); - resultList.add(openAreaTree); - } - return resultList; - } - - /** - * 属性处理 - * @param area - * @return - */ - public static OpenAreaTreeVO copyProperties(HyOpenAreaInfoDO area){ - OpenAreaTreeVO result = new OpenAreaTreeVO(); - result.setId(area.getId()); - result.setParentId(area.getParentId()); - result.setAreaName(area.getAreaName()); - result.setAreaPath(area.getAreaPath()); - result.setAreaStatus(area.getAreaStatus()); - result.setBackgroundBanner(area.getBackgroundBanner()); - result.setDetailBanner(area.getDetailBanner()); - return result; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java deleted file mode 100644 index 53d806044..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * 开放城市VO - * @Author suzhuhong - * @Date 2023/5/29 16:27 - * @Version 1.0 - */ -@Data -@ApiModel -public class OpenAreaVO { - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("parent.id") - private Long parentId; - - @ApiModelProperty("区域名称") - private String areaName; - - @ApiModelProperty("区域路径") - private String areaPath; - - @ApiModelProperty("背景图URL 重点区域时候必填") - private String backgroundBanner; - - @ApiModelProperty("详情banner URL 重点区域时候必填") - private String detailBanner; - - @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") - private String areaStatus; - - @ApiModelProperty("创建时间") - private Date createTime; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("更新人") - private String updateUserId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java deleted file mode 100644 index 3b0820c87..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/29 19:46 - * @Version 1.0 - */ -@Data -@ApiModel -public class OpenProvinceVO { - - @ApiModelProperty("可申请省份") - List applyProvinceList; - - @ApiModelProperty("可预约省份") - List reservationProvinceList; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OrganizationVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OrganizationVO.java deleted file mode 100644 index b77fc62f9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OrganizationVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/31 14:48 - * @Version 1.0 - */ -@Data -@ApiModel -public class OrganizationVO { - - @ApiModelProperty("id") - private String id; - @ApiModelProperty("组织机构名称") - private String name; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java deleted file mode 100644 index 1d2b4e876..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cool.store.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/5/31 11:28 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerBaseInfoVO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("姓名") - private String username; - - @ApiModelProperty("1男 2女") - private Integer sex; - - @ApiModelProperty("民族") - private String nation; - - @ApiModelProperty("出生日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date birthdate; - - @ApiModelProperty("身份证") - private String idCard; - - @ApiModelProperty("身份证正面") - private String idCardPhotoFront; - - @ApiModelProperty("身份证反面") - private String idCardPhotoBlack; - - @ApiModelProperty("住址") - private String liveAddress; - - @ApiModelProperty("0待提交、1待审核、2已通过、3未通过") - private Integer status; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java deleted file mode 100644 index 688cd1eaa..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:19 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerClerkVO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("伙伴姓名") - private String username; - - @ApiModelProperty("关系") - private String relationship; - - @ApiModelProperty("年龄") - private Integer age; - - @ApiModelProperty("选择原因") - private String chooseReason; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java deleted file mode 100644 index 90fd9a793..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.cool.store.vo; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.utils.CoolDateUtils; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - - -/** - * @Author suzhuhong - * @Date 2023/5/30 20:11 - * @Version 1.0 - */ -@Data -@ApiModel -@Slf4j -public class PartnerIntentApplyInfoVO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商手机号码") - private String partnerUserPhone; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long lineId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("EC意向开店区域") - private String ecWantShopArea; - - @ApiModelProperty("意向开店区域") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("截止时间") - private String deadline; - - @ApiModelProperty("阶段提交时间") - private String partnerSubmitTime; - - @ApiModelProperty("阶段状态") - private String WorkflowStatus; - - @ApiModelProperty("用户画像") - private List userPortraitList; - - @ApiModelProperty("上次跟进时间") - private String lastFollowTime; - - @ApiModelProperty("接通状态") - private Integer callStatus; - - @ApiModelProperty("来源名称") - private String userChannelName; - - public static List convertList(List list, Map wantShopAreaNameMap, String workflowStatus, - Map userChannelMap,Map userPortraitMap ){ - if(CollectionUtils.isEmpty(list)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (PartnerIntentApplyInfoDTO partnerIntentApplyInfoDTO : list) { - PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO(); - partnerIntentApplyInfoVO.setId(partnerIntentApplyInfoDTO.getId()); - partnerIntentApplyInfoVO.setPartnerId(partnerIntentApplyInfoDTO.getPartnerId()); - partnerIntentApplyInfoVO.setLineId(partnerIntentApplyInfoDTO.getPartnerLineId()); - partnerIntentApplyInfoVO.setPartnerSubmitTime( DateUtil.format(partnerIntentApplyInfoDTO.getPartnerSubmitTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerIntentApplyInfoVO.setAcceptAdjustType(partnerIntentApplyInfoDTO.getAcceptAdjustType()); - partnerIntentApplyInfoVO.setLiveArea(partnerIntentApplyInfoDTO.getLiveArea()); - partnerIntentApplyInfoVO.setWantShopArea(partnerIntentApplyInfoDTO.getWantShopArea()); - partnerIntentApplyInfoVO.setEcWantShopArea(partnerIntentApplyInfoDTO.getEcWantShopArea()); - String deadLine = DateUtil.format(partnerIntentApplyInfoDTO.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); - partnerIntentApplyInfoVO.setDeadline(deadLine); - partnerIntentApplyInfoVO.setPartnerUserName(partnerIntentApplyInfoDTO.getPartnerUserName()); - partnerIntentApplyInfoVO.setPartnerUserPhone(partnerIntentApplyInfoDTO.getMobile()); - partnerIntentApplyInfoVO.setWorkflowStatus(workflowStatus); - partnerIntentApplyInfoVO.setWantShopAreaName(wantShopAreaNameMap.get(partnerIntentApplyInfoDTO.getWantShopArea())); - - partnerIntentApplyInfoVO.setLastFollowTime(partnerIntentApplyInfoDTO.getLastFollowTime()); - Integer callStatus = null; - if(partnerIntentApplyInfoDTO.getCallStatus()!=null){ - callStatus = partnerIntentApplyInfoDTO.getCallStatus()==1?partnerIntentApplyInfoDTO.getCallStatus():0; - } - partnerIntentApplyInfoVO.setCallStatus(callStatus); - partnerIntentApplyInfoVO.setUserChannelName(userChannelMap.getOrDefault(partnerIntentApplyInfoDTO.getUserChannelId(),"")); - - List userPortraitList= new ArrayList<>(); - if(StringUtils.isNotEmpty(partnerIntentApplyInfoDTO.getUserPortrait())){ - String[] parts = partnerIntentApplyInfoDTO.getUserPortrait().split(","); - for (String part : parts) { - String trimmedPart = part.trim(); - if (!trimmedPart.isEmpty()) { - try { - if (userPortraitMap.get(Long.valueOf(part)) != null){ - userPortraitList.add(userPortraitMap.get(Long.valueOf(part))); - } - } catch (NumberFormatException e) { - log.info("Invalid format: {}" , trimmedPart); - } - } - } - } - partnerIntentApplyInfoVO.setUserPortraitList(userPortraitList); - resultList.add(partnerIntentApplyInfoVO); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java deleted file mode 100644 index 52d1fba2a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.request.WantShopInfoRequest; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:14 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerIntentInfoVO { - - @ApiModelProperty("") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("加盟商姓名") - private String partnerUserName; - - private String workflowStage; - - private String workflowStatus; - - @ApiModelProperty("加盟商手机号") - private String partnerUserPhone; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("详细地址") - private String detailedAddress; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("是否有意向铺位") - private Integer isHaveWantShop; - - @ApiModelProperty("意向铺位信息,json字段,最多5个") - private List wantShopInfo; - - @ApiModelProperty("最大预算") - private String maxBudget; - - @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代") - private String moneySource; - - @ApiModelProperty("资金证明") - private List moneyProve; - - @ApiModelProperty("征信证明") - private List creditProve; - - @ApiModelProperty("学历") - private String education; - - @ApiModelProperty("工作年限") - private String workYear; - - @ApiModelProperty("是否具有工作经验") - private Integer isHaveWorkExp; - - @ApiModelProperty("工作或经商经验") - private String workExp; - - @ApiModelProperty("是否是消费者") - private Integer isConsumer; - - @ApiModelProperty("其他品牌") - private String otherBand; - - @ApiModelProperty("品牌优势") - private String brandStrength; - - @ApiModelProperty("需要改进") - private String needImprove; - - @ApiModelProperty("优势") - private String strength; - - @ApiModelProperty("劣势") - private String weakness; - - @ApiModelProperty("创建时间") - private Date createTime; - - private Integer acquaintanceFlag; - - private String acquaintanceName; - - private Integer acquaintanceRelationshipType; - - private String otherRelationshipType; - @ApiModelProperty("邮箱地址") - private String email; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java deleted file mode 100644 index f051f63dc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 20:28 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerInterviewInfoVO { - - @ApiModelProperty("会议计划id") - private Long interviewPlanId; - - @ApiModelProperty("会议id") - private Long interviewId; - - @ApiModelProperty("预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝") - private Integer status; - - @ApiModelProperty("会议开始时间") - private String startTime; - - @ApiModelProperty("会议结束时间") - private String endTime; - - @ApiModelProperty("截止时间") - private String deadline; - - @ApiModelProperty("房间号") - private String roomId; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; - - @ApiModelProperty("加盟商用户名称") - private String partnerName; - - @ApiModelProperty("加盟商手机号码") - private String partnerPhone; - - @ApiModelProperty("面试官ID") - private String interviewerId; - - @ApiModelProperty("面试官名称") - private String interviewerName; - - @ApiModelProperty("面试官手机号") - private String interviewerPhone; - - @ApiModelProperty("预约时间") - private String createTime; - - @ApiModelProperty("过程信息") - private String processInfo; - - @ApiModelProperty("线索状态") - private Integer lineStatus; - - @ApiModelProperty("线索ID") - private Long lineId; - - @ApiModelProperty("合同号") - private String authCode; - - @ApiModelProperty("审批发起时间") - private String approveTime; - - @ApiModelProperty("用户画像") - private List userPortraitList; - - @ApiModelProperty("上次跟进时间") - private String lastFollowTime; - - @ApiModelProperty("接通状态") - private Integer callStatus; - - @ApiModelProperty("来源名称") - private String userChannelName; - - @ApiModelProperty("是否已被预约成功") - private Boolean booked; - - @ApiModelProperty("该时间段面试预约人数") - private Integer appointmentCount; - - @ApiModelProperty("线索是否处于会销面试中") - private Boolean whetherExhibitionInterview; - - @ApiModelProperty(value = "线索报名的会销举办日期", example = "2024-01-09") - private String exhibitionDate; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java deleted file mode 100644 index 6b3d6084e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineBaseInfoVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cool.store.vo; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -/** - * @Author suzhuhong - * @Date 2023/6/2 14:29 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerLineBaseInfoVO { - - - @ApiModelProperty("线索ID") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("hy_partner_line_info.id") - private Long partnerLineId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("当前阶段截止时间") - @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8") - private Date deadline; - - @ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天") - @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss", timezone = "GMT+8") - private Date closeTime; - - @ApiModelProperty("冷静期首次登录标识 true-是首次") - private Boolean coolDownFirstLoginFlag; - - @ApiModelProperty("拒绝原因 冷静期提示文案中用到 全部流程中用到(拒绝的时候暂时拒绝原因)") - private String cause; - - @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单") - private Integer lineStatus; - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java deleted file mode 100644 index e84e1a590..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.dto.partner.UserPortraitDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 10:38 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerLineInfoAndBaseInfoVO { - - @ApiModelProperty("线索ID") - private Long id; - - private Long partnerBaseInfoId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("加盟商用户ID") - private String partnerUserId; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("手机号归属地") - private String phoneAddress; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("招商经理") - private String investmentManagerName; - - @ApiModelProperty("招商经理手机号") - private String investmentManagerPhone; - - @ApiModelProperty("用户画像") - private List userPortrait; - - @ApiModelProperty("线索状态") - private Integer lineStatus; - - @ApiModelProperty("通过原因") - private String passCause; - - @ApiModelProperty("通过时间") - private String passTime; - - @ApiModelProperty("通过人名称") - private String passUserName; - - @ApiModelProperty("通过人ID") - private String passUserId; - - @ApiModelProperty("通过人手机号") - private String passUserMobile; - - @ApiModelProperty("通过证明") - private List passCertifyFile; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("详细地址") - private String detailedAddress; - - @ApiModelProperty("邮箱") - private String email; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("线索来源名称") - private String channelName; - - @ApiModelProperty("教育") - private String education; - - @ApiModelProperty("idCard") - private String idCard; - - @ApiModelProperty("开发主管") - private String developmentDirector; - @ApiModelProperty("开发主管名称") - private String developmentDirectorName; - @ApiModelProperty("开发主管手机号") - private String developmentDirectorMobile; - - @ApiModelProperty("EC意向开店区域名称") - private String ecWantShopAreaName; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java deleted file mode 100644 index 97441472e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.cool.store.vo; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.utils.CoolDateUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -/** - * @Author suzhuhong - * @Date 2023/5/30 15:56 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerLineInfoVO { - - @ApiModelProperty("") - private Long lineId; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单") - private Integer lineStatus; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("开发主管") - private String developmentDirector; - - @ApiModelProperty("开发经理") - private String developmentManager; - - @ApiModelProperty("截止时间") - private String deadline; - - @ApiModelProperty("通过原因") - private String passReason; - - @ApiModelProperty("公开拒绝原因") - private String rejectPublicReason; - - @ApiModelProperty("真实拒绝原因") - private String rejectRealReason; - - @ApiModelProperty("证明文件或凭证") - private String certifyFile; - - @ApiModelProperty("冷静期首次登录 是-true 否-false") - private Boolean coolingPeriodFirstLoginFlag; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("结束操作人ID") - private String closeUserId ; - - @ApiModelProperty("结束操作人名称") - private String closeUserName ; - - @ApiModelProperty("结束时间") - private String closeDate ; - - /** - * - * @param lineList - * @return - */ - public static List convertList(List lineList, Map userNamePhoneMap, Map partnerMap){ - List resultList = new ArrayList<>(); - for (HyPartnerLineInfoDO line : lineList) { - PartnerLineInfoVO result = new PartnerLineInfoVO(); - result.setLineId(line.getId()); - result.setPartnerId(line.getPartnerId()); - result.setCertifyFile(line.getCertifyFile()); - result.setWorkflowStage(line.getWorkflowStage()); - result.setWorkflowStatus(line.getWorkflowStatus()); - result.setLineStatus(line.getLineStatus()); - String deadLine = DateUtil.format(line.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); - result.setDeadline(deadLine); - result.setPassReason(line.getPassReason()); - result.setRejectPublicReason(line.getRejectPublicReason()); - result.setRejectRealReason(line.getRejectRealReason()); - result.setCertifyFile(line.getCertifyFile()); - result.setCloseUserId(line.getCloseUserId()); - result.setCloseUserName(userNamePhoneMap.get(line.getCloseUserId())); - HyPartnerUserInfoDO partnerUser = partnerMap.get(line.getPartnerId()); - String partnerUserName = Optional.ofNullable(partnerUser).map(HyPartnerUserInfoDO::getUsername).orElse(StringUtils.EMPTY); - String partnerUserPhone = Optional.ofNullable(partnerUser).map(HyPartnerUserInfoDO::getMobile).orElse(StringUtils.EMPTY); - result.setPartnerUserName(partnerUserName); - result.setPartnerUserPhone(partnerUserPhone); - String closeDate = DateUtil.format(line.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_7); - result.setCloseDate(closeDate); - resultList.add(result); - } - return resultList; - } - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java deleted file mode 100644 index 480bba5bb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class PartnerPassLetterDetailVO { - - @ApiModelProperty("加盟商姓名") - private String partnerName; - - @ApiModelProperty("授权码") - private String authCode; - - @ApiModelProperty("通过函编码") - private String passCode; - - @ApiModelProperty("审核城市") - private String verifyCity; - - @ApiModelProperty("函文件图片URL") - private String passImageUrl; - - @ApiModelProperty("函文件pdfURL") - private String passPdfUrl; - - @ApiModelProperty("生成日期：YYYY-MM-DD") - private String createTime; - - @ApiModelProperty("有效期截至") - private String expiryDate; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java deleted file mode 100644 index b12414ba3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.request.PartnerClerkRequest; -import com.cool.store.request.PartnerIntentInfoRequest; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/31 11:40 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerSummaryInfoVO { - - @ApiModelProperty("线索ID") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("基础信息") - private PartnerBaseInfoVO partnerBaseInfoVO; - - @ApiModelProperty("加盟商店员信息列表") - private List partnerClerkVOS; - - @ApiModelProperty("加盟商意向信息/行业认知") - private PartnerIntentInfoVO partnerIntentInfoVO; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java deleted file mode 100644 index 5a777edfb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.enums.LineStatusEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.StringUtils; - -import java.util.Objects; - -/** - * @Author suzhuhong - * @Date 2023/6/2 10:29 - * @Version 1.0 - */ -@Data -@ApiModel -public class PartnerUserInfoVO { - - @ApiModelProperty("ID") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("申请人姓名") - private String username; - - @ApiModelProperty("常驻区域") - private String liveArea; - - @ApiModelProperty("意向开店区域ID") - private String wantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("邀请码") - private String inviteCode; - - @ApiModelProperty("是否填写加盟需知") - private Integer isWritePartnerKnow; - - @ApiModelProperty("openid") - private String openid; - - @ApiModelProperty("unionid") - private String unionId; - - @ApiModelProperty("是否需要提交意向信息") - private Boolean needSubmitWantInfo; - - @ApiModelProperty("线索id") - private Long partnerLineId; - - private Integer lineStatus; - - public Boolean getNeedSubmitWantInfo() { - //如果是私海 且liveArea与acceptAdjustType是空 说明通过会销进入 返回false - if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea) - && Objects.isNull(acceptAdjustType)){ - return false; - } - if((StringUtils.isBlank(username) - || StringUtils.isBlank(mobile) - || StringUtils.isBlank(liveArea) - || StringUtils.isBlank(wantShopArea) - || Objects.isNull(acceptAdjustType))){ - return true; - } - return false; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java deleted file mode 100644 index 6da3b75a2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.cool.store.vo; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import com.cool.store.dto.partner.PrivateSeaLineDTO; -import com.cool.store.entity.HyPartnerExhibitionDO; -import com.cool.store.entity.HyPartnerInterviewPlanDO; -import com.cool.store.utils.CoolDateUtils; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/5/30 21:38 - * @Version 1.0 - */ -@Data -@ApiModel -@Slf4j -public class PrivateSeaLineListVo { - - - @ApiModelProperty("线索ID") - private Long lineId; - - @ApiModelProperty("加盟商用户ID") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("截止时间") - private String deadline; - - @ApiModelProperty("招商经理") - private String investmentManager; - - @ApiModelProperty("招商经理") - private String investmentManagerName; - - @ApiModelProperty("开发经理") - private String developmentManager; - - @ApiModelProperty("开发经理") - private String developmentManagerName; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("EC意向开店区域") - private String ecWantShopArea; - - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("更新时间") - private String updateTime; - - @ApiModelProperty("门店编码") - private String storeCode; - - @ApiModelProperty("门店名称") - private String storeName; - - @ApiModelProperty("线索状态") - private Integer lineStatus; - - @ApiModelProperty("是否在会销中") - private Boolean whetherInExhibition; - - @ApiModelProperty("是否处于会销面试中") - private Boolean whetherExhibitionInterview; - - @ApiModelProperty("进行面试的会销创建人姓名") - private String exhibitionCreatorName; - - @ApiModelProperty("进行面试的会销创建人手机号") - private String exhibitionCreatorMobile; - - @ApiModelProperty("推荐加盟商ID") - private String recommendPartnerId; - - @ApiModelProperty("推荐加盟商名称") - private String recommendPartnerName; - - private String recommendPartnerMobile; - - private Long interviewPlanId; - - private Date startTime; - - private String allotTime; - - private String investmentManagerMobile; - - @ApiModelProperty("用户画像") - private List userPortraitList; - - @ApiModelProperty("来源名称") - private String userChannelName; - - - public static List convertList(List list, Map finalDevManagerMap, Map wantShopAreaNameMap, - Map hyPartnerInterviewPlanDOMap, Map channelMap, Map userPortraitMap, - List partnerExhibitions){ - List resultList = new ArrayList<>(); - Map lineIdPartnerExhibitionMap = partnerExhibitions.stream().collect(Collectors.toMap(HyPartnerExhibitionDO::getPartnerLineId, data -> data)); - for (PrivateSeaLineDTO x : list) { - PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo(); - privateSeaLineListVo.setLineId(x.getLineId()); - privateSeaLineListVo.setLineStatus(x.getLineStatus()); - privateSeaLineListVo.setWhetherInExhibition(x.getWhetherInExhibition()); - privateSeaLineListVo.setPartnerId(x.getPartnerId()); - privateSeaLineListVo.setWorkflowStatus(x.getWorkflowStatus()); - String deadLine = DateUtil.format(x.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2); - privateSeaLineListVo.setDeadline(deadLine); - privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone()); - privateSeaLineListVo.setPartnerUserName(x.getPartnerUserName()); - privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); - privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager()); - privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager()); - privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManagerName()); - privateSeaLineListVo.setStoreCode(x.getStoreCode()); - privateSeaLineListVo.setInvestmentManagerMobile(x.getInvestmentManagerMobile()); - privateSeaLineListVo.setStoreName(x.getStoreName()); - String updateTime = DateUtil.format(x.getUpdateTime(), CoolDateUtils.DATE_FORMAT_SEC_2); - privateSeaLineListVo.setUpdateTime(updateTime); - privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId()); - privateSeaLineListVo.setRecommendPartnerMobile(x.getRecommendPartnerId()); - privateSeaLineListVo.setEcWantShopArea(x.getEcWantShopArea()); - privateSeaLineListVo.setWantShopArea(x.getWantShopArea()); - privateSeaLineListVo.setWantShopAreaName(wantShopAreaNameMap.get(x.getWantShopArea())); - privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager()); - privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName()); - privateSeaLineListVo.setRecommendPartnerMobile(x.getRecommendPartnerMobile()); - privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); - privateSeaLineListVo.setAllotTime(x.getAllotTime()); - privateSeaLineListVo.setWantShopArea(x.getWantShopArea()); - privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); - privateSeaLineListVo.setStartTime(hyPartnerInterviewPlanDOMap.getOrDefault(x.getLineId(),new HyPartnerInterviewPlanDO()).getStartTime()); - privateSeaLineListVo.setInterviewPlanId(hyPartnerInterviewPlanDOMap.getOrDefault(x.getLineId(),new HyPartnerInterviewPlanDO()).getId()); - privateSeaLineListVo.setDevelopmentManagerName(finalDevManagerMap.get(x.getDevelopmentManager())); - privateSeaLineListVo.setUserChannelName(channelMap.get(x.getUserChannelId())); - List userPortraitList= new ArrayList<>(); - if(StringUtils.isNotEmpty(x.getUserPortrait())){ - String[] parts = x.getUserPortrait().split(","); - for (String part : parts) { - String trimmedPart = part.trim(); - if (!trimmedPart.isEmpty()) { - try { - if (userPortraitMap.get(Long.valueOf(part)) != null){ - userPortraitList.add(userPortraitMap.get(Long.valueOf(part))); - } - } catch (NumberFormatException e) { - log.info("Invalid format: {}" , trimmedPart); - } - } - } - } - //在会销面试中的线索 - privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.FALSE); - if (CollUtil.isNotEmpty(partnerExhibitions) - && lineIdPartnerExhibitionMap.containsKey(x.getLineId())) { - privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.TRUE); - privateSeaLineListVo.setExhibitionCreatorName(lineIdPartnerExhibitionMap.get(x.getLineId()).getExhibitionCreatorName()); - privateSeaLineListVo.setExhibitionCreatorMobile(lineIdPartnerExhibitionMap.get(x.getLineId()).getExhibitionCreatorMobile()); - } - privateSeaLineListVo.setUserPortraitList(userPortraitList); - resultList.add(privateSeaLineListVo); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java deleted file mode 100644 index d2417c2f3..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 19:58 - * @Version 1.0 - */ -@Data -@ApiModel -public class PublicSeaLineListVo { - - - @ApiModelProperty("线索ID") - private Long id; - - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - - @ApiModelProperty("加盟商用户ID") - private String partnerUserId; - - @ApiModelProperty("加盟商用户名称") - private String partnerUserName; - - @ApiModelProperty("加盟商用户手机号") - private String partnerUserPhone; - - @ApiModelProperty("手机号归属地") - private String phoneAddress; - - @ApiModelProperty("创建时间") - private String createTime; - - @ApiModelProperty("面试开始时间") - private Date partnerInterviewStartTime; - - @ApiModelProperty("公开拒绝原因") - private String rejectPublicReason; - - @ApiModelProperty("真实拒绝原因") - private String rejectRealReason; - - @ApiModelProperty("返回公海时间") - private String LastCloseDate ; - - @ApiModelProperty("招商经理") - private String lastInvestmentManager; - - @ApiModelProperty("跟进次数") - private Integer followCount; - - @ApiModelProperty("意向开店区域ID") - private String wantShopArea; - - @ApiModelProperty("意向开店区域名称") - private String wantShopAreaName; - - @ApiModelProperty("EC意向开店区域") - private String ecWantShopArea; - - private String acceptAdjustType; - - private String updateTime; - - @ApiModelProperty("用户画像") - private List userPortraitList; - - @ApiModelProperty("来源名称") - private String userChannelName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/StageCountVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/StageCountVO.java deleted file mode 100644 index 6b5097d92..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/StageCountVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/5/30 19:43 - * @Version 1.0 - */ -@Data -@ApiModel -public class StageCountVO { - - @ApiModelProperty("意向申请审核数量") - private Integer intentApplyApproveCount; - @ApiModelProperty("预约面试数量") - private Integer reservationInterviewCount; - @ApiModelProperty("合格资格面试数量") - private Integer qualifiedInterviewCount; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java deleted file mode 100644 index 833f3dcc4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.vo; - -import com.cool.store.request.WantShopInfoRequest; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/25 15:53 - * @Version 1.0 - */ -@Data -public class WantShopInfoVO { - - - private ShopInfoVO shopInfo; - - - private String uuid; - - - - @Data - static class ShopInfoVO{ - private ShopAddressVO shopAddress; - - private String storeIsTakeDown; - - private String takeDown; - - } - - @Data - static class ShopAddressVO{ - - private String address; - - private String longitude; - - private String latitude; - - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneCheckVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneCheckVO.java deleted file mode 100644 index c6a6cc2b9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneCheckVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cool.store.vo; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/6/14 16:27 - * @Version 1.0 - */ -@Data -public class ZoneCheckVO { - - private String areaName; - - private String zoneName; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java deleted file mode 100644 index e2dd21adf..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.vo; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/13 15:27 - * @Version 1.0 - */ -@Data -public class ZoneVO { - - private Long id; - - private String zoneName; - - private String updateTime; - - private String updateUserId; - - private String updateUserName; - - private List orgVos; - - private List openAreaVOS; - - - - - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java deleted file mode 100644 index 74d73cd18..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/beauty/BeautyCameraSettingVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.vo.beauty; - -import com.cool.store.entity.BeautyCameraSettingDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: BeautyCameraSettingVO - * @Description: - * @date 2023-09-11 14:40 - */ -@Data -public class BeautyCameraSettingVO { - - @ApiModelProperty("美颜度") - private Integer beauty; - - @ApiModelProperty("明亮度") - private Integer brightness; - - @ApiModelProperty("红润") - private Integer ruddy; - - public static BeautyCameraSettingVO convertVO(BeautyCameraSettingDO request){ - if(Objects.isNull(request)){ - return null; - } - BeautyCameraSettingVO result = new BeautyCameraSettingVO(); - result.setBeauty(request.getBeauty()); - result.setBrightness(request.getBrightness()); - result.setRuddy(request.getRuddy()); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java deleted file mode 100644 index 372f21e57..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/buser/EnterpriseUserPageVO.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.cool.store.vo.buser; - -import com.cool.store.dto.auth.AuthRegionStoreUserDTO; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author zhangchenbiao - * @date 2022-01-18 04:40 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class EnterpriseUserPageVO implements Serializable { - - @ApiModelProperty("钉钉用户id") - private String userId; - - @ApiModelProperty("") - private String name; - - @ApiModelProperty("是否已经激活, true表示已激活, false表示未激活") - private Boolean active; - - @ApiModelProperty("是否是主管理员，0：否，1：是") - private Boolean mainAdmin; - - @ApiModelProperty("是否为企业的管理员, true表示是, false表示不是") - private Boolean isAdmin; - - @ApiModelProperty("手机号码") - private String mobile; - - @ApiModelProperty("员工的电子邮箱") - private String email; - - @ApiModelProperty("在当前isv全局范围内唯一标识一个用户的身份,用户无法修改") - private String unionid; - - @ApiModelProperty("员工的企业邮箱") - private String orgEmail; - - @ApiModelProperty("头像url") - private String avatar; - - @ApiModelProperty("") - private String roles; - - @ApiModelProperty("工号") - private String jobnumber; - - @ApiModelProperty("备注") - private String remark; - - @ApiModelProperty("") - private String roleName; - - @ApiModelProperty("部门") - private String departments; - - @ApiModelProperty("用户状态 0待审核 1正常 2冻结") - private Integer userStatus; - - @ApiModelProperty("门店数量") - private Integer storeCount; - - private String department; - - @ApiModelProperty("管辖用户范围") - private String subordinateUserRange; - - @ApiModelProperty("auto自动关联 select手动选择") - private List sourceList; - - private List authRegionStoreList; - - @ApiModelProperty("选取权限 true可选 false不可选") - private Boolean selectFlag; - - - /*public static List transUserDOToVO(List enterpriseUserList) { - List resultList = new ArrayList<>(); - for (EnterpriseUserDO enterpriseUserDTO : enterpriseUserList) { - EnterpriseUserPageVO enterpriseUserDO = new EnterpriseUserPageVO(); - enterpriseUserDO.setUserId(enterpriseUserDTO.getUserId()); - enterpriseUserDO.setName(enterpriseUserDTO.getName()); - enterpriseUserDO.setActive(Boolean.TRUE); - enterpriseUserDO.setMainAdmin(enterpriseUserDTO.getMainAdmin()); - enterpriseUserDO.setIsAdmin(enterpriseUserDTO.getIsAdmin()); - enterpriseUserDO.setMobile(enterpriseUserDTO.getMobile()); - enterpriseUserDO.setEmail(enterpriseUserDTO.getEmail()); - enterpriseUserDO.setOrgEmail(enterpriseUserDTO.getOrgEmail()); - enterpriseUserDO.setUnionid(enterpriseUserDTO.getUnionid()); - enterpriseUserDO.setAvatar(enterpriseUserDTO.getAvatar()); - enterpriseUserDO.setJobnumber(enterpriseUserDTO.getJobnumber()); - enterpriseUserDO.setRemark(enterpriseUserDTO.getRemark()); - resultList.add(enterpriseUserDO); - } - return resultList; - }*/ - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/cuser/IdentityCardInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/cuser/IdentityCardInfoVO.java deleted file mode 100644 index 7bea7bbe1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/cuser/IdentityCardInfoVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cool.store.vo.cuser; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: IdentityCardInfoVO - * @Description: - * @date 2023-06-16 10:18 - */ -@Data -public class IdentityCardInfoVO { - - @ApiModelProperty("用户名") - private String username; - - @ApiModelProperty("地址") - private String liveAddress; - - @ApiModelProperty("出生日期") - private String birthdate; - - @ApiModelProperty("性别") - private String sex; - - @ApiModelProperty("身份证号") - private String idCard; - - @ApiModelProperty("民族") - private String nation; - - public IdentityCardInfoVO(String username, String liveAddress, String birthdate, String sex, String idCard, String nation) { - this.username = username; - this.liveAddress = liveAddress; - this.birthdate = birthdate; - this.sex = sex; - this.idCard = idCard; - this.nation = nation; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/CollaboratorVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/CollaboratorVO.java deleted file mode 100644 index 76bcf5eeb..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/CollaboratorVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:30 - * @Version 1.0 - */ -@Data -public class CollaboratorVO { - - private String collaborateId; - - private String collaborateName; - - public CollaboratorVO(String collaborateId, String collaborateName) { - this.collaborateId = collaborateId; - this.collaborateName = collaborateName; - } - - public CollaboratorVO() { - this.collaborateId = collaborateId; - this.collaborateName = collaborateName; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java deleted file mode 100644 index 1e11d57fc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/6 16:05 - * @Version 1.0 - */ -@Data -public class ExhibitionDetailVO extends ExhibitionVO{ - - private String createTime; - - private String closeTime; - - private String createId; - - private String createName; - - private String mobile; - - private Integer closedType; - - private String exhibitionCode; - - private Integer signUpCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupDetailVO.java deleted file mode 100644 index e11b0735e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupDetailVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/12/6 10:03 - * @Version 1.0 - */ -@Data -public class ExhibitionGroupDetailVO { - - private String exhibitionGroupName; - - private Integer id; - - private List exhibitionList; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupVO.java deleted file mode 100644 index d168a881e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionGroupVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:57 - * @Version 1.0 - */ -@Data -public class ExhibitionGroupVO { - - private Integer exhibitionGroupId; - - private String exhibitionGroupName; - - private List exhibitionList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineBaseVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineBaseVO.java deleted file mode 100644 index cabacb8f4..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineBaseVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/8 16:54 - * @Version 1.0 - */ -@Data -public class ExhibitionLineBaseVO { - - private String partnerName; - - private String mobile; - - private String partnerId; - - private Integer participationStatus; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java deleted file mode 100644 index 7f797a824..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/6 17:13 - * @Version 1.0 - */ -@Data -public class ExhibitionLineVO { - - private String partnerId; - - private String partnerName; - - private String mobile; - - private String exhibitionId; - - private Integer lineId; - - private Integer lineStatus; - - private Integer wantShopArea; - - private String wantShopAreaName; - - private Integer participationStatus; - - private String channelName; - - private Integer id; - - private Integer expectedVisitorsCount; - - private String expectedInformation; - - private String investmentManager; - - private String investmentManagerName; - - private String investmentManagerMobile; - - private String customerManager; - - private String interviewer; - - private String interviewerName; - - private String interviewerMobile; - - private Integer interviewPlanId; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java deleted file mode 100644 index 3ed47e674..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/11/30 15:33 - * @Version 1.0 - */ -@Data -public class ExhibitionVO { - - private String exhibitionName; - - private String exhibitionCode; - - private String location; - - private String startDate; - - private Integer closedType; - - private String createId; - - private Integer id; - - private List collaborators; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionGroupVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionGroupVO.java deleted file mode 100644 index 1b8aae950..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionGroupVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.cool.store.vo.exhibition; - -import io.swagger.models.auth.In; -import lombok.Data; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/12/5 20:20 - * @Version 1.0 - */ -@Data -public class MyExhibitionGroupVO { - - /** - * 会销组名称 - */ - private String exhibitionGroupName; - - /** - * 失效时间 - */ - private String expiresTime; - - /** - * 会销组ID - */ - private Integer id; - - /** - * 创建人ID - */ - private String createId; - - /** - * 创建人名称 - */ - private String createName; - - /** - * 创建人手机号 - */ - private String mobile; - - /** - * 是否结束 - */ - private Integer closed; - - /** - * 会销 列表 - */ - private List exhibitionList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionVO.java deleted file mode 100644 index 2425a6731..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/MyExhibitionVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/5 10:41 - * @Version 1.0 - */ -@Data -public class MyExhibitionVO extends ExhibitionVO{ - - - /** - * 结束类型 0-未结算 1-自动结束 2-手动结束 - */ - private Integer closedType; - - /** - * 报名人数 - */ - private Integer signUpCount; - - /** - * 签到人数 - */ - private Integer checkInCount; - - /** - * - * 意向申请填写人数 - */ - private Integer formFillCount; - - /** - * 面试人数 - */ - private Integer interviewCount; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java deleted file mode 100644 index b9212f285..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.cool.store.vo.exhibition; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/12/18 17:15 - * @version 1.0 - * 线索报名的会销详情 - */ -@Data -public class PartnerExhibitionInfoVO { - - @ApiModelProperty(value = "参会人名称", example = "John Doe") - private String participantName; - - @ApiModelProperty(value = "报名的展会编号", example = "34632023") - private String exhibitionCode; - - @ApiModelProperty(value = "参加的相应展会名称", example = "某某某次展会") - private String exhibitionName; - - @ApiModelProperty(value = "展会时间", example = "2023-07-25") - private String exhibitionDate; - - @ApiModelProperty(value = "展会地点", example = "维也纳大酒店") - private String exhibitionPosition; - - @ApiModelProperty("线索是否填写了意向申请") - private Boolean whetherIntentionApply; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java deleted file mode 100644 index d1e2cf3b9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.vo.exhibition; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author Fun Li 2023/12/18 16:42 - * @version 1.0 - * 线索报名的会销列表 - */ -@Data -public class PartnerExhibitionListVO { - - @ApiModelProperty("会销组id") - private String exhibitionGroupId; - - @ApiModelProperty(value = "展会id", example = "123") - private String exhibitionId; - - @ApiModelProperty(value = "展会编号", example = "12202312") - private String exhibitionCode; - - @ApiModelProperty(value = "展会名称", example = "某某某次展会") - private String exhibitionName; - - @ApiModelProperty(value = "展会时间", example = "2023-07-25") - private String exhibitionDate; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/SignUpExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/SignUpExhibitionVO.java deleted file mode 100644 index 1bbe09ce2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/SignUpExhibitionVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cool.store.vo.exhibition; - -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/11 11:09 - * @Version 1.0 - */ -@Data -public class SignUpExhibitionVO { - - private Boolean signUpStatus; - - private Integer signUpFailCode; - - private String signUpFailMsg; - - public SignUpExhibitionVO(){} - public SignUpExhibitionVO(Boolean signUpStatus, Integer signUpFailCode,String signUpFailMsg) { - this.signUpStatus = signUpStatus; - this.signUpFailCode = signUpFailCode; - this.signUpFailMsg = signUpFailMsg; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java deleted file mode 100644 index 266c0a8ea..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskLogVO.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.cool.store.vo.follow; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.entity.CallRecordDO; -import com.cool.store.entity.HyFollowTaskDO; -import com.cool.store.entity.HyPartnerTaskInfoLogDO; -import com.cool.store.enums.CallStatusEnum; -import com.cool.store.enums.OperateLogFieldValueEnum; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.vo.log.LogFieldVO; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskPageVO - * @Description:跟进任务分页 - * @date 2023-08-08 14:47 - */ -@Data -public class FollowTaskLogVO { - - @ApiModelProperty("日志id") - private Long followLogId; - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("操作时间") - private Date operateTime; - - @ApiModelProperty("操作人id") - private String operateUserId; - - @ApiModelProperty("操作人名称") - private String operateUsername; - - @ApiModelProperty("跟进操作类型") - private String operateType; - - @ApiModelProperty("操作内容") - private List operateContent; - - public static List convertVO(List list, List followTaskList, List callRecordList){ - if(CollectionUtils.isEmpty(list)){ - return Lists.newArrayList(); - } - Map taskMap = ListUtils.emptyIfNull(followTaskList).stream().collect(Collectors.toMap(k -> k.getId(), Function.identity(), (k1, k2) -> k1)); - Map callRecordMap = ListUtils.emptyIfNull(callRecordList).stream().collect(Collectors.toMap(k -> k.getTransNo(), Function.identity(), (k1, k2) -> k1)); - List resultList = new ArrayList<>(); - for (HyPartnerTaskInfoLogDO log : list) { - FollowTaskLogVO result = new FollowTaskLogVO(); - result.setFollowLogId(log.getId()); - result.setPartnerLineId(log.getPartnerLineId()); - result.setOperateTime(log.getCreateTime()); - result.setOperateUserId(log.getOperateUserId()); - result.setOperateUsername(log.getOperateUsername()); - result.setOperateType(log.getOperateType()); - List logFieldList = JSONObject.parseArray(log.getFieldCopy(), LogFieldVO.class); - if(OperateTypeEnum.ADD_FOLLOW_TASK.getCode().equals(log.getOperateType())){ - Long taskId = Long.valueOf(logFieldList.stream().filter(o -> OperateLogFieldValueEnum.FOLLOW_TASK_ID.getCode().equals(o.getCode())).map(LogFieldVO::getValue).findFirst().get().toString()); - HyFollowTaskDO hyFollowTask = taskMap.get(taskId); - if(Objects.isNull(hyFollowTask)){ - continue; - } - logFieldList.addAll(LogFieldVO.convertLogField(hyFollowTask)); - } - if(OperateTypeEnum.CALL_UP.getCode().equals(log.getOperateType())){ - String transNo = logFieldList.stream().filter(o -> OperateLogFieldValueEnum.CALL_TRANS_NO.getCode().equals(o.getCode())).map(LogFieldVO::getValue).findFirst().get().toString(); - CallRecordDO callRecord = callRecordMap.get(transNo); - if(Objects.isNull(callRecord)){ - continue; - } - if(CallStatusEnum.CALL_ANSWERED.getCode() != callRecord.getCallStatus()){ - callRecord.setCallStatus(CallStatusEnum.CALL_FAILED.getCode()); - } - logFieldList.addAll(LogFieldVO.convertLogField(callRecord)); - } - result.setOperateContent(logFieldList); - resultList.add(result); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskPageVO.java deleted file mode 100644 index a44070f71..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/follow/FollowTaskPageVO.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cool.store.vo.follow; - -import com.cool.store.dto.partner.PartnerSimpleInfoDTO; -import com.cool.store.entity.HyFollowTaskDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.*; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskPageVO - * @Description:跟进任务分页 - * @date 2023-08-08 14:47 - */ -@Data -public class FollowTaskPageVO { - - @ApiModelProperty("任务id") - private Long followTaskId; - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("任务标题") - private String taskTitle; - - @ApiModelProperty("沟通方式: 0:电话、1:短信、2:微信、3:QQ、4:邮件、5:拜访、6:提醒") - private Integer communicationType; - - @ApiModelProperty("任务截止时间") - private Date deadline; - - @ApiModelProperty("任务状态:0:待完成、1:已完成、2:已逾期、3:作废") - private Integer taskStatus; - - @ApiModelProperty("跟进阶段") - private String workflowStage; - - @ApiModelProperty("线索用户id") - private String partnerId; - - @ApiModelProperty("线索用户名") - private String partnerUsername; - - @ApiModelProperty("线索手机号") - private String partnerMobile; - - - public static List convertVO(List taskList, Map partnerSimpleInfoMap){ - List resultList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(taskList)){ - for (HyFollowTaskDO task : taskList) { - PartnerSimpleInfoDTO partnerInfo = partnerSimpleInfoMap.get(task.getPartnerLineId()); - if(Objects.isNull(partnerInfo)){ - continue; - } - FollowTaskPageVO result = new FollowTaskPageVO(); - result.setFollowTaskId(task.getId()); - result.setPartnerLineId(task.getPartnerLineId()); - result.setTaskTitle(task.getTaskTitle()); - result.setCommunicationType(task.getCommunicationType()); - result.setDeadline(task.getDeadline()); - result.setTaskStatus(task.getTaskStatus()); - result.setWorkflowStage(partnerInfo.getWorkflowStage()); - result.setPartnerId(partnerInfo.getPartnerId()); - result.setPartnerUsername(partnerInfo.getUsername()); - result.setPartnerMobile(partnerInfo.getMobile()); - resultList.add(result); - } - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingCheckVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingCheckVO.java deleted file mode 100644 index 8175f4fa2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingCheckVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.vo.inspection.setting; - -import com.cool.store.entity.HyInspectionSettingDO; -import com.cool.store.entity.HyInspectionSettingMappingDO; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingPageVO - * @Description: - * @date 2023-07-17 14:32 - */ -@Data -public class InspectionSettingCheckVO { - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("省市区") - private String areaName; - - @ApiModelProperty("稽核人名称") - private String inspectionUsername; - - public static List convertVO(List conflictInspectionSetting, List inspectionSettingList, Map userNameMap, Map areaNameMap){ - if(CollectionUtils.isEmpty(conflictInspectionSetting) || CollectionUtils.isEmpty(inspectionSettingList)){ - return Lists.newArrayList(); - } - Map inspectionSettingMap = inspectionSettingList.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); - List resultList = new ArrayList<>(); - for (HyInspectionSettingMappingDO hyInspectionSettingMapping : conflictInspectionSetting) { - HyInspectionSettingDO inspectionSetting = inspectionSettingMap.get(hyInspectionSettingMapping.getInspectionSettingId()); - if(Objects.isNull(inspectionSetting)){ - continue; - } - InspectionSettingCheckVO inspectionSettingCheck = new InspectionSettingCheckVO(); - inspectionSettingCheck.setInspectionUsername(userNameMap.get(inspectionSetting.getInspectionUserId())); - inspectionSettingCheck.setZoneName(inspectionSetting.getZoneName()); - inspectionSettingCheck.setAreaName(areaNameMap.get(hyInspectionSettingMapping.getOpenAreaMappingId())); - resultList.add(inspectionSettingCheck); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java deleted file mode 100644 index 349b510a1..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingDetailVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.vo.inspection.setting; - -import com.cool.store.entity.HyInspectionSettingDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingPageVO - * @Description: - * @date 2023-07-17 14:32 - */ -@Data -public class InspectionSettingDetailVO { - - @ApiModelProperty("id") - private Long inspectionSettingId; - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("稽核人id") - private String inspectionUserId; - - @ApiModelProperty("稽核人名称") - private String inspectionUserName; - - @ApiModelProperty("归属地ids") - private List openAreaMappingIds; - - public static InspectionSettingDetailVO convertVO(HyInspectionSettingDO param, String inspectionUserName, List openAreaMappingIds){ - if(Objects.isNull(param)){ - return null; - } - InspectionSettingDetailVO result = new InspectionSettingDetailVO(); - result.setInspectionSettingId(param.getId()); - result.setZoneName(param.getZoneName()); - result.setInspectionUserId(param.getInspectionUserId()); - result.setInspectionUserName(inspectionUserName); - result.setOpenAreaMappingIds(openAreaMappingIds); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java deleted file mode 100644 index 2122d0c00..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.vo.inspection.setting; - -import com.cool.store.entity.HyInspectionSettingDO; -import com.github.pagehelper.Page; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingPageVO - * @Description: - * @date 2023-07-17 14:32 - */ -@Data -public class InspectionSettingPageVO { - - @ApiModelProperty("id") - private Long inspectionSettingId; - - @ApiModelProperty("区域名称") - private String zoneName; - - @ApiModelProperty("稽核人id") - private String inspectionUserId; - - @ApiModelProperty("稽核人名称") - private String inspectionUserName; - - @ApiModelProperty("更新时间") - private Date updateTime; - - @ApiModelProperty("更新人名称") - private String updateUserName; - - /** - * dto转vo - * @param pageList - * @param userNameMap - * @return - */ - public static List convert(Page pageList, Map userNameMap){ - if(CollectionUtils.isEmpty(pageList)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (HyInspectionSettingDO inspectionSetting : pageList) { - InspectionSettingPageVO result = new InspectionSettingPageVO(); - result.setInspectionSettingId(inspectionSetting.getId()); - result.setZoneName(inspectionSetting.getZoneName()); - result.setInspectionUserId(inspectionSetting.getInspectionUserId()); - result.setInspectionUserName(userNameMap.get(inspectionSetting.getInspectionUserId())); - result.setUpdateTime(inspectionSetting.getUpdateTime()); - result.setUpdateUserName(userNameMap.get(inspectionSetting.getUpdateUserId())); - resultList.add(result); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CalendarInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CalendarInfo.java deleted file mode 100644 index 59ac84d88..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CalendarInfo.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.cool.store.vo.interview; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:21 - * @Description: - */ -@ApiModel(description = "日期列表") -public class CalendarInfo { - @ApiModelProperty("星期几") - private Integer dayOfWeek; - - @ApiModelProperty("年份") - private String year; - - @ApiModelProperty("月份") - private String month; - - @ApiModelProperty("日期") - private String day; - - @ApiModelProperty("日期字符串") - private String dateStr; - - @ApiModelProperty("忙闲清单") - private List freeBusyList; - - public CalendarInfo(Integer dayOfWeek, String year, String month, String day, String dateStr, List freeBusyList) { - this.dayOfWeek = dayOfWeek; - this.year = year; - this.month = month; - this.day = day; - this.dateStr = dateStr; - this.freeBusyList = freeBusyList; - } - - public String getDateStr() { - return dateStr; - } - - public void setDateStr(String dateStr) { - this.dateStr = dateStr; - } - - public List getFreeBusyList() { - return freeBusyList; - } - - public void setFreeBusyList(List freeBusyList) { - this.freeBusyList = freeBusyList; - } - - public Integer getDayOfWeek() { - return dayOfWeek; - } - - public void setDayOfWeek(Integer dayOfWeek) { - this.dayOfWeek = dayOfWeek; - } - - public String getYear() { - return year; - } - - public void setYear(String year) { - this.year = year; - } - - public String getMonth() { - return month; - } - - public void setMonth(String month) { - this.month = month; - } - - public String getDay() { - return day; - } - - public void setDay(String day) { - this.day = day; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CreateAppointmentVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CreateAppointmentVO.java deleted file mode 100644 index 0d4e28f9a..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CreateAppointmentVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.vo.interview; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @Author: young.yu - * @Date: 2023-06-18 18:17 - * @Description: - */ -@ApiModel(description = "创建面试预约信息") -public class CreateAppointmentVO { - @ApiModelProperty("面试安排id") - private String interviewPlanId; - - public CreateAppointmentVO() { - } - - public CreateAppointmentVO(String interviewPlanId) { - this.interviewPlanId = interviewPlanId; - } - - public String getInterviewPlanId() { - return interviewPlanId; - } - - public void setInterviewPlanId(String interviewPlanId) { - this.interviewPlanId = interviewPlanId; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/FreeBusyInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/FreeBusyInfo.java deleted file mode 100644 index b5e307e93..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/FreeBusyInfo.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.cool.store.vo.interview; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -/** - * @Author: young.yu - * @Date: 2023-06-16 13:25 - * @Description: - */ -@ApiModel(description = "日程忙闲信息") -public class FreeBusyInfo { - @ApiModelProperty("开始时间") - private String startTime; - - @ApiModelProperty("结束时间") - private String endTime; - - @ApiModelProperty("是否空闲") - private boolean free; - - @ApiModelProperty("预约人数") - private Integer appointmentCount; - - @ApiModelProperty("是否被成功预约") - private Boolean booked; - - @ApiModelProperty("是否是自己预约的时间段") - private Boolean selfBooked; - - public FreeBusyInfo(String startTime, String endTime, boolean free) { - this.startTime = startTime; - this.endTime = endTime; - this.free = free; - } - - public FreeBusyInfo(String startTime, String endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - - public FreeBusyInfo(String startTime, String endTime, boolean free, Integer appointmentCount, Boolean booked) { - this.startTime = startTime; - this.endTime = endTime; - this.free = free; - this.appointmentCount = appointmentCount; - this.booked = booked; - } - - public FreeBusyInfo(String startTime, String endTime, boolean free, Integer appointmentCount, Boolean booked, Boolean selfBooked) { - this.startTime = startTime; - this.endTime = endTime; - this.free = free; - this.appointmentCount = appointmentCount; - this.booked = booked; - this.selfBooked = selfBooked; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public boolean getFree() { - return free; - } - - public void setFree(boolean free) { - this.free = free; - } - - public Integer getAppointmentCount() { - return appointmentCount; - } - - public void setAppointmentCount(Integer appointmentCount) { - this.appointmentCount = appointmentCount; - } - - public Boolean getBooked() { - return booked; - } - - public void setBooked(Boolean booked) { - this.booked = booked; - } - - public boolean isFree() { - return free; - } - - public Boolean getSelfBooked() { - return selfBooked; - } - - public void setSelfBooked(Boolean selfBooked) { - this.selfBooked = selfBooked; - } -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java deleted file mode 100644 index 6687e6e37..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetFreeBusyListVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.vo.interview; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:19 - * @Description: - */ -@ApiModel(description = "日程忙闲信息") -@Data -public class GetFreeBusyListVO { - - @ApiModelProperty("忙闲列表") - private List calendarList; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetInterviewInspectionHistoryListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetInterviewInspectionHistoryListVO.java deleted file mode 100644 index 3c4f50220..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/GetInterviewInspectionHistoryListVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.vo.interview; - - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @Author: hxd - * @Date: 2023-06-16 13:19 - * @Description: - */ -@Data -@Accessors(chain = true) -@ApiModel(description = "面试稽核历史") -public class GetInterviewInspectionHistoryListVO { - - @ApiModelProperty("面试稽核历史列表") - private List interviewInspectionHistoryInfos; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionHistoryInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionHistoryInfo.java deleted file mode 100644 index 4e504fa4c..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionHistoryInfo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.vo.interview; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Author: hxd - * @Date: 2023-06-16 13:19 - * @Description: - */ -@ApiModel(description = "面试稽核历史详情") -@Data -public class InterviewInspectionHistoryInfo { - - @ApiModelProperty(value = "操作人姓名") - private String operatorUserName; - - @ApiModelProperty(value = "操作人电话") - private String operatorUserMobile; - - @ApiModelProperty(value = "稽核时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date inspectionTime; - - - @ApiModelProperty(value = "原因") - private String description; - - @ApiModelProperty(value = "操作类型") - private String operationType; - - @ApiModelProperty(value = "凭证或者证据") - private List files; - - - private String filesStr; - - @ApiModelProperty(value = "id") - private Long id; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionInfo.java deleted file mode 100644 index f38317202..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cool.store.vo.interview; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; -import java.util.List; - -/** - * @Author: hxd - * @Date: 2023-06-08 16:26 - * @Description: - */ -@Data -@Accessors(chain = true) -@ApiModel(description = "面试稽核详情信息") -public class InterviewInspectionInfo { - - @ApiModelProperty(value = "稽核人姓名") - private String auditorName; - - @ApiModelProperty(value = "稽核人电话") - private String auditorMobile; - - @ApiModelProperty(value = "稽核时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date inspectionTime; - - @ApiModelProperty(value = "稽核结果（0为未稽核，1为合格，2为不合格，3为撤销）") - private Integer status; - - @ApiModelProperty(value = "稽核说明") - private String description; - - @ApiModelProperty(value = "凭证或者证据") - private List files; - - private String filesStr; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionResultVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionResultVO.java deleted file mode 100644 index abf593bc9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionResultVO.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cool.store.vo.interview; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @Author: HXD - * @Date: 2023-06-08 16:26 - * @Description: - */ -@Data -@Accessors(chain = true) -@ApiModel(description = "面试稽核结果信息") -public class InterviewInspectionResultVO { - - - - @ApiModelProperty(value = "id") - private String id; - - - - @ApiModelProperty(value = "面试计划id") - private Integer interviewPlanId; - - - @ApiModelProperty(value = "被面试人姓名") - private String intervieweeName; - - - @ApiModelProperty(value = "被面试人手机号") - private String intervieweeMobile; - - @ApiModelProperty(value = "意向开店区域") - private String wantShopAreaName; - - @ApiModelProperty(value = "面试通过时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date interviewPassTime; - - @ApiModelProperty(value = "稽核状态（0为未稽核，1为合格，2为不合格）") - private Integer status; - - @ApiModelProperty(value = "稽核人姓名") - private String auditorName; - - @ApiModelProperty(value = "稽核人电话") - private String auditorMobile; - - - @ApiModelProperty(value = "稽核时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date inspectionTime; - -} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionVO.java deleted file mode 100644 index f03a29fb2..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewInspectionVO.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.cool.store.vo.interview; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -/** - * @Author: HXD - * @Date: 2023-06-08 16:26 - * @Description: - */ -@Data -@Accessors(chain = true) -@ApiModel(description = "面试稽核信息") -public class InterviewInspectionVO { - - @ApiModelProperty(value = "面试官姓名") - private String interviewerName; - - @ApiModelProperty(value = "面试官手机号") - private String interviewerMobile; - - @ApiModelProperty(value = "被面试人姓名") - private String intervieweeName; - - - @ApiModelProperty(value = "被面试人手机号") - private String intervieweeMobile; - - @ApiModelProperty(value = "意向开店区域") - private String wantShopAreaName; - - @ApiModelProperty(value = "面试通过时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date interviewPassTime; - - @ApiModelProperty(value = "稽核状态（0为未稽核，1为合格，2为不合格）") - private Integer status; - - @ApiModelProperty(value = "稽核人姓名") - private String auditorName; - - @ApiModelProperty(value = "稽核人电话") - private String auditorMobile; - - - @ApiModelProperty(value = "稽核时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date inspectionTime; - - @ApiModelProperty(value = "稽核表id") - private Long id; - - @ApiModelProperty(value = "面试计划id") - private Integer interviewPlanId; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java deleted file mode 100644 index b6c42af22..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.cool.store.vo.interview; - -import com.cool.store.entity.EnterpriseUserDO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-08 16:26 - * @Description: - */ -@Data -@ApiModel(description = "面试信息") -public class InterviewVO { - - @ApiModelProperty(value = "面试计划id", required = true) - private String interviewPlanId; - - @ApiModelProperty(value = "会议id", required = true) - private String interviewId; - - @ApiModelProperty(value = "线索id", required = true) - private Long partnerLineId; - - @ApiModelProperty(value = "流程阶段") - private Long workflowStage; - - @ApiModelProperty(value = "线索状态") - private Long lineStatus; - - @ApiModelProperty("资质审核流程id") - private String qualifyVerifyId; - - @ApiModelProperty("意向合同编号") - private String intentionContractNo; - - @ApiModelProperty("审核通过时间") - private String passTime; - - @ApiModelProperty("审核通过原因") - private String passReason; - - @ApiModelProperty(value = "加盟商用户编号") - private String partnerId; - - @ApiModelProperty(value = "被面试人姓名", required = true) - private String partnerName; - - @ApiModelProperty(value = "被面试人手机号", required = true) - private String partnerMobile; - - @ApiModelProperty(value = "房间号", required = true) - private String roomId; - - @ApiModelProperty(value = "会议计划开始时间", required = true, example = "2023-06-03 10:00") - private String startTime; - - @ApiModelProperty(value = "面试官人员编号") - private String interviewerId; - - @ApiModelProperty(value = "面试官姓名", required = true) - private String interviewerName; - - @ApiModelProperty(value = "面试官手机号", required = true) - private String interviewerMobile; - - @ApiModelProperty(value = "记录人id", required = true) - private String recorderId; - - @ApiModelProperty(value = "记录人姓名", required = true) - private String recorderName; - - @ApiModelProperty(value = "记录人电话", required = true) - private String recorderMobile; - - @ApiModelProperty(value = "记录时间", required = true) - private String recordTime; - - @ApiModelProperty(value = "面试总结", required = true) - private String summary; - - @ApiModelProperty(value = "房间状态(0待开放;1已开放;2已关闭)", required = true) - private String roomStatus; - - @ApiModelProperty(value = "会议结束时间", required = true, example = "2023-06-03 12:00") - private String endTime; - - @ApiModelProperty(value = "面试实际开始时间", required = true, example = "2023-06-03 12:00") - private String actualStartTime; - - @ApiModelProperty(value = "面试实际结束时间", required = true, example = "2023-06-03 12:00") - private String actualEndTime; - - @ApiModelProperty(value = "预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝", required = true) - private Integer status; - - @ApiModelProperty(value = "面试过程信息视频URL数组", required = true) - private List videoList; - - @ApiModelProperty(value = "面试过程信息未解析String", required = false) - private String processInfo; - - @ApiModelProperty("授权码") - private String authCode; - - @ApiModelProperty("通过函有效期至") - private String expiryDate; - - @ApiModelProperty("通过函PDF文件URL") - private String passPdfUrl; - - @ApiModelProperty("通过函图片文件URL") - private String passImageUrl; - - @ApiModelProperty("飞书日历id") - private String feishuCalendarId; - - @ApiModelProperty("飞书日程id") - private String feishuScheduleId; - - @ApiModelProperty("开发主管信息") - private EnterpriseUserDO developmentDirector; - - @ApiModelProperty("所属战区id") - private String affiliationZone; - - @ApiModelProperty("该时间段是否被预约成功") - private Boolean booked; - - @ApiModelProperty("该时间段面试预约人数") - private Integer appointmentCount; - - @ApiModelProperty("该时段是否是自己预约的（不一定代表预约成功）") - private Boolean selfBooked; - - @ApiModelProperty("是否是通过会销进行的面试") - private Boolean whetherExhibitionInterview; - - @ApiModelProperty("参加的相应展会名称") - private String exhibitionName; - - @ApiModelProperty("展会日期") - private String exhibitionDate; - - @ApiModelProperty("进行面试的会销创建人姓名") - private String exhibitionCreatorName; - - @ApiModelProperty("进行面试的会销创建人手机号") - private String exhibitionCreatorMobile; - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/log/LogFieldVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/log/LogFieldVO.java deleted file mode 100644 index 25c02d714..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/log/LogFieldVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.vo.log; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @Author: young.yu - * @Date: 2023-06-28 15:32 - * @Description: - */ -@Data -public class LogFieldVO { - - @ApiModelProperty("字段名称") - private String code; - - @ApiModelProperty("字段定义") - private String name; - - @ApiModelProperty("字段值") - private Object value; - - public static List convertLogField(Object object){ - Field[] declaredFields = object.getClass().getDeclaredFields(); - List resultList = new ArrayList<>(); - for (Field declaredField : declaredFields) { - try { - declaredField.setAccessible(true); - LogFieldVO field = new LogFieldVO(); - ApiModelProperty annotation = declaredField.getAnnotation(ApiModelProperty.class); - if(Objects.nonNull(annotation)){ - field.setName(annotation.value()); - } - field.setCode(declaredField.getName()); - field.setValue(declaredField.get(object)); - resultList.add(field); - } catch (IllegalAccessException e) { - continue; - } - } - return resultList; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java deleted file mode 100644 index 5e809caea..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cool.store.vo.menu; - -import com.cool.store.entity.SysMenuDO; -import com.cool.store.enums.MenuTypeEnum; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/09/22 - */ -@Data -public class MenuAuthTreeVO { - - @ApiModelProperty("请求地址(前端路由)") - private String path; - - @ApiModelProperty("菜单编号") - private String code; - - @ApiModelProperty("菜单名称") - private String name; - - @ApiModelProperty("菜单id") - private Long id; - - @ApiModelProperty("父级菜单") - private Long parentId; - - @ApiModelProperty("图标'") - private String icon; - - @ApiModelProperty("菜单类型 1菜单 2权限") - private Integer menuType; - - @ApiModelProperty("子菜单") - private List children; - - public static List dealMenuTree(Long rootId, List menuList) { - if(CollectionUtils.isEmpty(menuList)){ - return Lists.newArrayList(); - } - Map> parentGroup = ListUtils.emptyIfNull(menuList).stream().collect(Collectors.groupingBy(SysMenuDO::getParentId)); - List menuDOList = parentGroup.get(rootId); - if (CollectionUtils.isEmpty(menuDOList)) { - return Collections.emptyList(); - } - List voList = convertVO(menuDOList); - List treeVOList = new LinkedList<>(voList); - for (MenuAuthTreeVO data : treeVOList) { - getChild(data, parentGroup); - } - return treeVOList; - } - - public static List convertVO(List menuList) { - menuList = menuList.stream().sorted(Comparator.comparing(SysMenuDO::getSort)).collect(Collectors.toList()); - List resultList = new ArrayList<>(); - for (SysMenuDO menu : menuList) { - MenuAuthTreeVO vo = new MenuAuthTreeVO(); - vo.setId(menu.getId()); - vo.setParentId(menu.getParentId()); - vo.setName(menu.getName()); - vo.setCode(menu.getCode()); - vo.setPath(menu.getPath()); - vo.setIcon(menu.getIcon()); - vo.setMenuType(menu.getMenuType()); - resultList.add(vo); - } - return resultList; - } - - public static void getChild(MenuAuthTreeVO data, Map> parentGroup) { - List menuList = parentGroup.get(data.getId()); - //属于菜单下时候 - if (CollectionUtils.isNotEmpty(menuList)) { - List voList = convertVO(menuList); - data.setChildren(voList); - voList.forEach(child -> { - getChild(child, parentGroup); - }); - } - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java deleted file mode 100644 index 2581724d9..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.cool.store.vo.menu; - -import com.cool.store.entity.SysMenuDO; -import com.cool.store.enums.MenuTypeEnum; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * describe: - * - * @author zhouyiping - * @date 2020/09/22 - */ -@Data -public class MenuTreeVO { - - @ApiModelProperty("请求地址(前端路由)") - private String path; - - @ApiModelProperty("菜单编号") - private String code; - - @ApiModelProperty("菜单名称") - private String name; - - @ApiModelProperty("菜单id") - private Long id; - - @ApiModelProperty("父级菜单") - private Long parentId; - - @ApiModelProperty("图标'") - private String icon; - - @ApiModelProperty("菜单类型 1菜单 2权限") - private Integer menuType; - - @ApiModelProperty("权限列表") - private List authorityList; - - @ApiModelProperty("子菜单") - private List children; - - public static List dealMenuTree(Long rootId, List menuList) { - if(CollectionUtils.isEmpty(menuList)){ - return Lists.newArrayList(); - } - Map> parentGroup = ListUtils.emptyIfNull(menuList).stream().collect(Collectors.groupingBy(SysMenuDO::getParentId)); - List menuDOList = parentGroup.get(rootId); - if (CollectionUtils.isEmpty(menuDOList)) { - return Collections.emptyList(); - } - List voList = convertVO(menuDOList); - List treeVOList = new LinkedList<>(voList); - for (MenuTreeVO data : treeVOList) { - getChild(data, parentGroup); - } - return treeVOList; - } - - public static List convertVO(List menuList) { - menuList = menuList.stream().sorted(Comparator.comparing(SysMenuDO::getSort)).collect(Collectors.toList()); - List resultList = new ArrayList<>(); - for (SysMenuDO menu : menuList) { - MenuTreeVO vo = new MenuTreeVO(); - vo.setId(menu.getId()); - vo.setParentId(menu.getParentId()); - vo.setName(menu.getName()); - vo.setCode(menu.getCode()); - vo.setPath(menu.getPath()); - vo.setIcon(menu.getIcon()); - vo.setMenuType(menu.getMenuType()); - resultList.add(vo); - } - return resultList; - } - - public static void getChild(MenuTreeVO data, Map> parentGroup) { - List sysMenuDOList = parentGroup.get(data.getId()); - List parentMenuList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.MENU.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); - List parentAuthList = ListUtils.emptyIfNull(sysMenuDOList).stream().filter(menu -> MenuTypeEnum.AUTH.getCode().equals(menu.getMenuType())).collect(Collectors.toList()); - //属于菜单下时候 - if (CollectionUtils.isNotEmpty(parentMenuList)) { - List voList = convertVO(parentMenuList); - List menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList()); - data.setChildren(menuList); - voList.forEach(child -> { - getChild(child, parentGroup); - }); - } - //数据是权限的的时候 - if (CollectionUtils.isNotEmpty(parentAuthList)) { - List authList = parentAuthList.stream().map(SysMenuDO::getCode).filter(Objects::nonNull).collect(Collectors.toList()); - data.setAuthorityList(authList); - } - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java deleted file mode 100644 index 930409690..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.vo.oss; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author zhangchenbiao - * @FileName: OssUploadConfigVO - * @Description: oss 上传config - * @date 2023-06-01 13:46 - */ -@Data -public class OssUploadConfigVO { - - @ApiModelProperty("域名") - private String accessKeyId; - - @ApiModelProperty("策略 Base64编过") - private String policy; - - @ApiModelProperty("对Policy签名后的字符串") - private String signature; - - @ApiModelProperty("上传目录") - private String dir; - - @ApiModelProperty("域名") - private String host; - - @ApiModelProperty("上传策略Policy失效时间") - private String expire; - - @ApiModelProperty("cdn地址") - private String cdnUrl; - - public OssUploadConfigVO(String accessKeyId, String policy, String signature, String dir, String host, String expire, String cdnUrl) { - this.accessKeyId = accessKeyId; - this.policy = policy; - this.signature = signature; - this.dir = dir; - this.host = host; - this.expire = expire; - this.cdnUrl = cdnUrl; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java deleted file mode 100644 index fec00de7e..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerSimpleBaseInfoVO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.vo.partner; - -import com.cool.store.dto.partner.UserPortraitDTO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: PartnerBaseInfoVO - * @Description: - * @date 2023-09-13 16:47 - */ -@Data -public class PartnerSimpleBaseInfoVO { - - @ApiModelProperty("线索id") - private Long partnerLineId; - - @ApiModelProperty("姓名") - private String username; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("意向区域") - private String wantShopArea; - - @ApiModelProperty("调剂方式") - private Integer acceptAdjustType; - - @ApiModelProperty("加盟申请基本信息ID") - private Long partnerBaseInfoId; - - private String liveArea; - - @ApiModelProperty("用户画像") - private List userPortrait; - - public static PartnerSimpleBaseInfoVO convertVO(Long partnerLineId, HyPartnerUserInfoDO partnerUserInfo){ - if(Objects.isNull(partnerUserInfo)){ - return null; - } - PartnerSimpleBaseInfoVO result = new PartnerSimpleBaseInfoVO(); - result.setPartnerLineId(partnerLineId); - result.setUsername(partnerUserInfo.getUsername()); - result.setMobile(partnerUserInfo.getMobile()); - result.setWantShopArea(partnerUserInfo.getWantShopArea()); - result.setLiveArea(partnerUserInfo.getLiveArea()); - result.setAcceptAdjustType(partnerUserInfo.getAcceptAdjustType()); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java deleted file mode 100644 index 56008d3bc..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.vo.partner; - -import com.cool.store.vo.exhibition.SignUpExhibitionVO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author suzhuhong - * @Date 2023/12/13 16:38 - * @Version 1.0 - */ -@Data -public class PartnerUserBaseVO extends SignUpExhibitionVO { - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("申请人姓名") - private String partnerName; - - @ApiModelProperty("意向开店区域") - private String wantShopArea; - - - public PartnerUserBaseVO() {} - public PartnerUserBaseVO(String mobile, String partnerName, String wantShopArea) { - this.mobile = mobile; - this.partnerName = partnerName; - this.wantShopArea = wantShopArea; - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionBaseInfoVO.java deleted file mode 100644 index a42576ff8..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionBaseInfoVO.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.vo.region; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.entity.RegionDO; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: RegionBaseInfoVO - * @Description: - * @date 2023-06-12 16:08 - */ -@Data -public class RegionBaseInfoVO { - - @ApiModelProperty("区域id") - private String regionId; - - @ApiModelProperty("区域名称") - private String name; - - @ApiModelProperty("子区域") - private List subRegionList; - - public RegionBaseInfoVO(String regionId, String name) { - this.regionId = regionId; - this.name = name; - } - - /** - * 转换成树 - * @param regionList - * @return - */ - public static RegionBaseInfoVO convertTree(List regionList){ - Map> parentMap = regionList.stream().collect(Collectors.groupingBy(k -> k.getParentId())); - RegionDO rootRegion = regionList.stream().filter(o -> CommonConstants.ZERO_STR.equals(o.getParentId())).findFirst().get(); - RegionBaseInfoVO result = new RegionBaseInfoVO(rootRegion.getRegionId(), rootRegion.getName()); - result.setSubRegionList(getSubRegion(rootRegion.getRegionId(), parentMap)); - return result; - } - - /** - * 获取子区域 - * @param regionId - * @param parentMap - * @return - */ - public static List getSubRegion(String regionId, Map> parentMap){ - List resultList = new ArrayList<>(); - if(Objects.isNull(parentMap) || StringUtils.isBlank(regionId)){ - return resultList; - } - List subRegion = parentMap.get(regionId); - if(CollectionUtils.isNotEmpty(subRegion)){ - for (RegionDO region : subRegion) { - RegionBaseInfoVO regionBaseInfo = new RegionBaseInfoVO(region.getRegionId(), region.getName()); - regionBaseInfo.setSubRegionList(getSubRegion(region.getRegionId(), parentMap)); - resultList.add(regionBaseInfo); - } - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionUserAndSubRegionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionUserAndSubRegionVO.java deleted file mode 100644 index a025b0235..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/region/RegionUserAndSubRegionVO.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.cool.store.vo.region; - -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.RegionDO; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: RegionUserAndSubRegionVO - * @Description: - * @date 2023-07-17 19:34 - */ -@Data -public class RegionUserAndSubRegionVO { - - @ApiModelProperty("区域列表") - private List regionList; - - @ApiModelProperty("用户列表") - private List userList; - - public RegionUserAndSubRegionVO(List regionList, List userList) { - this.regionList = regionList; - this.userList = userList; - } - - public RegionUserAndSubRegionVO() { - this.regionList = Lists.newArrayList(); - this.userList = Lists.newArrayList(); - } - - @Data - public static class RegionInfo{ - - @ApiModelProperty("区域id") - private String regionId; - - @ApiModelProperty("区域名称") - private String name; - - } - - @Data - public static class UserInfo{ - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("用户名") - private String username; - - @ApiModelProperty("手机号") - private String mobile; - - @ApiModelProperty("头像url") - private String avatar; - - } - - public static RegionUserAndSubRegionVO convertVO(List subRegionList, List userIds, Map userMap){ - List regionList = Lists.newArrayList(); - List userList = Lists.newArrayList(); - for (RegionDO regionDO : subRegionList) { - RegionInfo region = new RegionInfo(); - region.setRegionId(regionDO.getRegionId()); - region.setName(regionDO.getName()); - regionList.add(region); - } - for (String userId : userIds) { - EnterpriseUserDO enterpriseUser = userMap.get(userId); - if(Objects.isNull(enterpriseUser)){ - continue; - } - UserInfo userInfo = new UserInfo(); - userInfo.setUserId(userId); - userInfo.setUsername(enterpriseUser.getName()); - userInfo.setMobile(enterpriseUser.getMobile()); - userInfo.setAvatar(enterpriseUser.getAvatar()); - userList.add(userInfo); - } - return new RegionUserAndSubRegionVO(regionList, userList); - } -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RoleAuthInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RoleAuthInfoVO.java deleted file mode 100644 index 51f0a2797..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RoleAuthInfoVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.cool.store.vo.role; - -import com.cool.store.entity.SysRoleDO; -import com.cool.store.entity.SysRoleMenuDO; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.collections4.ListUtils; - -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: RoleAuthInfoVO - * @Description: - * @date 2023-07-25 15:11 - */ -@Data -public class RoleAuthInfoVO { - - @ApiModelProperty("角色id") - private String roleId; - - @ApiModelProperty("角色名称") - private String roleName; - - @ApiModelProperty("菜单ids") - private List menuIds; - - public static RoleAuthInfoVO convertVO(SysRoleDO role, List roleMenuList){ - if(Objects.isNull(role)){ - return null; - } - RoleAuthInfoVO result = new RoleAuthInfoVO(); - result.setRoleId(role.getRoleId()); - result.setRoleName(role.getRoleName()); - result.setMenuIds(ListUtils.emptyIfNull(roleMenuList).stream().map(SysRoleMenuDO::getMenuId).distinct().collect(Collectors.toList())); - return result; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java deleted file mode 100644 index 290b92750..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.vo.role; - -import com.cool.store.entity.SysRoleDO; -import com.google.common.collect.Lists; -import lombok.Data; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: RolePageVO - * @Description: - * @date 2023-07-25 15:10 - */ -@Data -public class RolePageVO { - - private String roleId; - - private String roleName; - - public static List convertList(List roleList){ - if(CollectionUtils.isEmpty(roleList)){ - return Lists.newArrayList(); - } - List resultList = new ArrayList<>(); - for (SysRoleDO sysRole : roleList) { - RolePageVO role = new RolePageVO(); - role.setRoleId(sysRole.getRoleId()); - role.setRoleName(sysRole.getRoleName()); - resultList.add(role); - } - return resultList; - } - -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/CodeSessionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/CodeSessionVO.java deleted file mode 100644 index b47148d61..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/CodeSessionVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.vo.wx; - -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - - -@Builder -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CodeSessionVO { - - private String openid; - - private String unionId; - - private String partnerId; - - private String mobile; -} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/MiniProgramUserVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/MiniProgramUserVO.java deleted file mode 100644 index 01e9c882f..000000000 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wx/MiniProgramUserVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.vo.wx; - -import lombok.Data; - - -@Data -public class MiniProgramUserVO { - private String openId; - private String nickName; - private String gender; - private String language; - private String city; - private String province; - private String country; - private String avatarUrl; - private String unionId; - private String wxUnionId; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/context/CurrentUserHolder.java b/coolstore-partner-service/src/main/java/com/cool/store/context/CurrentUserHolder.java index 537af7897..dfccc95f8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/context/CurrentUserHolder.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/context/CurrentUserHolder.java @@ -1,10 +1,8 @@ package com.cool.store.context; import com.alibaba.fastjson.JSON; -import com.cool.store.entity.SysRoleDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; -import org.apache.commons.lang3.SerializationException; import org.apache.commons.lang3.StringUtils; import java.util.Optional; @@ -16,39 +14,39 @@ public class CurrentUserHolder { private static final ThreadLocal contextHolder = new ThreadLocal(); - public static LoginUserInfo getUser() { - String userStr = contextHolder.get(); - if (StringUtils.isNotBlank(userStr)) { - return JSON.parseObject(userStr, LoginUserInfo.class); - } - return new LoginUserInfo(); - } - - public static void setUser(String user) { - contextHolder.set(user); - } - - public static void removeUser(){ - contextHolder.remove(); - } - - /** - * 仅登录态可获取 - * @return - */ - public static String getUserId(){ - LoginUserInfo user = getUser(); - return Optional.ofNullable(user).map(o->o.getUserId()).orElseThrow(()->new ServiceException(ErrorCodeEnum.ACCESS_TOKEN_INVALID)); - } - - /** - * 仅登录态可获取 - * @return - */ - public static String getRoleId(){ - LoginUserInfo user = getUser(); - return Optional.ofNullable(user).map(LoginUserInfo::getSysRole).map(SysRoleDO::getRoleId).orElse(null); - } +// public static LoginUserInfo getUser() { +// String userStr = contextHolder.get(); +// if (StringUtils.isNotBlank(userStr)) { +// return JSON.parseObject(userStr, LoginUserInfo.class); +// } +// return new LoginUserInfo(); +// } +// +// public static void setUser(String user) { +// contextHolder.set(user); +// } +// +// public static void removeUser(){ +// contextHolder.remove(); +// } +// +// /** +// * 仅登录态可获取 +// * @return +// */ +// public static String getUserId(){ +// LoginUserInfo user = getUser(); +// return Optional.ofNullable(user).map(o->o.getUserId()).orElseThrow(()->new ServiceException(ErrorCodeEnum.ACCESS_TOKEN_INVALID)); +// } +// +// /** +// * 仅登录态可获取 +// * @return +// */ +// public static String getRoleId(){ +// LoginUserInfo user = getUser(); +// return Optional.ofNullable(user).map(LoginUserInfo::getSysRole).map(SysRoleDO::getRoleId).orElse(null); +// } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java index 5d5c2c74d..1ca525a48 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java @@ -1,35 +1,34 @@ package com.cool.store.context; -import com.cool.store.entity.SysRoleDO; import lombok.Data; @Data public class LoginUserInfo { - private String userId; - - private String name; - - private String mobile; - - private String accessToken; - - /** - * 员工角色 - */ - private String roleIds; - - /** - * 钉钉管理员和数智门店无关 - */ - private Boolean isAdmin; - - /** - * 头像 - */ - private String avatar; - - private SysRoleDO sysRole; - - private Integer onlineStatus; +// private String userId; +// +// private String name; +// +// private String mobile; +// +// private String accessToken; +// +// /** +// * 员工角色 +// */ +// private String roleIds; +// +// /** +// * 钉钉管理员和数智门店无关 +// */ +// private Boolean isAdmin; +// +// /** +// * 头像 +// */ +// private String avatar; +// +// private SysRoleDO sysRole; +// +// private Integer onlineStatus; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/context/PartnerUserHolder.java b/coolstore-partner-service/src/main/java/com/cool/store/context/PartnerUserHolder.java index f0562e041..bd0ba5af2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/context/PartnerUserHolder.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/context/PartnerUserHolder.java @@ -1,7 +1,6 @@ package com.cool.store.context; import com.alibaba.fastjson.JSON; -import com.cool.store.vo.PartnerUserInfoVO; import org.apache.commons.lang3.StringUtils; /** @@ -9,23 +8,23 @@ import org.apache.commons.lang3.StringUtils; */ public class PartnerUserHolder { - private static final ThreadLocal contextHolder = new ThreadLocal(); - - public static PartnerUserInfoVO getUser() { - String userStr = contextHolder.get(); - if (StringUtils.isNotBlank(userStr)) { - return JSON.parseObject(userStr, PartnerUserInfoVO.class); - } - return new PartnerUserInfoVO(); - } - - public static void setUser(String user) { - contextHolder.set(user); - } - - public static void removeUser(){ - contextHolder.remove(); - } +// private static final ThreadLocal contextHolder = new ThreadLocal(); +// +// public static PartnerUserInfoVO getUser() { +// String userStr = contextHolder.get(); +// if (StringUtils.isNotBlank(userStr)) { +// return JSON.parseObject(userStr, PartnerUserInfoVO.class); +// } +// return new PartnerUserInfoVO(); +// } +// +// public static void setUser(String user) { +// contextHolder.set(user); +// } +// +// public static void removeUser(){ +// contextHolder.remove(); +// } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java deleted file mode 100644 index 72c29b2ff..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/EventCenterHttpRequest.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.cool.store.http; - -import cn.hutool.core.util.RandomUtil; -import com.alibaba.fastjson.JSON; -import com.cool.store.dto.response.ResultDTO; -import com.cool.store.enums.FeiShuNoticeMsgEnum; -import com.cool.store.enums.SMSMsgEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mq.util.HttpRestTemplateService; -import com.cool.store.request.event.CreateSingleEventRequest; -import com.cool.store.request.event.SendMsgRequest; -import com.cool.store.response.event.CreateEventResponse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Fun Li 2023/10/23 10:01 - * @version 1.0 - * 对接沪上阿姨事件中心 - */ -@Component -@Slf4j -public class EventCenterHttpRequest { - - @Resource - private HttpRestTemplateService httpRestTemplateService; - - /** - * 事件中心 url - */ - @Value("${hsay.event.url:null}") - private String eventUrl; - - /** - * pc 端飞书应用地址 - */ - @Value("${feishu.notice.link.url:null}") - private String PCLinkUrl; - - /** - * 移动端飞书应用地址 - */ - @Value("${feishu.notice.link.url.mobile:null}") - private String mobileLinkUrl; - - /** - * 本系统来源 - */ - @Value("${hsay.event.systemsource:null}") - private String source; - - @Value("#{'${sms.whiteList:,}'.split(',')}") - private List whiteList; - - private static final String PC_PATH_KEY = "pcPath"; - private static final String MOBILE_PATH_KEY = "mobilePath"; - - /** - * 创建单个事件 - * @param request {@link com.cool.store.request.event.CreateSingleEventRequest} - * @return - */ - private ResultDTO createSingleEvent(CreateSingleEventRequest request) throws ApiException { - ResultDTO response = httpRestTemplateService.postForObject(eventUrl + "/event/create", request, ResultDTO.class); - log.info("创建沪上阿姨事件中心事件，request: {}, response: {}", JSON.toJSONString(request), JSON.toJSONString(response)); - if (response.getCode() != 200) { - throw new ApiException("创建事件失败！"); - } - return response; - } - - /** - * 发送飞书通知 - * @param msgEnum {@link com.cool.store.enums.FeiShuNoticeMsgEnum} - * @param receiverIds 接收者 id，飞书为 user_id，不是 open_id - * @param objects 消息参数，飞书消息卡片为 参数名：参数，若路径跳转需要路径参数，也一起包含在里面 - */ - @Async - public void sendFeiShuNotice(FeiShuNoticeMsgEnum msgEnum, List receiverIds, Object... objects) throws ApiException { - //1. 组织消息参数，SendMsgRequest 的 cardParams，需要填入的参数为模板中 ${} 中的参数 - HashMap cardParams = new HashMap<>(); - String PCPath = msgEnum.getPCPath(); - String mobilePath = msgEnum.getMobilePath(); - Map pathMap = generatePath(PCPath, mobilePath, objects); - PCPath = pathMap.get(PC_PATH_KEY); - mobilePath = pathMap.get(MOBILE_PATH_KEY); - try { - PCPath = URLEncoder.encode(PCPath, "UTF-8"); - mobilePath = URLEncoder.encode(mobilePath, "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new ApiException("URL 编码错误"); - } - String PCWholePath = PCLinkUrl + PCPath; - String mobileWholePath = mobileLinkUrl + mobilePath; - cardParams.put("title", msgEnum.getTitle()); - cardParams.put("content", MessageFormat.format(msgEnum.getContent(), objects)); - cardParams.put("img_key", msgEnum.getImageMediaId()); - cardParams.put("common_url", PCWholePath); - cardParams.put("pc_url", PCWholePath); - cardParams.put("ios_url", mobileWholePath); - cardParams.put("android_url", mobileWholePath); - - //2. 组织消息发送请求体，即 CreateSingleEventRequest 的 content 字段 - SendMsgRequest sendFeiShuMsgRequest = SendMsgRequest.builder() - .receiverIds(receiverIds) - .platform("FEISHU") - .templateId(msgEnum.getTemplateCode()) - .cardParams(cardParams) - .build(); - - //3. 组织创建事件参数 - String randomNum = RandomUtil.randomNumbers(32); - CreateSingleEventRequest createEventRequest = CreateSingleEventRequest.builder() - .thirdPartyId(randomNum) - .bizSource(source) - .eventType("push_msg") - .content(JSON.toJSONString(sendFeiShuMsgRequest)) - .build(); - - //4. 创建事件 - createSingleEvent(createEventRequest); - } - - /** - * 发送短信通知 - * @param phone 接收者手机号 - * @param smsMsgEnum {@link com.cool.store.enums.SMSMsgEnum} - * @param objects 短信参数，短信的消息参数为 手机号: 参数1, 参数2, 参数3, 参数4, 参数5 - */ - @Async - public void sendSmsVariable(String phone, SMSMsgEnum smsMsgEnum, String... objects) throws ApiException { - - //为避免对真实线索造成困扰和便于测试，测试环境只给白名单手机号发短信 - //由于做了解析，whiteList 一定不是 bull，生产环境不配置该配置，会为一个空 List - if (!whiteList.isEmpty() && !whiteList.contains(phone)) { - return; - } - - //1. 组织消息参数，短信的消息参数为 手机号: 参数1, 参数2, 参数3, 参数4, 参数5，，需要填入的参数为模板中 ${} 中的参数 - HashMap smsParams = new HashMap<>(); - String params = String.join(",", Arrays.asList(objects)); - smsParams.put(phone, params); - - //2. 组织消息发送请求体，即 CreateSingleEventRequest 的 content 字段 - SendMsgRequest sendFeiShuMsgRequest = SendMsgRequest.builder() - .platform("SHORT_MESSAGE") - .templateId(smsMsgEnum.getTemplateCode()) - .cardParams(smsParams) - .build(); - - //3. 组织创建事件参数 - String randomNum = RandomUtil.randomNumbers(32); - CreateSingleEventRequest createEventRequest = CreateSingleEventRequest.builder() - .thirdPartyId(randomNum) - .bizSource(source) - .eventType("push_msg") - .content(JSON.toJSONString(sendFeiShuMsgRequest)) - .build(); - - //4. 创建事件 - createSingleEvent(createEventRequest); - } - - /** - * 格式化传入的跳转路径 - * 要求 PC 和 mobile 的路径参数数量相同、顺序相同（若无路径参数，则忽略） - * @param pcPath PC 跳转路径 - * @param mobilePath mobile 跳转路径 - * @param objects 公共参数 - * @return Map: {pcPath: 格式化后的 PC 跳转链接, mobilePath: 格式化后的 mobile 跳转链接} - */ - private Map generatePath(String pcPath, String mobilePath, Object... objects) { - int paramsCount = 0; - HashMap res = new HashMap<>(); - //初始化防空 - res.put(PC_PATH_KEY, pcPath); - res.put(MOBILE_PATH_KEY, mobilePath); - //格式化 - if (pcPath.contains("{0}")) { - MessageFormat pcMessageFormat = new MessageFormat(pcPath); - paramsCount = pcMessageFormat.getFormatsByArgumentIndex().length; - res.put(PC_PATH_KEY, pcMessageFormat.format(objects)); - } - if (mobilePath.contains("{0}")) { - MessageFormat mobileMessageFormat = new MessageFormat(mobilePath); - paramsCount = Math.max(mobileMessageFormat.getFormatsByArgumentIndex().length, paramsCount); - res.put(MOBILE_PATH_KEY, mobileMessageFormat.format(objects)); - } - System.arraycopy(objects, paramsCount, objects, 0, objects.length - paramsCount); - return res; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java deleted file mode 100644 index 200ef5364..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java +++ /dev/null @@ -1,417 +0,0 @@ -package com.cool.store.http; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.calendar.*; -import com.cool.store.dto.enterprise.AuthInfoDTO; -import com.cool.store.dto.enterprise.AuthScopeDTO; -import com.cool.store.dto.enterprise.EnterpriseUserDTO; -import com.cool.store.dto.enterprise.SysDepartmentDTO; -import com.cool.store.dto.login.UserIdInfoDTO; -import com.cool.store.dto.message.SendCardMessageDTO; -import com.cool.store.dto.response.ResultDTO; -import com.cool.store.enums.FeiShuNoticeMsgEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.mq.util.HttpRestTemplateService; -import com.cool.store.utils.Md5Utils; -import com.cool.store.utils.UUIDUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: ISVHttpRequest - * @Description: - * @date 2023-05-23 16:03 - */ -@Service -@Slf4j -public class ISVHttpRequest { - - @Value("${isv.domain:null}") - private String isvDomain; - @Resource - private HttpRestTemplateService httpRestTemplateService; - - public UserIdInfoDTO getUserIdByCode(String code){ - String url = isvDomain + "/user/getUserIdByCode"; - ResultDTO responseEntity = null; - HashMap requestMap = new HashMap(); - requestMap.put("code", code); - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserIdInfoDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public EnterpriseUserDTO getUserDetailByUserId(String userId){ - String url = isvDomain + "/user/getUserDetail"; - HashMap requestMap = new HashMap(); - requestMap.put("userId", userId); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), EnterpriseUserDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public List getAdminUserList(){ - String url = isvDomain + "/corp/getAdminUserList"; - HashMap requestMap = new HashMap(); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), String.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public AuthInfoDTO getAuthInfo(){ - String url = isvDomain + "/corp/getAuthInfo"; - HashMap requestMap = new HashMap(); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), AuthInfoDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public List getDepartments(String parentId){ - String url = isvDomain + "/corp/getDepartments"; - HashMap requestMap = new HashMap(); - requestMap.put("parentId", parentId); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), SysDepartmentDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - /** - * 获取部门详情 - * @param deptId - * @return - */ - public SysDepartmentDTO getDepartmentDetail(String deptId){ - String url = isvDomain + "/corp/getDepartmentDetail"; - HashMap requestMap = new HashMap(); - requestMap.put("deptId", deptId); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), SysDepartmentDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public AuthScopeDTO getAuthScope(){ - String url = isvDomain + "/corp/getAuthScope"; - HashMap requestMap = new HashMap(); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), AuthScopeDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public List getDepartmentUsers(String deptId){ - String url = isvDomain + "/corp/getDepartmentUsers"; - HashMap requestMap = new HashMap(); - requestMap.put("deptId", deptId); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), EnterpriseUserDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public List getUserDetailByUserIds(List userIdList) { - String url = isvDomain + "/corp/getUserDetailByUserIds"; - HashMap requestMap = new HashMap(); - requestMap.put("userIds", String.join(CommonConstants.COMMA, userIdList)); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), EnterpriseUserDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - public List getSubDepartments(String parentId, Boolean fetchChild) { - String url = isvDomain + "/corp/getSubDepartments"; - HashMap requestMap = new HashMap(); - requestMap.put("parentId", parentId); - requestMap.put("fetchChild", fetchChild); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), SysDepartmentDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ServiceException(e.getMessage()); - } - return null; - } - - /** - * 获取用户忙闲信息 - * @param userId - * @param startTime 开始时间 毫秒时间戳 - * @param endTime 截止时间 毫秒时间戳 - * @deprecated 1.5.2 后取消飞书日程的任何使用 - * @return - */ - @Deprecated - public List getFreeBusyList(String userId, long startTime, long endTime) throws ApiException{ - String url = isvDomain + "/user/getFreeBusyList"; - HashMap requestMap = new HashMap(); - requestMap.put("userId", userId); - requestMap.put("startTime", startTime); - requestMap.put("endTime", endTime); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), UserFreeBusyInfoDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 创建飞书日程 - * @param param - * @return - * @deprecated 1.5.2 后取消操作飞书日程 - * @throws ApiException - */ - @Deprecated - public UserCalendarsEventDTO createUserCalendarEvent(CreateCalendarEventDTO param) throws ApiException{ - String url = isvDomain + "/user/createUserCalendarEvent"; - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserCalendarsEventDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 更新飞书日程 - * @param param - * @return - * @deprecated 1.5.2 后取消操作飞书日程 - * @throws ApiException - */ - @Deprecated - public UserCalendarsEventDTO updateUserCalendarEvent(UpdateCalendarEventDTO param) throws ApiException{ - String url = isvDomain + "/user/updateUserCalendarEvent"; - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserCalendarsEventDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 取消飞书日程 - * @param param - * @return - * @deprecated 1.5.2 后取消操作飞书日程 - * @throws ApiException - */ - @Deprecated - public UserCalendarsEventDTO deleteUserCalendarEvent(DeleteCalendarEventDTO param) throws ApiException { - String url = isvDomain + "/user/deleteUserCalendarEvent"; - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.postForObject(url, param, ResultDTO.class, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserCalendarsEventDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 获取飞书日程 - * @param userId - * @param startTime - * @param endTime - * @return - * @throws ApiException - */ - public List getUserCalendarsEvents(String userId, long startTime, long endTime)throws ApiException{ - String url = isvDomain + "/user/getUserCalendarsEvents"; - HashMap requestMap = new HashMap(); - requestMap.put("userId", userId); - requestMap.put("startTime", startTime); - requestMap.put("endTime", endTime); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return JSONObject.parseArray(JSONObject.toJSONString(responseEntity.getData()), UserCalendarsEventDTO.class); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 发送飞书卡片消息 - * @param param - * @deprecated {@link EventCenterHttpRequest#sendFeiShuNotice(FeiShuNoticeMsgEnum, List, Object...)} - */ - @Deprecated - @Async - public void sendFeiShuCardMessage(SendCardMessageDTO param) throws ApiException{ - if(CollectionUtils.isEmpty(param.getUserIds()) || StringUtils.isAnyBlank(param.getTitle(), param.getContent(), param.getMessageUrl()) || Objects.isNull(param.getMessageType())){ - return; - } - String url = isvDomain + "/sendFeiShuCardMessage"; - ResultDTO responseEntity = null; - try { - FeiShuNoticeMsgEnum messageType = param.getMessageType(); - JSONObject request = JSONObject.parseObject(JSONObject.toJSONString(param)); - request.put("messageType", messageType.getMessageObject()); - responseEntity = httpRestTemplateService.postForObject(url, request, ResultDTO.class, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - } - - public String getWechatAccessToken(String appId, String appSecret)throws ApiException{ - String url = "https://isv-partner.hsay.com/isv/wechat/getWechatAccessToken"; - HashMap requestMap = new HashMap(); - requestMap.put("appId", appId); - requestMap.put("appSecret", appSecret); - ResultDTO responseEntity = null; - try { - responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap, getRequestHeadMap()); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ - return (String) responseEntity.getData(); - } - } catch (Exception e) { - log.info("调用isv出错{}", e); - throw new ApiException(e.getMessage()); - } - return null; - } - - public Map getRequestHeadMap(){ - String appKey = "qS13yHA4Z4"; - String appSecret = "1MddrP2MlUMAo9c5"; - String signStr ="appKey={0}&appSecret={1}&nonce={2}×tamp={3}"; - String nonce = UUIDUtils.get8UUID(); - String timestamp = String.valueOf(System.currentTimeMillis()); - String sign = Md5Utils.md5(MessageFormat.format(signStr, appKey, appSecret, nonce, timestamp)); - Map headMap = new HashMap<>(); - headMap.put("nonce", nonce); - headMap.put("sign", sign); - headMap.put("timestamp", timestamp); - return headMap; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java deleted file mode 100644 index 976de9aea..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.cool.store.http; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dto.mdm.AccessTokenDTO; -import com.cool.store.dto.response.MDMResultDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.request.RpcCreateQualifyVerifyReq; -import com.cool.store.request.RpcGetMdmTokenReq; -import com.cool.store.utils.RestTemplateUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.Resource; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -/** - * @author Fun Li 2023/9/12 10:07 - * @version 1.0 - */ -@Slf4j -@Service -public class MDMHttpRequest { - - @Value("${hs.mdm.baseUrl:null}") - private String mdmBaseUrl; - - @Value("${hs.mdm.appkey:null}") - private String mdmAppKey; - - @Value("${hs.mdm.appsec:null}") - private String mdmAppSec; - - /** - * 获取 mdm token - * @return token - * @throws ApiException 接口异常 - */ - public String getMdmAccessToken() throws ApiException { - RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); - rpcGetMDMTokenReq.setAppKey(mdmAppKey); - rpcGetMDMTokenReq.setAppSecret(mdmAppSec); - String url = mdmBaseUrl + "/api/oauth2/accessToken"; - ResponseEntity responseEntity = null; - try { - responseEntity = RestTemplateUtil.post(url,rpcGetMDMTokenReq, MDMResultDTO.class); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { - AccessTokenDTO accessTokenDTO = JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getData()), AccessTokenDTO.class); - if(accessTokenDTO == null || StringUtils.isBlank(accessTokenDTO.getAccessToken())){ - throw new ServiceException("获取Mdm token失败!"); - } - return accessTokenDTO.getAccessToken(); - } - } catch (Exception e) { - log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 获取 mdm 所有所属大区 - * @param headers - * @return - */ - public ResponseEntity getBelongRegion(Map headers) throws ApiException { - String url = mdmBaseUrl + "/api/openapi/regionget/getallregion"; - ResponseEntity responseEntity = null; - try { - //需要传一个空 body - RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); - RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data(); - rpcRequest.setData(dataBody); - responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); - log.info("url:{}, header:{}, response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity)); - checkResponse(responseEntity); - return responseEntity; - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - } - - - public ResponseEntity getDictList() throws ApiException { - String url = mdmBaseUrl + "/api/openapi/dict/api/dictListByCode?code=mdFraSource"; - ResponseEntity responseEntity = null; - try { - RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); - rpcGetMDMTokenReq.setAppKey(mdmAppKey); - rpcGetMDMTokenReq.setAppSecret(mdmAppSec); - Map headers = new HashMap<>(1); - headers.put("Authorization",getMdmAccessToken()); - responseEntity = RestTemplateUtil.get(url, headers, MDMResultDTO.class); - log.info("url:{}, header:{}, response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity)); - checkResponse(responseEntity); - if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { - return responseEntity; - } - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - return null; - } - - /** - * 获取 mdm 所有业务区域 - * @param headers headers - * @return ResponseEntity JSON - * @throws ApiException 接口异常 - */ - public ResponseEntity getBusinessRegion(Map headers) throws ApiException { - String url = mdmBaseUrl + "/api/openapi/regionget/getallbuarea"; - ResponseEntity responseEntity = null; - try { - //需要传一个空 body - RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); - RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data(); - rpcRequest.setData(dataBody); - responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); - log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity)); - checkResponse(responseEntity); - return responseEntity; - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - } - - /** - * 发起 mdm 审批 - * @param headers headers - * @param rpcRequest 请求参数 - * @return ResponseEntity JSON - * @throws ApiException 接口异常 - */ - public String createQualifyVerify(Map headers, RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{ - String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData"; - ResponseEntity responseEntity = null; - try { - responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); - log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity)); - checkResponse(responseEntity); - if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { - return JSONObject.toJSONString(responseEntity.getBody().getData()); - } - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - return null; - - } - - /** - * - * @param headers headers - * @param resource 资源文件 - * @return ResponseEntity - * @throws ApiException 接口异常 - */ - public ResponseEntity uploadFile(Map headers, Resource resource) throws ApiException { - String url = mdmBaseUrl + "/api/openapi/ext/upload/file"; - MultiValueMap param = new LinkedMultiValueMap<>(); - try { - param.add("file", resource); - ResponseEntity responseEntity = RestTemplateUtil.post(url, headers, param, MDMResultDTO.class); - log.info("url:{}, header:{}, response statusCode:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity.getStatusCode())); - checkResponse(responseEntity); - return responseEntity; - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - } - - private void checkResponse(ResponseEntity MDMResp) throws ApiException { - int code = Objects.requireNonNull(MDMResp.getBody()).getCode(); - if (code != 200) { - throw new ApiException(String.valueOf(MDMResp.getBody().getData())); - } - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/UserSourceResponse.java b/coolstore-partner-service/src/main/java/com/cool/store/http/UserSourceResponse.java deleted file mode 100644 index 2540b4974..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/UserSourceResponse.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.http; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -@Data -@Accessors(chain = true) -public class UserSourceResponse { - - private Integer code; - - private String msg; - - private List data; - - @Data - @Accessors(chain = true) - public static class ChannelSource{ - private String createTime; - - private Long id; - - private String name; - - private Integer userId; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java deleted file mode 100644 index ddf8fabe4..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.cool.store.http; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dto.wx.CodeSessionDTO; -import com.cool.store.dto.wx.MiniAppUrlLinkDTO; -import com.cool.store.dto.wx.MiniAppUrlLinkReqDTO; -import com.cool.store.dto.wx.PhoneInfoDTO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.mq.util.HttpRestTemplateService; -import com.cool.store.utils.RedisUtilPool; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.HashMap; - -/** - * @author zhangchenbiao - * @FileName: WechatRest - * @Description:微信api - * @date 2023-05-29 14:49 - */ -@Slf4j -@Service -public class WechatRest { - - @Resource - private RedisUtilPool redisUtilPool; - - @Resource - private HttpRestTemplateService httpRestTemplateService; - @Resource - private ISVHttpRequest isvHttpRequest; - - /** - * 小程序Token 地址 - */ - String ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; - /** - * 获取手机号码 地址 - */ - String GET_USERPHONENUMBER = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"; - - String GET_MINIAPP_URL_LINK = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=%s"; - - - public CodeSessionDTO miniProgramJsCodeSession(String appId, String secret, String jsCode){ - log.info("WechatRest#miniProgramJsCodeSession, jsCode:{}", jsCode); - String url = "https://api.weixin.qq.com/sns/jscode2session"; - HashMap requestMap = new HashMap(); - requestMap.put("appid", appId); - requestMap.put("secret", secret); - requestMap.put("js_code", jsCode); - requestMap.put("grant_type","authorization_code"); - try { - String responseStr = httpRestTemplateService.getForObject(url, String.class ,requestMap); - log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, responseStr); - if(StringUtils.isNotBlank(responseStr)){ - return JSONObject.parseObject(responseStr, CodeSessionDTO.class); - } - } catch (Exception e) { - log.info("调用微信服务异常{}", e); - throw new ServiceException(ErrorCodeEnum.WX_SERVICE_ERROR); - } - return null; - } - - public String getAccessToken(String appId, String secret) { - try { - return isvHttpRequest.getWechatAccessToken(appId, secret); - } catch (Exception e) { - log.error("获取微信小程序token异常", e); - throw new ServiceException(ErrorCodeEnum.GET_ACCESSTOKEN_ERROR); - } - } - - - public PhoneInfoDTO getUserPhoneNumber(String code, String accessToken){ - String reqUrl = String.format(GET_USERPHONENUMBER, accessToken); - HashMap requestMap = new HashMap(); - requestMap.put("code", code); - String responseStr = null; - try { - responseStr = httpRestTemplateService.postForObject(reqUrl, requestMap, String.class); - log.info("WechatRest#getUserPhoneNumber, reqUrl:{}, response:{}", reqUrl, responseStr); - if(StringUtils.isNotBlank(responseStr)){ - return JSONObject.parseObject(responseStr, PhoneInfoDTO.class); - } - } catch (Exception e) { - log.error("获取手机号异常", e); - } - return null; - } - - public MiniAppUrlLinkDTO getMiniAppUrlLink(String accessToken, MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO){ - String reqUrl = String.format(GET_MINIAPP_URL_LINK, accessToken); - String responseStr = null; - try { - responseStr = httpRestTemplateService.postForObject(reqUrl, miniAppUrlLinkReqDTO, String.class); - log.info("WechatRest#getUserPhoneNumber, reqUrl:{}, response:{}", reqUrl, responseStr); - if(StringUtils.isNotBlank(responseStr)){ - return JSONObject.parseObject(responseStr, MiniAppUrlLinkDTO.class); - } - } catch (Exception e) { - log.error("获取手机号异常", e); - } - return null; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java b/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java deleted file mode 100644 index c86786d31..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.cool.store.job; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.entity.SyncEcCustomerDO; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.mapper.HyPartnerUserInfoMapper; -import com.cool.store.sdk.ec.EcClient; -import com.cool.store.sdk.ec.request.SyncEcCustomerRequest; -import com.cool.store.service.EcSyncService; -import com.cool.store.utils.StringUtil; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -@Slf4j -@Component -public class EcSyncDataJob { - - @XxlJob("SyncUserSourceJob") - public void syncUserSourceJob() { - XxlJobHelper.log("-------------------------------定时同步客户来源开始-------------------------------"); - syncUserSourceExecute(); - XxlJobHelper.log("-------------------------------定时同步客户来源结束-------------------------------"); - XxlJobHelper.handleSuccess(); - } - - - @Value("${ec.baseUrl:null}") - private String baseUrl; - - @XxlJob("SyncAppletToEcJob") - public void syncAppletToEcJob() { - XxlJobHelper.log("-------------------------------定时同步小程序数据到ec开始-------------------------------"); - syncAppletToEcExecute(); - XxlJobHelper.log("-------------------------------定时同步小程序数据到ec结束-------------------------------"); - XxlJobHelper.handleSuccess(); - } - - @Resource - private EcSyncService ecSyncService; - - @Resource - private HyPartnerUserInfoMapper hyPartnerUserInfoMapper; - - - //定时同步用户来源开始 - private void syncUserSourceExecute() { - ecSyncService.getChannelSource(); - } - - private final Integer count=50; - - //定时同步小程序数据到ec - private void syncAppletToEcExecute() { - // 获取参数 - String param = XxlJobHelper.getJobParam(); - String startTime = ""; - if (StringUtil.isNotEmpty(param)) { - XxlJobHelper.log("输入参数为：" + param); - startTime = param; - } else { - startTime = getHourDayDate(-5, 0); - } - String endTime = DateUtil.now(); - //获取总数 - int size = hyPartnerUserInfoMapper.selectByHourDateCount(startTime, endTime); - //执行数 - int counts = size / count; - //取余，如果大于1，就再加一 - int yu = size % count; - if (yu > 0) { - counts += 1; - } - XxlJobHelper.log("开始时间为：" + startTime+"，结束时间为："+endTime); - for (int i = 1; i <= counts; i++) { - XxlJobHelper.log("执行limit1：" + count * (i - 1)+"，执行limit2："+count); - List list = hyPartnerUserInfoMapper.selectByHourDate(startTime, endTime,count * (i - 1),count); - SyncEcCustomerRequest syncEcCustomerRequest = new SyncEcCustomerRequest(); - syncEcCustomerRequest.setParameter(list); - EcClient ecClient = new EcClient(); - ecClient.exec(baseUrl,syncEcCustomerRequest); - } - } - - - private static String getHourDayDate(int hour, int day) { - Date today = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(today); - calendar.add(Calendar.HOUR, hour); - calendar.add(Calendar.DAY_OF_MONTH, day); - Date twoDay = calendar.getTime(); - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(twoDay); - } - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/ExhibitionJob.java b/coolstore-partner-service/src/main/java/com/cool/store/job/ExhibitionJob.java deleted file mode 100644 index d701c7da5..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/ExhibitionJob.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cool.store.job; - -import com.cool.store.service.ExhibitionService; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Date; - -/** - * @author Fun Li 2023/12/8 13:50 - * @version 1.0 - */ -@Slf4j -@Component -public class ExhibitionJob { - - @Autowired - private ExhibitionService exhibitionService; - - @XxlJob("autoCloseExhibition") - //每天 23:50:00 执行 - public void syncUserSourceJob() { - XxlJobHelper.log("-------------------------------自动结束会销任务开始-------------------------------"); - log.info("-------------------------------自动结束会销任务开始-------------------------------"); - int res = exhibitionService.autoCloseExhibition(new Date()); - log.info("-------------------------------自动结束会销任务结束，共结束" + res + "个会销-------------------------------"); - XxlJobHelper.log("-------------------------------自动结束会销任务结束，共结束" + res + "个会销-------------------------------"); - XxlJobHelper.handleSuccess(); - } - - @XxlJob("sendSMSToExhibitionApplicants") - //每天 10:00 执行 - public void sendSMSToExhibitionApplicants() { - XxlJobHelper.log("-------------------------------给被自动结束会销的参会人发送短信任务开始-------------------------------"); - log.info("-------------------------------给被自动结束会销的参会人发送短信任务开始-------------------------------"); - exhibitionService.sendSMSToExhibitionApplicants(); - log.info("-------------------------------给被自动结束会销的参会人发送短信任务结束-------------------------------"); - XxlJobHelper.log("-------------------------------给被自动结束会销的参会人发送短信任务结束-------------------------------"); - XxlJobHelper.handleSuccess(); - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java deleted file mode 100644 index 15fc747d3..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.cool.store.job; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.service.EnterpriseSyncService; -import com.cool.store.service.FollowTaskService; -import com.cool.store.service.HyPartnerInterviewPlanService; -import com.cool.store.utils.UUIDUtils; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.slf4j.MDC; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: JobHandler - * @Description: - * @date 2023-06-14 16:07 - */ -@Slf4j -@Service -public class JobHandler { - - @Resource - private EnterpriseSyncService enterpriseSyncService; - - @Autowired - private HyPartnerInterviewPlanService hyPartnerInterviewPlanService; - - @Resource - private FollowTaskService followTaskService; - - @XxlJob("syncOrganization") - public void syncOrganization(){ - log.info("组织架构定时同步开始"); - enterpriseSyncService.syncAll(); - log.info("组织架构同步结束"); - XxlJobHelper.handleSuccess(); - } - - /** - * 更新面试预约超时状态 - */ - @XxlJob("updateInterviewOverTime") - public void updateInterviewOverTime(){ - try { - log.info("面试超时预约定时任务已取消，请勿再执行"); - XxlJobHelper.log("面试超时预约定时任务已取消，请勿再执行"); -// hyPartnerInterviewPlanService.updateInterviewOverTime(); - log.info("面试超时预约定时任务结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("面试超时定时任务异常",e); - XxlJobHelper.log("面试超时定时任务异常"+e.getMessage()); - } - } - - @XxlJob("openInterviewRoom") - public void openInterviewRoom(){ - try { - log.info("房间状态开启定时任务开始"); - hyPartnerInterviewPlanService.openInterviewRoom(); - log.info("房间状态开启定时任务结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("房间状态开启定时任务异常",e); - XxlJobHelper.log("房间状态开启定时任务异常"+e.getMessage()); - } - } - - @XxlJob("approvalReminder") - public void approvalReminder(){ - try { - log.info("审批即将超时提醒开始"); - hyPartnerInterviewPlanService.approvalReminder(); - log.info("审批即将超时提醒结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("审批即将超时提醒定时任务异常",e); - XxlJobHelper.log("审批即将超时提醒定时任务异常"+e.getMessage()); - } - } - - @XxlJob("followTaskAnHourAgoRemind") - public void followTaskAnHourAgoRemind(){ - try { - MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get8UUID()); - log.info("跟进任务前一小时提醒开始"); - followTaskService.followTaskAnHourAgoRemind(); - log.info("跟进任务前一小时提醒结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("跟进任务前一小时提醒异常",e); - XxlJobHelper.log("跟进任务前一小时提醒异常"+e.getMessage()); - } - } - - @XxlJob("followTaskDailyRemind") - public void followTaskDailyRemind(){ - try { - MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get8UUID()); - log.info("跟进任务提醒开始"); - followTaskService.followTaskDailyRemind(); - log.info("跟进任务提醒结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("跟进任务提醒异常",e); - XxlJobHelper.log("跟进任务提醒异常"+e.getMessage()); - } - } - - @XxlJob("remindInterviewStartTomorrow") - public void remindInterviewStartTomorrow() { - try { - log.info("面试开始前一天20:00提醒开始"); - hyPartnerInterviewPlanService.remindInterviewStartTomorrow(); - log.info("面试开始前一天20:00提醒结束"); - XxlJobHelper.log("面试开始前一天20:00提醒成功"); - XxlJobHelper.handleSuccess(); - } catch (Exception e) { - log.error("面试开始前一天20:00提醒异常", e); - XxlJobHelper.log("面试开始前一天20:00提醒异常" + e.getMessage()); - } - } - - //每半小时执行一次，查询有无面试时间 x 在当前时间 y < x <= y + 30m 内，有就发短信 - @XxlJob("remindInterviewStartMinutes") - public void remindInterviewStartMinutes() { - try { - XxlJobHelper.log("面试开始前30分钟提醒开始"); - log.info("面试开始前30分钟提醒开始"); - hyPartnerInterviewPlanService.remindInterviewStartMinutes(); - log.info("面试开始前30分钟提醒结束"); - XxlJobHelper.log("面试开始前30分钟提醒结束"); - XxlJobHelper.handleSuccess(); - } catch (Exception e) { - log.error("面试开始前30分钟提醒异常", e); - XxlJobHelper.log("面试开始前30分钟提醒异常" + e.getMessage()); - } - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/SyncEcCustomerLabelJob.java b/coolstore-partner-service/src/main/java/com/cool/store/job/SyncEcCustomerLabelJob.java deleted file mode 100644 index 3ae52a0df..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/SyncEcCustomerLabelJob.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.cool.store.job; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.entity.SyncEcCustomerDO; -import com.cool.store.entity.SyncEcCustomerLabelDO; -import com.cool.store.mapper.HyPartnerBaseInfoMapper; -import com.cool.store.sdk.ec.EcClient; -import com.cool.store.sdk.ec.request.SyncEcCustomerLabelRequest; -import com.cool.store.sdk.ec.request.SyncEcCustomerRequest; -import com.cool.store.sdk.ec.response.SyncEcCustomerLabelResponse; -import com.cool.store.service.HyPartnerBaseInfoService; -import com.cool.store.utils.MybatisBatchUtils; -import com.cool.store.utils.StringUtil; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author hxd - */ -@Slf4j -@Component -public class SyncEcCustomerLabelJob { - - @Value("${ec.baseUrl:null}") - private String baseUrl; - - @Resource - private HyPartnerBaseInfoMapper hyPartnerBaseInfoMapper; - - @XxlJob("SyncEcCustomerLabelJob") - public void execute() { - XxlJobHelper.log("-------------------------------同步ec客户标签数据到小程序开始-------------------------------"); - syncEcLabelExecute(); - XxlJobHelper.log("-------------------------------同步ec标签数据到小程序结束-------------------------------"); - XxlJobHelper.handleSuccess(); - } - - @Autowired - private MybatisBatchUtils mybatisBatchUtils; - - private final Integer count = 20; - - /** - * 同步ec标签到招商数据库中 - */ - private void syncEcLabelExecute() { - //获取总数 - int size = hyPartnerBaseInfoMapper.selectAllList(); - //执行数 - int counts = size / count; - //取余，如果大于1，就再加一 - int yu = size % count; - if (yu > 0) { - counts += 1; - } - for (int i = 1; i <= counts; i++) { - XxlJobHelper.log("执行limit1：" + count * (i - 1) + "，执行limit2：" + count); - List list = hyPartnerBaseInfoMapper.selectListByLimit(count * (i - 1), count); - SyncEcCustomerLabelRequest syncEcCustomerLabelRequest = new SyncEcCustomerLabelRequest(); - syncEcCustomerLabelRequest.setParameter(list); - EcClient ecClient = new EcClient(); - SyncEcCustomerLabelResponse exec = ecClient.exec(baseUrl, syncEcCustomerLabelRequest); - if (ObjectUtil.isNull(exec)) { - continue; - } - List execList = exec.getData(); - if (CollectionUtils.isEmpty(execList)) { - continue; - } - List collect = execList.stream().map((item) -> { - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); - BeanUtil.copyProperties(item, hyPartnerBaseInfoDO); - return hyPartnerBaseInfoDO; - }).collect(Collectors.toList()); - mybatisBatchUtils.batchInsertOrUpdate(collect, HyPartnerBaseInfoMapper.class, (record, mapper) -> mapper.updateByMobile(record)); - } - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java index 5522785b0..ad8e55b85 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java @@ -8,7 +8,6 @@ import com.aliyun.openservices.ons.api.bean.Subscription; import com.cool.store.constants.CommonConstants; import com.cool.store.enums.RocketMqGroupEnum; import com.cool.store.mq.RocketMqConfig; -import com.cool.store.mq.consumer.listener.FeiShuEventListener; import com.google.common.collect.Maps; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -28,8 +27,8 @@ public class ConsumerClient { @Resource private RocketMqConfig rocketMqConfig; - @Resource - private FeiShuEventListener feiShuEventListener; +// @Resource +// private FeiShuEventListener feiShuEventListener; /** * 获取通用配置 @@ -69,17 +68,17 @@ public class ConsumerClient { * 用户事件监听 * @return */ - @Bean(initMethod = "start", destroyMethod = "shutdown") - public ConsumerBean test() { - RocketMqGroupEnum groupEnum = RocketMqGroupEnum.FEI_SHU_EVENT_LISTENER; - ConsumerBean consumerBean = new ConsumerBean(); - //配置文件 - Properties properties = getCommonProperties(groupEnum); - consumerBean.setProperties(properties); - Map commonSubscriptionTable = getCommonSubscriptionTable(groupEnum, feiShuEventListener); - //订阅多个topic如上面设置 - consumerBean.setSubscriptionTable(commonSubscriptionTable); - return consumerBean; - } +// @Bean(initMethod = "start", destroyMethod = "shutdown") +// public ConsumerBean test() { +// RocketMqGroupEnum groupEnum = RocketMqGroupEnum.FEI_SHU_EVENT_LISTENER; +// ConsumerBean consumerBean = new ConsumerBean(); +// //配置文件 +// Properties properties = getCommonProperties(groupEnum); +// consumerBean.setProperties(properties); +//// Map commonSubscriptionTable = getCommonSubscriptionTable(groupEnum, feiShuEventListener); +// //订阅多个topic如上面设置 +// consumerBean.setSubscriptionTable(commonSubscriptionTable); +// return consumerBean; +// } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/FeiShuEventListener.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/FeiShuEventListener.java deleted file mode 100644 index b999b3999..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/listener/FeiShuEventListener.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cool.store.mq.consumer.listener; - -import com.alibaba.fastjson.JSONObject; -import com.aliyun.openservices.ons.api.Action; -import com.aliyun.openservices.ons.api.ConsumeContext; -import com.aliyun.openservices.ons.api.Message; -import com.aliyun.openservices.ons.api.MessageListener; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dto.buser.UserEventDTO; -import com.cool.store.dto.dept.DepartmentEventDTO; -import com.cool.store.enums.RocketMqTagEnum; -import com.cool.store.service.EnterpriseSyncService; -import com.cool.store.utils.RedisUtilPool; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseInitService - * @Description: 消息监听 - * @date 2023-06-09 16:28 - */ -@Slf4j -@Service -public class FeiShuEventListener implements MessageListener { - - @Autowired - private RedisUtilPool redisUtilPool; - @Autowired - private EnterpriseSyncService enterpriseSyncService; - - @Override - public Action consume(Message message, ConsumeContext context) { - String text = new String(message.getBody()); - if(StringUtils.isBlank(text)){ - log.info("消息体为空,tag:{},messageId:{}",message.getTag(),message.getMsgID()); - return Action.CommitMessage; - } - log.info("重试消费次数 messageId：{}，try times：{}", message.getMsgID(), message.getReconsumeTimes()); - String lockKey = "DingMsgDealListener:" + message.getMsgID(); - boolean lock = redisUtilPool.setNxExpire(lockKey, message.getMsgID(), CommonConstants.NORMAL_LOCK_TIMES); - if(lock){ - try { - RocketMqTagEnum tag = RocketMqTagEnum.getByTag(message.getTag()); - switch (tag){ - case USER_EVENT: - UserEventDTO userBody = JSONObject.parseObject(text, UserEventDTO.class); - enterpriseSyncService.userUpdateEvent(userBody); - break; - case AUTH_SCOPE_CHANGE: - enterpriseSyncService.syncAll(); - break; - case DEPT_EVENT: - DepartmentEventDTO deptBody = JSONObject.parseObject(text, DepartmentEventDTO.class); - enterpriseSyncService.deptUpdateEvent(deptBody); - break; - default: - break; - } - }catch (Exception e){ - log.error("DingMsgDealListener consume dealAddressBookChange error",e); - return Action.ReconsumeLater; - } finally { - redisUtilPool.delKey(lockKey); - } - log.info("消费成功,tag:{},messageId:{}",message.getTag(),message.getMsgID()); - return Action.CommitMessage; - } - return Action.ReconsumeLater; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/sdk/ec/response/SyncEcCustomerLabelResponse.java b/coolstore-partner-service/src/main/java/com/cool/store/sdk/ec/response/SyncEcCustomerLabelResponse.java index bff4190f0..07afec140 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/sdk/ec/response/SyncEcCustomerLabelResponse.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/sdk/ec/response/SyncEcCustomerLabelResponse.java @@ -1,7 +1,6 @@ package com.cool.store.sdk.ec.response; -import com.cool.store.entity.SyncEcCustomerLabelDO; import com.cool.store.sdk.ec.core.EcResponse; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,6 +16,6 @@ import java.util.List; @Accessors(chain = true) public class SyncEcCustomerLabelResponse extends EcResponse { - private List data; +// private List data; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AdvanceSettingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AdvanceSettingService.java deleted file mode 100644 index 6b57aece8..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AdvanceSettingService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.AdvancedSettingRequest; -import com.cool.store.vo.AdvancedSettingVO; - -/** - * @Author suzhuhong - * @Date 2023/6/14 20:31 - * @Version 1.0 - */ -public interface AdvanceSettingService { - - - /** - * addAdvanceSetting - * @param userId - * @param advancedSettingRequest - * @return - */ - Boolean addOrUpdateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest); - - - - /** - * 查询高级设置详情 - * @return - */ - AdvancedSettingVO getAdvancedSettingDetail(); - - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java deleted file mode 100644 index 7ec359b0c..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.partner.DescribePhoneNumberDTO; -import com.cool.store.enums.IDCardSideEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.cuser.IdentityCardInfoVO; - -/** - * @author zhangchenbiao - * @FileName: AliyunService - * @Description:阿里云相关服务 - * @date 2023-06-15 20:04 - */ -public interface AliyunService { - - /** - * 获取手机号归属信息 - * @param phoneNumber - * @return - */ - DescribePhoneNumberDTO getPhoneNumberAttribute(String phoneNumber); - - /** - * 根据身份证正面获取信息 - * @param faceImageUrl - * @return - */ - IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl, IDCardSideEnum sideEnum) throws ApiException; - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java deleted file mode 100644 index 42da54d91..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/BeautyCameraSettingService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; -import com.cool.store.vo.beauty.BeautyCameraSettingVO; - -/** - * @author zhangchenbiao - * @FileName: BeautyCameraSettingService - * @Description: 美颜配置service - * @date 2023-09-11 14:23 - */ -public interface BeautyCameraSettingService { - - /** - * AddBeautyCameraSettingRequest request - * @param userId - * @param request - * @return - */ - Long saveBeautyCameraSetting(String userId, AddBeautyCameraSettingRequest request); - - /** - * 获取美颜配置 - * @param userId - * @return - */ - BeautyCameraSettingVO queryBeautyCameraSetting(String userId); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/CallService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/CallService.java deleted file mode 100644 index 848485e79..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/CallService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.entity.CallRecordDO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CallFinishBackReq; -import com.cool.store.request.CallRecordBackReq; -import com.cool.store.request.CallUpReq; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-08-10 18:56 - * @Description: - */ -public interface CallService { - String callUp(CallUpReq request) throws ApiException; - void callFinishBack(CallFinishBackReq request) throws ApiException; - void callRecordBack(CallRecordBackReq request) throws ApiException; - - /** - * 批量获取通话记录 - * @para transNos - * @return - */ - List getCallRecordByTransNos(List transNos); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/CommonService.java deleted file mode 100644 index 65649523b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/CommonService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetTipsInfoReq; - -/** - * @Author: young.yu - * @Date: 2023-06-28 21:34 - * @Description: - */ -public interface CommonService { - String getTipsInfo(GetTipsInfoReq request) throws ApiException; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java deleted file mode 100644 index 487127543..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.content.ContentAddDto; -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.dto.content.ContentUpdateDto; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.HyContentInfoVO; - -import java.util.List; - -public interface ContentService { - - /** - * - * @param dto - * @return contentId 新增动态id - */ - String addNews(ContentAddDto dto) throws ApiException; - - /** - * 删除动态 - * @param contentId - */ - void deleteContent(String contentId); - - /** - * 更新动态信息 - * @param dto - */ - void updateContent(ContentUpdateDto dto) throws ApiException; - - /** - * 查询动态列表 - */ - List queryContentList(ContentQueryListDto dto); - - /** - * 查询动态列表 C 端用 - */ - List queryContentListToC(ContentQueryListDto dto); - - /** - * 查询动态详情 - * @param contentId - * @return - */ - HyContentInfoDO queryContentInfo(String contentId); - - /** - * 标题是否重复 - */ - Boolean queryTitles(String title); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java deleted file mode 100644 index 095b7ad6f..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.calendar.UserCalendarsEventDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.InterviewPlanVO; -import com.cool.store.vo.InterviewScheduleInfoVO; -import com.cool.store.vo.StageCountVO; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/8 14:45 - * @Version 1.0 - */ -public interface DeskService { - - - /** - * 是否有临期线索与面试 - * @param userId - * @return - */ - HashMap getInterviewPlan(String userId); - - - /** - * 面试日程 - * @param userId - * @param selectedData - * @return - */ - InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData); - - /** - * 招商经理 各阶段 待处理 待跟进数量 - * @param userId - * @param type - * @return - */ - StageCountVO getStageCountByType(String userId,String type); - - /** - * String userId, long startTime, long endTime - * @param userId - * @param startTime - * @param endTime - * @return - */ - List getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException; - - - - - - - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EcSyncService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EcSyncService.java deleted file mode 100644 index 28e06eca8..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EcSyncService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.entity.HyPartnerEcTrackLogDO; -import com.cool.store.request.CustomerInfoRequest; -import com.cool.store.request.GetTagRequest; - -import java.util.List; - -public interface EcSyncService { - boolean ecToApplet(List queryListData); - - void getChannelSource(); - - Boolean labelInfo(List getTagRequestList); - - String getLastCrmCreateTime(); - - Boolean historyLine(List resultCustomerInfoList); - - Integer historyLineTrajectory(List resultTrajectoryList); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java deleted file mode 100644 index 26ad47d82..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseSyncService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.buser.UserEventDTO; -import com.cool.store.dto.dept.DepartmentEventDTO; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseInitService - * @Description: - * @date 2023-05-29 15:43 - */ -public interface EnterpriseSyncService { - - /** - * 全量同步 - */ - void syncAll(); - - /** - * 飞书人员事件 - * @param param - */ - void userUpdateEvent(UserEventDTO param); - - /** - * 部门事件 - * @param param - */ - void deptUpdateEvent(DepartmentEventDTO param); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java deleted file mode 100644 index 42f600de8..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.service; -import com.cool.store.dto.buser.UserPositionAndUserScopeDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.vo.EnterpriseUserSingleInfoVO; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseUserService - * @Description: 用户service - * @date 2023-05-29 19:58 - */ -public interface EnterpriseUserService { - - EnterpriseUserDO getUserInfoByUserId(String userId); - - - /** - * - * @param userId - * @return - */ - List getInvestmentManagerList(String type,String userId,String keyword); - - - /** - * 获取用户角色已用户管辖的员工范围 - * @param userId - * @return - */ - UserPositionAndUserScopeDTO getUserIdsByScope(String userId); - - - - - List getDevelopmentDirectorList(String wantShopArea); - - /** - * 根据意向区域获取开发主管 - * @param zoneId - * @return - */ - EnterpriseUserDO getDevelopmentByZoneId(Long zoneId); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java deleted file mode 100644 index d29ff05a4..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dto.exhibition.ExhibitionDTO; -import com.cool.store.dto.exhibition.ExhibitionEnterInterviewDTO; -import com.cool.store.dto.exhibition.ExhibitionGroupDTO; -import com.cool.store.dto.exhibition.SignUpExhibitionDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.FinishInterviewReq; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.exhibition.*; -import com.github.pagehelper.PageInfo; - -import java.util.Date; -import java.util.List; - -/** - * @author Fun Li 2023/11/30 14:42 - * @version 1.0 - */ -public interface ExhibitionService { - - /** - * 会销开始面试 - * @param dto - * @return - */ - EnterInterviewVO startExhibitionInterview(ExhibitionEnterInterviewDTO dto) throws ApiException; - - /** - * 结束会销面试 - * @param request - */ - void finishInterview(FinishInterviewReq request) throws ApiException; - - /** - * 新增会销组 - * xin - * @param exhibitionGroupDTO - * @param userInfo - * @return - * @throws ApiException - */ - Boolean addExhibitionGroup(ExhibitionGroupDTO exhibitionGroupDTO, LoginUserInfo userInfo) throws ApiException; - - - /** - * 编辑会销组 - * x - * @param exhibitionGroupDTO - * @param userInfo - * @return - */ - Boolean editExhibitionGroup(ExhibitionGroupDTO exhibitionGroupDTO, LoginUserInfo userInfo) throws ApiException; - - - /** - * 我的会销 - * x - * @param userId 用户ID - * @param pageSize 分页大小 - * @param pageNum 页码 - * @return - */ - PageInfo getMyExhibitionList(String userId,String startDate,String closedType,Integer pageSize,Integer pageNum); - - /** - * 我创建的会销组 - * @param userId - * @param pageSize - * @param pageNum - * @return - */ - PageInfo getMyExhibitionGroupList(String userId,Integer pageSize,Integer pageNum); - - - /** - * 会销组详情 - * @param exhibitionGroupId - * @param includeCollaborators true-包含协作人信息 false_不包含 - * @param filterCloseExhibition true-过滤关闭的会销 false-不过滤关闭的会销 - * @return - */ - ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId,Boolean includeCollaborators,Boolean filterCloseExhibition); - - /** - * 会销详情 - * @param exhibitionId - * @return - */ - ExhibitionDetailVO getExhibitionDetail(Integer exhibitionId); - - /** - * 编辑会销 - * @param exhibitionDTO - * @param userInfo - * @return - */ - Boolean editExhibition(ExhibitionDTO exhibitionDTO,LoginUserInfo userInfo) ; - - /** - * getExhibitionLineList - * @param exhibitionId - * @param participationStatus - * @param PartnerUserId - * @param pageSize - * @param pageNum - * @return - */ - PageInfo getExhibitionLineList(Integer exhibitionId,Integer participationStatus, String PartnerUserId ,Integer pageSize,Integer pageNum,String userId,Integer id); - - List exhibitionLineBaseList(Integer exhibitionId,String partnerName); - - /** - * 报名会销 - * @param signUpExhibitionDTO - * @param userInfo - * @return - */ - SignUpExhibitionVO signUpExhibition(SignUpExhibitionDTO signUpExhibitionDTO,LoginUserInfo userInfo) throws ApiException; - - /** - * 取消报名 - * @param exhibitionId - * @param lineId - * @param userInfo - * @return - */ - Boolean cancelSignUpExhibition(Integer exhibitionId,Long lineId,LoginUserInfo userInfo); - - /** - * 签到 - * @param exhibitionId - * @param lineId - * @param userInfo - * @return - */ - Boolean manualCheckIn(Integer exhibitionId,Long lineId,LoginUserInfo userInfo); - - /** - * 结束展会 - * @param exhibitionId - * @param userInfo - * @return - */ - Boolean closeExhibition(Integer exhibitionId,LoginUserInfo userInfo); - - /** - * 获取线索参加的会销列表 - * @param partnerLineId - * @return - */ - List getPartnerExhibitionList(Long partnerLineId); - - /** - * 获取线索参加的会销详情 - * - * @param exhibitionGroupId - * @param partnerLineId - * @return - */ - PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId); - - /** - * 自动结束会销 - */ - int autoCloseExhibition(Date now); - - /** - * 给被自动结束会销的参会人发短信通知 - */ - void sendSMSToExhibitionApplicants(); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FeiShuService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FeiShuService.java deleted file mode 100644 index 3a48f6320..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FeiShuService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.exception.ApiException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:13 - * @Description: - */ -public interface FeiShuService { - - /** - * @deprecated {@link com.cool.store.service.InterviewService#getFreeBusyList} - */ - @Deprecated - GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) throws ApiException; - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java deleted file mode 100644 index 59ffc3a1a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.entity.HyPartnerFraSourceDO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CreateQualifyVerifyReq; -import com.cool.store.request.QualificationCallbackReq; - -import java.io.IOException; -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-14 13:51 - * @Description: - */ -public interface FlowService { - void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException; - - void qualificationCallback(QualificationCallbackReq request) throws ApiException; - - List getDictList(); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java deleted file mode 100644 index e82cd0fb1..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.entity.HyPartnerEcTrackLogDO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.follow.AddFollowLogRequest; -import com.cool.store.request.follow.AddFollowTaskRequest; -import com.cool.store.request.follow.FollowTaskIdRequest; -import com.cool.store.request.follow.UpdateFollowTaskRequest; -import com.cool.store.vo.follow.FollowTaskLogVO; -import com.cool.store.vo.follow.FollowTaskPageVO; -import com.github.pagehelper.PageInfo; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskService - * @Description: - * @date 2023-08-10 11:10 - */ -public interface FollowTaskService { - - /** - * 工作台获取跟进任务 - * @param pageNum - * @param pageSize - * @param taskStatus - * @param queryDate - * @param followUserId - * @return - */ - PageInfo getFollowTaskPage(Integer pageNum, Integer pageSize, Integer taskStatus, String queryDate, String followUserId); - - /** - * 获取线索跟进日志 - * @param pageNum - * @param pageSize - * @param partnerLineId - * @return - */ - PageInfo getFollowLogPage(Integer pageNum, Integer pageSize, Long partnerLineId); - - /** - * 添加跟进日志 - * @param request - * @param userInfo - * @return - */ - Integer addFollowLog(AddFollowLogRequest request, LoginUserInfo userInfo); - - /** - * 新增跟进任务 - * @param request - * @param userInfo - * @return - */ - Long addFollowTask(AddFollowTaskRequest request, LoginUserInfo userInfo) throws ApiException; - - /** - * 编辑跟进任务 - * @param request - * @param userId - * @return - */ - Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) throws ApiException; - - /** - * 完成跟进任务 - * @param request - * @param userId - * @return - */ - Integer finishFollowTask(FollowTaskIdRequest request, String userId); - - /** - * 作废跟进任务 - * @param request - * @param userId - * @return - */ - Integer cancelFollowTask(FollowTaskIdRequest request, String userId); - - /** - * 跟进任务前一小时提醒 - * @return - */ - void followTaskAnHourAgoRemind() throws ApiException; - - /** - * 跟进任务每日10点提醒 - * @return - */ - void followTaskDailyRemind() throws ApiException; - - - PageInfo getEcFollowLogPage(Integer pageNum, Integer pageSize, String partnerId); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyOutboundService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyOutboundService.java deleted file mode 100644 index ddd626081..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyOutboundService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.outbound.AddNumberDTO; -import com.cool.store.dto.outbound.DeleteNumberDTO; -import com.cool.store.dto.outbound.OutboundListDTO; -import com.cool.store.dto.outbound.UpdateNumberDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.HyOutboundVo; - -import java.util.List; - -/** - * @author Fun Li 2023/8/9 15:35 - * @version 1.0 - */ -public interface HyOutboundService { - - /** - * 获取呼出手机号列表信息 - * @return 手机号信息列表 - */ - List getOutboundNumberList(OutboundListDTO dto); - - /** - * 新增呼出手机号 - * @param dto 新增手机号信息 - */ - void addOutboundNumber(AddNumberDTO dto) throws ApiException; - - /** - * 编辑呼出手机号 - * @param dto 修改的手机号信息 - */ - void updateOutboundNumber(UpdateNumberDTO dto) throws ApiException; - - /** - * 删除呼出手机号 - * @param dto 待删除的手机号信息编号 - */ - void deleteOutboundNumber(DeleteNumberDTO dto); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java deleted file mode 100644 index 4a07f6e8e..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.request.AddTagsRequest; -import com.cool.store.request.PartnerBaseInfoRequest; -import com.cool.store.vo.PartnerBaseInfoVO; -import com.cool.store.vo.PartnerUserInfoVO; - -/** - * @Author suzhuhong - * @Date 2023/6/13 21:37 - * @Version 1.0 - */ -public interface HyPartnerBaseInfoService { - - - /** - * 添加标签 - * @param addTagsRequest - * @return - */ - Boolean addTags(LoginUserInfo userInfo,AddTagsRequest addTagsRequest); - - Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser); - - PartnerBaseInfoVO queryPartnerBaseInfo(String partnerId, Long lineId); - - PartnerBaseInfoVO getByPartnerLineId(Long lineId); - - HyPartnerBaseInfoDO getByIdCard(String idCard); - - Boolean changeBinding(String idCard, Long lineId, PartnerUserInfoVO currentUser); - - HyPartnerBaseInfoDO generateBaseInfo(HyPartnerUserInfoDO hyPartnerUserInfoDO, Long partnerLineId, String userPortrait); - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java deleted file mode 100644 index a499af9df..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerClerkService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.PartnerClerkInfoRequest; -import com.cool.store.vo.PartnerClerkVO; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/15 11:05 - * @Version 1.0 - */ -public interface HyPartnerClerkService { - - - /** - * 通过线索ID查询店员信息 - * @param lineId - * @return - */ - List getPartnerClerkList(Long lineId); - - Boolean submitPartnerClerkInfo(PartnerClerkInfoRequest request); - - List queryPartnerClerkInfo(String partnerId, Long lineId); - - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java deleted file mode 100644 index 99d91f9d4..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.exception.ApiException; -import com.cool.store.request.BaseUserInfoRequest; -import com.cool.store.request.IndustryCognitionInfoRequest; -import com.cool.store.request.PartnerIntentInfoRequest; -import com.cool.store.request.PartnerWantShopInfoRequest; -import com.cool.store.vo.PartnerIntentApplyInfoVO; -import com.cool.store.vo.PartnerIntentInfoVO; -import com.cool.store.vo.PartnerUserInfoVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/9 14:54 - * @Version 1.0 - */ -public interface HyPartnerIntentInfoService { - - - /** - * 招商经理 意向申请阶段 待处理 待跟进列表 - * @param userId - * @param type - * @param pageSize - * @param pageNumber - * @return - */ - PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList); - - /** - * 根据线索查询加盟商意向申请信息 - * @param lineId - * @return - */ - PartnerIntentInfoVO getPartnerIntentApplyDetail(Long lineId); - - /** - * 员工端 修改加盟商意向信息 - * @param baseUserInfoRequest - * @return - */ - Boolean updatePartnerIntentInfo(LoginUserInfo userInfo,BaseUserInfoRequest baseUserInfoRequest); - - Integer submitPartnerIntentInfo(PartnerIntentInfoRequest partnerIntentInfoRequest) throws ApiException; - - String submitWantShopInfo(PartnerWantShopInfoRequest request); - - Boolean submitIndustryCognitionInfo(IndustryCognitionInfoRequest request); - - PartnerIntentInfoVO queryPartnerIntentInfo(PartnerUserInfoVO userInfoVO, Long lineId); - - PartnerIntentInfoVO queryWantShopInfo(PartnerUserInfoVO userInfoVO, Long lineId); - - PartnerIntentInfoVO queryIndustryCognitionInfo(PartnerUserInfoVO userInfoVO, Long lineId); - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerInterviewPlanService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerInterviewPlanService.java deleted file mode 100644 index 5f05fd50a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerInterviewPlanService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.exception.ApiException; -import com.cool.store.vo.InterviewDetailInfoVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.github.pagehelper.PageInfo; - -import java.util.Date; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/8 19:32 - * @Version 1.0 - */ -public interface HyPartnerInterviewPlanService { - - /** - * 招商经理今日面试列表 - * @param userId - * @return - */ - List getInterviewPlanList(String userId, Date dateTime); - - /** - * getPartnerInterviewInfoList - * @param userId - * @param pageSize - * @param pageNumber - * @return - */ - PageInfo getPartnerInterviewInfoList(String userId,String type,Integer pageSize,Integer pageNumber); - - - /** - * getQualifiedInterviewList - * @param userId - * @param type - * @param pageSize - * @param pageNumber - * @return - */ - PageInfo getQualifiedInterviewList(String userId,String type,Integer pageSize,Integer pageNumber); - - /** - * 批量更新超时未预约面试 - * updateInterviewOverTime - * @return - */ - void updateInterviewOverTime() throws ApiException; - - /** - * 批量打开十分钟之内开始的面试房间 - * updateInterviewOverTime - * @return - */ - void openInterviewRoom(); - - /** - * 批量关闭十分钟之内结束的面试房间 - * updateInterviewOverTime - * @return - */ - void updateAbsentInterview() throws ApiException; - void approvalReminder() throws ApiException; - - /** - * 面试前一天 20:00 提醒 - */ - void remindInterviewStartTomorrow() throws ApiException; - - /** - * 面试前 30 分钟提醒 - */ - void remindInterviewStartMinutes() throws ApiException; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java deleted file mode 100644 index 1528c4c22..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.*; -import com.cool.store.vo.*; -import com.cool.store.vo.interview.InterviewVO; -import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/9 10:30 - * @Version 1.0 - */ -public interface HyPartnerLineInfoService { - - - /** - * 查询招商经理 待处理 - * @param userId - * @return - */ - StageCountVO selectStagePendingCount(String userId); - - /** - * 查询招商经理 待跟进 - * @param userId - * @return - */ - StageCountVO selectStageFollowCount(String userId); - - - /** - * 查询加盟商线索详情之一 线索信息与基本信息 - * @param lineId - * @return - */ - PartnerLineInfoAndBaseInfoVO selectPartnerLineInfoAndBaseInfo(Long lineId); - - /** - * 最近30天结束的线索 - * @param userId - * @param pageSize - * @param pageNumber - * @return - */ - PageInfo lastMonthCloseLine(String userId,Integer pageSize,Integer pageNumber); - - /** - * 转让招商经理 - * @param userId - * @param lineId - * @return - */ - Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException; - - List batchTransferInvestmentManager(LoginUserInfo user, BatchTransferInvestmentManagerRequest request) throws ApiException; - - /** - * 分配招商经理 - * @param userId - * @param lineIdList - * @return - */ - Boolean allocationInvestmentManager(LoginUserInfo user, String userId,List lineIdList); - - - /** - * 黑名单列表 - * @param LineRequest LineRequest - * @return - */ - PageInfo getBlackList(LineRequest LineRequest); - - /** - * 加入或者移除 黑名单 - * @param lineId - * @param status - * @param joinReason - * @return - */ - Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason) throws ApiException; - - /** - * 移除黑名单 - * @param lineId - * @param status - * @param removeReason - * @return - */ - Boolean removeBlackList( LoginUserInfo userInfo,Long lineId, Integer status, String removeReason); - - /** - * 结束或者通过线索 - * @param userId - * @param closeFollowRequest - * @return - */ - Boolean closeOrPassFollow(LoginUserInfo user,CloseFollowRequest closeFollowRequest) throws ApiException; - - /** - * 公海线索 - * @param userId - * @param lineRequest - * @return - */ - PageInfo publicSeaLineList(String userId,LineRequest lineRequest); - - - /** - * 私海列表 - * @param userId - * @param privateSeaLineListRequest - * @return - */ - PageInfo privateSeaLineList(String userId, PrivateSeaLineListRequest privateSeaLineListRequest,Boolean allPrivateSeaFlag) ; - - PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId); - - /** - * 跟进历史 - * @param partnerId - * @return - */ - List getLineFollowHistory(String partnerId); - - /** - * 是否分配跟进人 - * @param lineId - * @return - */ - Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag ); - - /** - * 线索状态 - * @param wantShopAreaId - * @param acceptAdjustType - * @return - */ - Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType); - - /** - * 查询跟进人 - * @param partnerId - * @return - */ - String getAssignFollowUser(String partnerId,String type); - - InterviewVO getInterviewInfo(Long lineId,Boolean needDevelopmentDirector) throws ApiException; - - /** - * 生成一条默认线索 - * @param partnerId - * @param wantShopArea - * @param acceptAdjustType - * @return - */ - HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag,String investmentManagerId) throws ApiException; - - Long checkGenerateNewLineId(Long lineId) throws ApiException; - - /** - * 编辑加盟商基本信息 - * @param request - * @return - */ - Integer editBaseInfo(EditBaseInfoRequest request); - - /** - * 获取加盟商基本信息 - * @param partnerLineId - * @return - */ - PartnerSimpleBaseInfoVO queryBaseInfo(Long partnerLineId); - - LinePageInfoVo privateSeaPageDetailNext(String userId, PrivateSeaLineListRequest privateSeaLineListRequest, Boolean aFalse); - - LinePageInfoVo publicSeaPageDetailNext(String userId, LineRequest lineRequest); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java deleted file mode 100644 index 094d5a768..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerUserChannelService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.partner.UserChannelDTO; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/8/10 11:12 - * @Version 1.0 - */ -public interface HyPartnerUserChannelService { - - /** - * 查询所有的线索来源 - * @return - */ - List queryAllUserChannelList(); - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPhoneLocationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPhoneLocationService.java deleted file mode 100644 index 138e37ea1..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPhoneLocationService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cool.store.service; - -/** - * @Author suzhuhong - * @Date 2023/6/30 15:02 - * @Version 1.0 - */ -public interface HyPhoneLocationService { - - - /** - * 处理手机号归属地 - * @param phoneNumber - * @return - */ - String handleHyPhoneAddress(String phoneNumber); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InspectionSettingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InspectionSettingService.java deleted file mode 100644 index 796d38adf..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InspectionSettingService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.inspection.setting.AddInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.CheckInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.DeleteInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.UpdateInspectionSettingDTO; -import com.cool.store.vo.inspection.setting.InspectionSettingCheckVO; -import com.cool.store.vo.inspection.setting.InspectionSettingDetailVO; -import com.cool.store.vo.inspection.setting.InspectionSettingPageVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingService - * @Description: - * @date 2023-07-18 15:57 - */ -public interface InspectionSettingService { - - /** - *稽核区域设置列表 - * @param pageNum - * @param pageSize - * @return - */ - PageInfo getInspectionSettingPage(Integer pageNum, Integer pageSize); - - /** - * 获取详情 - * @param inspectionSettingId - * @return - */ - InspectionSettingDetailVO getInspectionSettingDetail(Long inspectionSettingId); - - /** - * 新增稽核区域设置 - * @param userId - * @param param - * @return - */ - Long addInspectionSetting(String userId, AddInspectionSettingDTO param); - - /** - * 更新稽核区域设置 - * @param userId - * @param param - * @return - */ - Integer updateInspectionSetting(String userId, UpdateInspectionSettingDTO param); - - /** - * 删除稽核区域设置 - * @param userId - * @param inspectionSettingId - * @return - */ - Integer deleteInspectionSetting(String userId, Long inspectionSettingId); - - /** - * 校验稽核区域设置 - * @param param - * @return - */ - List checkInspectionSetting(CheckInspectionSettingDTO param); - - /** - * 获取已经绑定的人员 - * @return - */ - List getBingUser(); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java deleted file mode 100644 index a5643bd9a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.GetInterviewInspectionListReq; -import com.cool.store.request.GetInterviewInspectionResultListReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.vo.interview.InterviewInspectionHistoryInfo; -import com.cool.store.vo.interview.InterviewInspectionInfo; -import com.cool.store.vo.interview.InterviewInspectionResultVO; -import com.cool.store.vo.interview.InterviewInspectionVO; -import com.github.pagehelper.PageInfo; - -import com.cool.store.dto.inspection.interview.InspectionRevocationDTO; -import com.cool.store.dto.inspection.interview.InspectionSubmissionDTO; -import com.cool.store.exception.ApiException; - -import com.cool.store.dto.inspection.interview.InspectionRevocationDTO; -import com.cool.store.dto.inspection.interview.InspectionSubmissionDTO; -import com.cool.store.exception.ApiException; - -import java.util.List; - -/** - * @author Fun Li - * @version 1.0 - * @date 2023/7/19 16:50 - */ -public interface InterviewInspectionService { - List interviewInspectionGetList(GetInterviewInspectionListReq request); - - /** - * 提交稽核结果 - */ - void submit(InspectionSubmissionDTO dto) throws ApiException; - - /** - * 撤销稽核结果 - */ - void revoke(InspectionRevocationDTO dto) throws ApiException; - - InterviewInspectionInfo interviewInspectionGetDetail(Long id); - - List interviewInspectionGetHistoryDetail(Long id); - - List interviewInspectionResultGetList(GetInterviewInspectionResultListReq request); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java deleted file mode 100644 index bc2621e35..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewService.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.exception.ApiException; -import com.cool.store.request.*; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.interview.CreateAppointmentVO; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import com.cool.store.vo.interview.InterviewVO; - -import java.util.List; -import java.util.Map; - -/** - * @Author: young.yu - * @Date: 2023-06-06 15:01 - * @Description :面试service - */ -public interface InterviewService { - List getInterviewList(GetInterviewListReq request); - - /** - * 根据面试会议计划id查询面试信息 - * @param request - * @return - */ - InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException; - - /** - * 委托他人 - * @param request - */ - void entrustOthers(EntrustOthersReq request) throws ApiException; - /** - * 修改面试时间 - * @param request - */ - void modifyInterviewTime(ModifyInterviewTimeReq request) throws ApiException; - - /** - * 结束面试 - * @param request - */ - void finishInterview(FinishInterviewReq request) throws ApiException; - - /** - * 进入面试间的方法 - * 修改一些面试状态 - * 最后返回 userSign 用于进入腾讯云音视频房间 - * @return userSign 进入视频所需签名 - */ - EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException; - - /** - * 同意面试预约 - * @param request - * @return - */ - void approveAppointment(ApproveAppointmentReq request) throws ApiException; - void reInterview(ReInterviewReq request) throws ApiException; -// void rejectInterview(RejectInterviewReq request) throws ApiException; - - public String getInterviewerByPartner(String partnerId,String lineId)throws ApiException; - - public void rejectInterviewAndSuspendLine(Long iterviewId,Long interviewPlanId,String certifyFile); - - public String generateFeiShuInterviewMsg(String partnerName, String partnerMobile, String interviewTime); - - /** - * 获取预约时间段的预约信息 - * @param request {@link GetFreeBusyListReq} - * @return {@link GetFreeBusyListVO} - */ - GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request); - - /** - * 招商经理主动预约面试 - * @param request {@link com.cool.store.request.CreateAppointmentReq} - */ - CreateAppointmentVO bookInterview(CreateAppointmentReq request) throws ApiException; - - /** - * 直接进入面试待开始或已开始阶段，无需线索预约面试 - * @param request {@link CreateAppointmentReq} - * @param whetherBeginInterview 是否直接开始面试 - * @param interviewerId 面试官 userId - * @return interview: {@link com.cool.store.entity.HyPartnerInterviewDO}; interviewPlan: {@link com.cool.store.entity.HyPartnerInterviewPlanDO} - * @throws ApiException - */ - Map agreeInterviewWithoutBook(CreateAppointmentReq request, Boolean whetherBeginInterview, String interviewerId, Boolean needSendSms) throws ApiException; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java deleted file mode 100644 index 526c23b22..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.label.LabelGroupAddDTO; -import com.cool.store.dto.label.LabelGroupDeleteDTO; -import com.cool.store.dto.label.LabelGroupListDTO; -import com.cool.store.dto.label.LabelGroupUpdateDTO; -import com.cool.store.entity.HyPartnerLabelGroupDO; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.LabelGroupListVo; - -import java.util.List; - -/** - * @author Fun Li 2023/8/10 13:34 - * @version 1.0 - */ -public interface LabelGroupService { - - /** - * 查询标签组信息列表 - * @param dto 查询条件 - */ - List getLabelGroupList(LabelGroupListDTO dto); - - /** - * 添加标签组 - * @param dto 新增标签组信息 - */ - void addLabelGroup(LabelGroupAddDTO dto) throws ApiException; - - /** - * 修改标签组信息 - * @param dto 修改内容 - */ - void updateLabelGroup(LabelGroupUpdateDTO dto) throws ApiException; - - /** - * 删除标签组 - * @param dto 待删除标签组信息 - */ - void deleteLabelGroup(LabelGroupDeleteDTO dto) throws ApiException; - - /** - * 获取所有标签组 - */ - List getAllLabelGroupList(); - - /** - * 添加ec标签组 - * @param hyPartnerLabelGroupDO - */ - void addEcLabelGroup(HyPartnerLabelGroupDO hyPartnerLabelGroupDO); - - HyPartnerLabelGroupDO selectByPrimaryKey(Long id); - - List getLabelGroupListOrder(); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java deleted file mode 100644 index f9ad29afb..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.label.LabelAddDTO; -import com.cool.store.dto.label.LabelDeleteDTO; -import com.cool.store.dto.label.LabelListDTO; -import com.cool.store.dto.label.LabelUpdateDTO; -import com.cool.store.entity.HyPartnerLabelDO; -import com.cool.store.exception.ApiException; -import com.cool.store.vo.LabelGroupVO; -import com.cool.store.vo.LabelListVo; - -import java.util.List; -import java.util.Map; - -/** - * @author Fun Li 2023/8/10 14:23 - * @version 1.0 - */ -public interface LabelService { - - /** - * 获取数组列表 - * - * @param dto 查询条件 - */ - List getLabelList(LabelListDTO dto); - - /** - * 添加标签组 - * @param dto 新增标签组信息 - */ - void addLabel(LabelAddDTO dto) throws ApiException; - - /** - * 标签MAP - * @param userPortraitStrList - * @return - */ - Map getUserPortraitMap(List userPortraitStrList); - - /** - * 查询标签中文名称集合 - * @param userPortraitMap - * @param userPortraitStr - * @return - */ - List getUserPortraitList(Map userPortraitMap,String userPortraitStr); - - /** - * 修改标签信息 - * @param dto 新标签信息 - */ - void updateLabel(LabelUpdateDTO dto) throws ApiException; - - /** - * 删除标签 - * @param dto - */ - void deleteLabel(LabelDeleteDTO dto); - - HyPartnerLabelDO selectByPrimaryKey(Long classId); - - void addEcLabel(HyPartnerLabelDO hyPartnerLabelDO); - - List getAllGroupAndLabelList(); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineHighSeasService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineHighSeasService.java deleted file mode 100644 index ca9ae2782..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineHighSeasService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.AddLineRequest; -import com.cool.store.response.ResponseResult; -import org.springframework.web.multipart.MultipartFile; - -public interface LineHighSeasService { - - Boolean addLine(AddLineRequest request); - - ResponseResult importLine(MultipartFile file); - - ResponseResult addCheckout(String mobile); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LogService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LogService.java deleted file mode 100644 index 1b04f838b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.vo.PartnerUserInfoVO; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:10 - * @Description: - */ -public interface LogService { - - public void recordBizLog(LoginUserInfo operator, Long lineId, OperateTypeEnum operateTypeEnum, Object logData); - public void recordPartnerBizLog(PartnerUserInfoVO operator , Long lineId, OperateTypeEnum operateTypeEnum, Object logData); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java deleted file mode 100644 index fc01b7503..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LoginService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.cool.store.service; - - -public interface LoginService { - - - - Object feiShuLogin(String userId, Boolean needRefreshToken, String avatar); - - Boolean saveUserOnlineStatus(String userId,Integer onlineStatus); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java deleted file mode 100644 index ab1030bdd..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.entity.MDMAreaDO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.mdm.BelongRegion; -import com.cool.store.response.mdm.BusinessRegion; - -import java.util.List; - -public interface MDMAreaService { - - /** - * 获取省级数据 - */ - List getProvince(); - - /** - * 获取子级地区 - * @param code 父级 code - */ - List getSonArea(String code); - - List getAllAreaCode(String code); - - boolean getAreaProvinceType(String code); - - /** - * 获取所有所属大区 - * @return 所属大区 - */ - List getBelongRegion() throws ApiException; - - /** - * 获取所有业务区域 - * @return 业务区域 - */ - List getBusinessRegion() throws ApiException; - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java deleted file mode 100644 index 237e80e1d..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.menu.AddMenuDTO; -import com.cool.store.enums.MenuTypeEnum; -import com.cool.store.vo.menu.MenuAuthTreeVO; -import com.cool.store.vo.menu.MenuTreeVO; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: MenuService - * @Description: - * @date 2023-06-08 16:43 - */ -public interface MenuService { - - /** - * 获取用户某个角色的菜单 - * @param userId - * @param roleId - * @return - */ - List getUserMenus(String userId, String roleId); - - /** - * 获取所有的菜单 - * @return - */ - List getAllMenus(); - - /** - * 新增菜单 - * @param param - * @param menuType - * @return - */ - Long addMenu(AddMenuDTO param, MenuTypeEnum menuType); - - - Long deleteMenuAuth(Long id); - - /** - * 菜单排序 - * @param ids - * @return - */ - Integer sortMenu(List ids); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java deleted file mode 100644 index 251d554a1..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.OpenAreaRequest; -import com.cool.store.vo.OpenAreaTreeVO; -import com.cool.store.vo.OpenAreaVO; -import com.cool.store.vo.OpenProvinceVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/13 22:11 - * @Version 1.0 - */ -public interface OpenAreaService { - - - /** - * 根据关键字搜索 - * @param keyword - * @return - */ - List queryByKeyword(String keyword,String areaStatus,Boolean flag); - - - /** - * 查询所有的开放区域 城市树 - * @param keyword - * @param flag - * @return - */ - List queryAllOpenAreaByKeyword(String keyword,Boolean applyFlag,Boolean flag); - - - List searchOpenArea(String keyword,Boolean applyFlag,Boolean flag); - - - /** - * 查询字列表 - * @param type - * @param parentId - * @return - */ - List getChildrenList(String type, Long parentId); - - /** - * - * @param userId - * @param openAreaRequest - * @return - */ - Boolean batchUpdate(String userId, OpenAreaRequest openAreaRequest); - - - PageInfo queryKeyOpenAreaList(Integer pageSize, Integer pageNumber); - - - - - /** - * 查询可申请区域 可预约区域 - * @return - */ - OpenProvinceVO getOpenProvince(); - - /** - * V1.4 - * 意向区域添加不限 - * 每个市下面添加一个不限 - */ - Boolean addOpenArea(); - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java deleted file mode 100644 index b11663003..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.dto.partner.LineQueryInterviewDto; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CreateAppointmentReq; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.request.ModifyInterviewTimeReq; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.cool.store.vo.PartnerPassLetterDetailVO; -import com.cool.store.vo.interview.CreateAppointmentVO; -import com.cool.store.vo.interview.GetFreeBusyListVO; - -public interface PartnerInterviewService { - - /** - * 加盟商查询面试信息 - * @param partnerId - * @return - */ - PartnerInterviewInfoVO queryByPartnerId(String partnerId); - - PartnerInterviewInfoVO queryByPartnerLineId(LineQueryInterviewDto request) throws ApiException; - - /** - * 进入面试间的方法 - * 修改一些面试状态 - * 最后返回 userSign 用于进入腾讯云音视频房间 - * @return userSign 进入视频所需签名 - */ - EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException; - - /** - * 获取通知函详情 - */ - PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId) throws ApiException; - - /** - * 修改面试时间 - * @param request - */ - void modifyInterviewTime(ModifyInterviewTimeReq request) throws ApiException; - - - /** - * 获取面试预约时间列表 - * @param request {@link GetFreeBusyListReq} - * @return {@link GetFreeBusyListVO} - */ - GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request); - - /** - * 预约面试方法 - * @param request - * @return - */ - CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java deleted file mode 100644 index 4abf5862b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.PartnerUserInfoRequest; -import com.cool.store.vo.ApplyBaseInfoVO; -import com.cool.store.vo.InviteCodeDetailVO; -import com.cool.store.vo.partner.PartnerUserBaseVO; - -public interface PartnerUserInfoService { - - HyPartnerUserInfoDO selectByPartnerId(String partnerId); - - Boolean queryJoinNotice(String partnerId); - - Boolean completeJoinNotice(String partnerId); - - InviteCodeDetailVO selectInviteCodeDetail(String partnerId); - - ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException; - - PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId,Integer exhibitionGroupId); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java deleted file mode 100644 index b8a189404..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.vo.region.RegionBaseInfoVO; -import com.cool.store.vo.region.RegionUserAndSubRegionVO; - -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: RegionService - * @Description: - * @date 2023-06-05 10:43 - */ -public interface RegionService { - - /** - * 获取组织架构基本信息列表 - * @return - */ - RegionBaseInfoVO getRegionBaseInfoList(); - - /** - * 获取部门下的子部门和人 - * @param regionId - * @return - */ - RegionUserAndSubRegionVO getRegionUserAndSubRegion(String regionId); - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RoleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RoleService.java deleted file mode 100644 index 5a6f4becd..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/RoleService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.role.RoleUpdateDTO; -import com.cool.store.vo.role.RoleAuthInfoVO; -import com.cool.store.vo.role.RolePageVO; -import com.github.pagehelper.PageInfo; - -/** - * @author zhangchenbiao - * @FileName: RoleService - * @Description:角色service - * @date 2023-07-25 15:05 - */ -public interface RoleService { - - /** - * 获取角色分页 - * @param pageNum - * @param pageSize - * @return - */ - PageInfo getRolePage(Integer pageNum, Integer pageSize); - - /** - * 获取角色权限详情 - * @param roleId - * @return - */ - RoleAuthInfoVO getRoleAuthDetail(String roleId); - - /** - * 更新角色权限 - * @param userId - * @param param - * @return - */ - Integer updateRoleAuth(String userId, RoleUpdateDTO param); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SmsService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SmsService.java deleted file mode 100644 index ee3da8298..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SmsService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cool.store.service; - -import com.aliyun.dysmsapi20170525.models.SendSmsResponse; -import com.cool.store.dto.sms.SendInvateMsgDTO; -import com.cool.store.enums.SMSMsgEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.response.SmsSendResponse; - -import java.io.IOException; - -/** - * @Author: young.yu - * @Date: 2023-06-21 10:55 - * @Description: - */ -public interface SmsService { - public SmsSendResponse sendSmsNormal(String phone, SMSMsgEnum smsMsgEnum, Object... objects); - - public SmsSendResponse sendSmsVariable(String phone, SMSMsgEnum smsMsgEnum,String... objects); - - public void sendInvateMsg(SendInvateMsgDTO sendInvateMsgDTO) throws ApiException; -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TRTCVideoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TRTCVideoService.java deleted file mode 100644 index 7cbfa9b15..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/TRTCVideoService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.trtc.callback.VideoCallBackDTO; -import com.cool.store.request.TRTCVideoCallBackReq; - -public interface TRTCVideoService { - - /** - * 音视频上传成功后的回调处理 - */ -// void handleVideoCallBack(TRTCVideoCallBackReq req); - - void handleVideoCallBack(VideoCallBackDTO videoCallBackDTO); - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java deleted file mode 100644 index 6418f1100..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dto.wx.MiniAppUrlLinkReqDTO; -import com.cool.store.dto.wx.MiniProgramLoginDTO; -import com.cool.store.request.MobileUpdateRequest; -import com.cool.store.vo.PartnerUserInfoVO; - -/** - * @author zhangchenbiao - * @FileName: WechatMiniAppService - * @Description: - * @date 2023-05-29 14:28 - */ -public interface WechatMiniAppService { - - PartnerUserInfoVO miniProgramLogin(MiniProgramLoginDTO param); - - String getUserPhoneNumber(String mobileCode); - - String updateUserPhoneNumber(MobileUpdateRequest request, PartnerUserInfoVO userInfoVO); - - PartnerUserInfoVO getUserInfo(String mobile, String openId); - - String getMiniAppUrl(); - - String getMiniAppUrlLink(MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO); -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WorkFlowService.java deleted file mode 100644 index b81f2daa6..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WorkFlowService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.TransferInvestmentManagerRequest; - -/** - * @author zhangchenbiao - * @FileName: WorkFlowService - * @Description: 流程服务 - * @date 2023-06-26 21:14 - */ -public interface WorkFlowService { - - /** - * 结束流程 - * @param workflowStage - * @param request - */ - void endProcess(WorkflowStageEnum workflowStage, CloseFollowRequest request) throws ApiException; - - /** - * 转让招商经理 - * @param workflowStage - * @param request - */ - void transferInvestmentManager(WorkflowStageEnum workflowStage,TransferInvestmentManagerRequest request) throws ApiException; - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ZoneService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ZoneService.java deleted file mode 100644 index 1dfdccc5c..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ZoneService.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.request.IntentAreaSettingRequest; -import com.cool.store.vo.ZoneCheckVO; -import com.cool.store.vo.ZoneVO; -import com.github.pagehelper.PageInfo; - -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/14 14:26 - * @Version 1.0 - */ -public interface ZoneService { - - - /** - * 新增战区 - * @param userId - * @param intentAreaSettingRequest - * @return - */ - Boolean addZone(String userId,IntentAreaSettingRequest intentAreaSettingRequest); - - /** - * 编辑战区 - * @param userId - * @param intentAreaSettingRequest - * @return - */ - Boolean updateZone(String userId,IntentAreaSettingRequest intentAreaSettingRequest); - - /** - * 战区列表 - * @param type - * @param pageSize - * @param pageNum - * @return - */ - PageInfo getZoneList(String type, Integer pageSize ,Integer pageNum); - - /** - * 战区详情 - * @param zoneId - * @return - */ - ZoneVO zoneDetail(Long zoneId); - - /** - * 删除战区 - * @param id - * @return - */ - Boolean deletedZone(Long id); - - /** - * 校验是否绑定其他战区 - * @param intentAreaSettingRequest - * @return - */ - List checkZone(IntentAreaSettingRequest intentAreaSettingRequest); - - /** - * 查询所有绑定战区的组织机构 - * @return - */ - List queryAllBingZoneRegionList(String type); - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java deleted file mode 100644 index e2f54481a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.HyAdvancedSettingDAO; -import com.cool.store.entity.HyAdvancedSettingDO; -import com.cool.store.request.AdvancedSettingRequest; -import com.cool.store.service.AdvanceSettingService; -import com.cool.store.vo.AdvancedSettingVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/14 20:31 - * @Version 1.0 - */ -@Service -public class AdvanceSettingServiceImpl implements AdvanceSettingService { - - @Resource - HyAdvancedSettingDAO hyAdvancedSettingDAO; - - - @Override - public Boolean addOrUpdateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) { - if (advancedSettingRequest.getId()!=null){ - //修改 - updateAdvanceSetting(userId,advancedSettingRequest); - return Boolean.TRUE; - } - HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO(); - hyAdvancedSettingDO.setCreateUserId(userId); - hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl()); - hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount()); - hyAdvancedSettingDO.setTencentVideoKey(advancedSettingRequest.getTencentVideoKey()); - hyAdvancedSettingDAO.insertSelective(hyAdvancedSettingDO); - return Boolean.TRUE; - } - - private Boolean updateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) { - HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO(); - hyAdvancedSettingDO.setUpdateUserId(userId); - hyAdvancedSettingDO.setId(advancedSettingRequest.getId()); - hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl()); - hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount()); - hyAdvancedSettingDO.setTencentVideoKey(advancedSettingRequest.getTencentVideoKey()); - hyAdvancedSettingDAO.updateByPrimaryKeySelective(hyAdvancedSettingDO); - return Boolean.TRUE; - } - - @Override - public AdvancedSettingVO getAdvancedSettingDetail() { - HyAdvancedSettingDO hyAdvancedSettingDO = hyAdvancedSettingDAO.selectAdvanceSetting(); - if (hyAdvancedSettingDO==null){ - return null; - } - AdvancedSettingVO advancedSettingVO = new AdvancedSettingVO(); - advancedSettingVO.setId(hyAdvancedSettingDO.getId()); - advancedSettingVO.setPartnerUrl(hyAdvancedSettingDO.getPartnerUrl()); - advancedSettingVO.setTencentVideoAccount(hyAdvancedSettingDO.getTencentVideoAccount()); - advancedSettingVO.setTencentVideoKey(hyAdvancedSettingDO.getTencentVideoKey()); - return advancedSettingVO; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java deleted file mode 100644 index 9701c5e5e..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.aliyun.dytnsapi20200217.Client; -import com.aliyun.dytnsapi20200217.models.DescribePhoneNumberOperatorAttributeRequest; -import com.aliyun.dytnsapi20200217.models.DescribePhoneNumberOperatorAttributeResponse; -import com.aliyun.ocr20191230.models.RecognizeIdentityCardResponse; -import com.aliyun.ocr20191230.models.RecognizeIdentityCardResponseBody; -import com.aliyun.teaopenapi.models.Config; -import com.cool.store.dto.partner.DescribePhoneNumberDTO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.IDCardSideEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.service.AliyunService; -import com.cool.store.vo.cuser.IdentityCardInfoVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Objects; -import java.util.Optional; - -/** - * @author zhangchenbiao - * @FileName: AliyunServiceImpl - * @Description: - * @date 2023-06-15 20:04 - */ -@Slf4j -@Service -public class AliyunServiceImpl implements AliyunService { - - @Value("${aliyun.accessKeyId:null}") - private String accessKeyId; - - @Value("${aliyun.accessKeySecret:null}") - private String accessKeySecret; - - @Value("${aliyun.authCode:null}") - private String authCode; - - @Override - public DescribePhoneNumberDTO getPhoneNumberAttribute(String phoneNumber) { - try { - Config config = new Config(); - config.accessKeyId = accessKeyId; - config.accessKeySecret = accessKeySecret; - Client client = new Client(config); - DescribePhoneNumberOperatorAttributeRequest request = new DescribePhoneNumberOperatorAttributeRequest(); - request.authCode = authCode; - request.inputNumber = phoneNumber; - request.mask = "NORMAL"; - DescribePhoneNumberOperatorAttributeResponse response = client.describePhoneNumberOperatorAttribute(request); - String code = response.body.code; - if (!com.aliyun.teautil.Common.equalString(code, "OK")) { - log.error("错误信息:" , response.body.message + ""); - throw new ServiceException(ErrorCodeEnum.GET_PHONENUMBER_INFO_ERROR); - } - return JSONObject.parseObject(JSONObject.toJSONString(response.body.data), DescribePhoneNumberDTO.class); - } catch (Exception e) { - log.error("获取手机号异常：", e); - throw new ServiceException(ErrorCodeEnum.GET_PHONENUMBER_INFO_ERROR); - } - } - - @Override - public IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl, IDCardSideEnum sideEnum) throws ApiException { - //todo zcb ak sk替换 - com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() - .setAccessKeyId(accessKeyId) - .setAccessKeySecret(accessKeySecret); - // 访问的域名 - config.endpoint = "ocr.cn-shanghai.aliyuncs.com"; - try { - com.aliyun.ocr20191230.Client client = new com.aliyun.ocr20191230.Client(config); - URL url = new URL(faceImageUrl); - InputStream inputStream = url.openConnection().getInputStream(); - com.aliyun.ocr20191230.models.RecognizeIdentityCardAdvanceRequest recognizeIdentityCardAdvanceRequest = new com.aliyun.ocr20191230.models.RecognizeIdentityCardAdvanceRequest() - .setImageURLObject(inputStream) - .setSide(sideEnum.getCode()); - com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); - RecognizeIdentityCardResponse idCardResponse = client.recognizeIdentityCardAdvance(recognizeIdentityCardAdvanceRequest, runtime); - log.info("身份证解析结果：{}", JSONObject.toJSONString(idCardResponse)); - RecognizeIdentityCardResponseBody.RecognizeIdentityCardResponseBodyDataFrontResult frontResult = Optional.ofNullable(idCardResponse).map(o -> o.getBody()).map(o -> o.data).map(o -> o.frontResult).orElse(null); - if(Objects.nonNull(frontResult)){ - String username = frontResult.name; - String liveAddress = frontResult.address; - String birthdate = frontResult.birthDate; - if(StringUtils.isNotBlank(birthdate)){ - birthdate = convertDate(birthdate, "yyyyMMdd"); - } - String sex = frontResult.gender; - String idCard = frontResult.IDNumber; - String nation = frontResult.nationality; - IdentityCardInfoVO result = new IdentityCardInfoVO(username, liveAddress, birthdate, sex, idCard, nation); - log.info("身份证解析：{}", JSONObject.toJSONString(result)); - return result; - } - return null; - } catch (com.aliyun.tea.TeaException e) { - log.error("身份证解析报错TeaException：{}", e); - throw new ApiException(e.getMessage()); - } catch (MalformedURLException e) { - log.error("身份证解析报错MalformedURLException：{}", e); - throw new ApiException(e.getMessage()); - } catch (IOException e) { - log.error("身份证解析报错IOException：{}", e); - throw new ApiException(e.getMessage()); - } catch (Exception e) { - log.error("身份证解析报错Exception：{}", e); - throw new ApiException(e.getMessage()); - } - } - - public static String convertDate(String date, String format) { - try { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format); - LocalDate localDate = LocalDate.parse(date, formatter); - return localDate.toString(); - } catch (Exception e) { - throw new ServiceException(ErrorCodeEnum.DATA_CONVERT_ERROR); - } - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java deleted file mode 100644 index 533d0dd58..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BeautyCameraSettingServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.BeautyCameraSettingDAO; -import com.cool.store.entity.BeautyCameraSettingDO; -import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; -import com.cool.store.service.BeautyCameraSettingService; -import com.cool.store.vo.beauty.BeautyCameraSettingVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: BeautyCameraSettingServiceImpl - * @Description: - * @date 2023-09-11 14:23 - */ -@Service -public class BeautyCameraSettingServiceImpl implements BeautyCameraSettingService { - - @Resource - private BeautyCameraSettingDAO beautyCameraSettingDAO; - - @Override - public Long saveBeautyCameraSetting(String userId, AddBeautyCameraSettingRequest request) { - BeautyCameraSettingDO beautyCameraSettingDO = AddBeautyCameraSettingRequest.convertDO(userId, request); - return beautyCameraSettingDAO.insertOrUpdateBeautyCameraSetting(beautyCameraSettingDO); - } - - @Override - public BeautyCameraSettingVO queryBeautyCameraSetting(String userId) { - BeautyCameraSettingDO beautyCameraSetting = beautyCameraSettingDAO.getBeautyCameraSetting(userId); - return BeautyCameraSettingVO.convertVO(beautyCameraSetting); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CallServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CallServiceImpl.java deleted file mode 100644 index 70c3b50cc..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CallServiceImpl.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.UUID; -import com.alibaba.fastjson.JSON; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; -import com.cool.store.dto.call.CallUpDTO; -import com.cool.store.dto.log.CallUpLogDTO; -import com.cool.store.dto.log.EntrustOthersDTO; -import com.cool.store.entity.CallRecordDO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.enums.CallStatusEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.handler.WebSocketServer; -import com.cool.store.mapper.CallRecordMapper; -import com.cool.store.mapper.HyOutboundMobileMapper; -import com.cool.store.mapper.HyPartnerUserInfoMapper; -import com.cool.store.request.CallFinishBackReq; -import com.cool.store.request.CallRecordBackReq; -import com.cool.store.request.CallUpReq; -import com.cool.store.service.CallService; -import com.cool.store.service.LogService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @Author: young.yu - * @Date: 2023-08-10 18:58 - * @Description: - */ -@Slf4j -@Service -public class CallServiceImpl implements CallService { - - @Autowired - private CallRecordMapper callRecordMapper; - - @Autowired - private HyOutboundMobileMapper hyOutboundMobileMapper; - - @Autowired - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Autowired - private LogService logService; - @Override - public String callUp(CallUpReq request) throws ApiException { - log.info("callUp request:{}",JSON.toJSONString(request)); - String tenantId = WebSocketServer.getTenantIdByMobile(request.getOutgoingMobile()); - //校验拨出手机号APP是否在线 - boolean isOnline = WebSocketServer.isOnline(tenantId); - if (!isOnline) { - throw new ApiException(ErrorCodeEnum.MOBILE_APP_NOT_ONLINE_ERROR); - } - try { - CallRecordDO callRecordDO = new CallRecordDO(); - callRecordDO.setOutgoingMobile(request.getOutgoingMobile()); - callRecordDO.setIncomingMobile(request.getIncomingMobile()); - callRecordDO.setOutgoingUserId(request.getOutgoingUserId()); - callRecordDO.setIncomingUserId(request.getIncomingUserId()); - callRecordDO.setPartnerLineId(Long.valueOf(request.getLineId())); - - //请求id - String transNo = UUID.fastUUID().toString().replace("-", ""); - callRecordDO.setTransNo(transNo); - callRecordDO.setCreater(request.getOutgoingUserId()); - callRecordDO.setCreateTime(new Date()); - callRecordDO.setCallStatus(CallStatusEnum.PENDING_CALL.getCode()); - - //发起app通话请求 - CallUpDTO callUpDTO = new CallUpDTO(); - callUpDTO.setTransNo(transNo); - callUpDTO.setOutgoingMobile(request.getOutgoingMobile()); - callUpDTO.setIncomingMobile(request.getIncomingMobile()); - boolean sendFlag = WebSocketServer.sendInfo(JSON.toJSONString(callUpDTO), tenantId); - if (!sendFlag) { - throw new ApiException(ErrorCodeEnum.CREATE_CALL_REQUEST_ERROR); - } - - //保存通话记录 - callRecordMapper.insertSelective(callRecordDO); - //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - CallUpLogDTO log = CallUpLogDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).incomingUserId(request.getIncomingUserId()) - .transNo(transNo).build(); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getIncomingUserId()); - if(!Objects.isNull(hyPartnerUserInfoDO)){ - log.setIncomingUserName(hyPartnerUserInfoDO.getUsername()); - } - logService.recordBizLog(operator,Long.valueOf(request.getLineId()), OperateTypeEnum.CALL_UP,log); - - return transNo; - } catch (Exception e) { - log.error("callUp error, request:{}", JSON.toJSONString(request), e); - throw new ApiException(ErrorCodeEnum.CALL_UP_ERROR); - } - } - - @Override - public void callFinishBack(CallFinishBackReq request) throws ApiException { - CallRecordDO callRecordDO = callRecordMapper.selectByTransNo(request.getTransNo()); - //校验通话记录是否存在 - if(callRecordDO == null){ - throw new ApiException(ErrorCodeEnum.CALL_RECORD_NOT_EXIST_ERROR); - } - callRecordDO.setCallStatus(request.getCallStatus()); - callRecordDO.setFailReason(request.getFailReason()); - callRecordDO.setUpdater("system-app"); - callRecordDO.setUpdateTime(new Date()); - if(StringUtils.isNotEmpty(request.getCallStartTime())&&StringUtils.isNotEmpty(request.getCallEndTime())){ - callRecordDO.setCallStartTime(DateUtil.parse(request.getCallStartTime())); - callRecordDO.setCallEndTime(DateUtil.parse(request.getCallEndTime())); - } - callRecordMapper.updateByTransNoSelective(callRecordDO); - } - - @Override - public void callRecordBack(CallRecordBackReq request) throws ApiException { - CallRecordDO callRecordDO = callRecordMapper.selectByTransNo(request.getTransNo()); - //校验通话记录是否存在 - if(callRecordDO == null){ - throw new ApiException(ErrorCodeEnum.CALL_RECORD_NOT_EXIST_ERROR); - } - callRecordDO.setCallStatus(request.getCallStatus()); - callRecordDO.setFailReason(request.getFailReason()); - if(StringUtils.isNotEmpty(request.getCallStartTime())&&StringUtils.isNotEmpty(request.getCallEndTime())){ - callRecordDO.setCallStartTime(DateUtil.parse(request.getCallStartTime())); - callRecordDO.setCallEndTime(DateUtil.parse(request.getCallEndTime())); - } - callRecordDO.setRecordUrl(request.getRecordUrl()); - callRecordDO.setUpdater("system-app"); - callRecordDO.setUpdateTime(new Date()); - callRecordMapper.updateByTransNoSelective(callRecordDO); - } - - @Override - public List getCallRecordByTransNos(List transNos) { - if(CollectionUtils.isEmpty(transNos)){ - return Lists.newArrayList(); - } - return callRecordMapper.selectByTransNos(transNos); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java deleted file mode 100644 index f70789895..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java +++ /dev/null @@ -1,337 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dao.HyPartnerExhibitionDAO; -import com.cool.store.dto.log.LogFieldDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyPartnerCertificationInfoMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.mapper.HyPartnerTaskInfoLogMapper; -import com.cool.store.request.GetTipsInfoReq; -import com.cool.store.service.CommonService; -import com.cool.store.utils.StringUtil; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; - -/** - * @Author: young.yu - * @Date: 2023-06-28 21:35 - * @Description: - */ -@Service -public class CommonServiceImpl implements CommonService { - - @Autowired - private HyPartnerTaskInfoLogMapper hyPartnerTaskInfoLogMapper; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private HyPartnerCertificationInfoMapper hyPartnerCertificationInfoMapper; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - @Autowired - private HyPartnerInterviewPlanMapper partnerInterviewPlanMapper; - - @Override - public String getTipsInfo(GetTipsInfoReq request) throws ApiException { - List lineInfoList = hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(Arrays.asList(Long.parseLong(request.getPartnerLineId()))); - if (CollectionUtils.isEmpty(lineInfoList)) { - return null; - } - //获取面试计划 id 信息 - HyPartnerInterviewPlanDO interviewPlanByLineId = partnerInterviewPlanMapper.getInterviewPlanByLineId(Long.parseLong(request.getPartnerLineId())); - HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfoList.get(0); - String partnerId = hyPartnerLineInfoDO.getPartnerId(); - String workflowStage = hyPartnerLineInfoDO.getWorkflowStage(); - String workflowStatus = hyPartnerLineInfoDO.getWorkflowStatus(); - //会销面试信息 - HyPartnerExhibitionDO partnerExhibitionDO = new HyPartnerExhibitionDO(); - partnerExhibitionDO.setPartnerLineId(hyPartnerLineInfoDO.getId()); - //能用对应的面试计划 id 查到线索参加会销信息就表示该线索是通过会销进行的面试 - partnerExhibitionDO.setInterviewPlanId(interviewPlanByLineId.getId()); - partnerExhibitionDO.setDeleted(Boolean.FALSE); - partnerExhibitionDO = partnerExhibitionDAO.querySelective(partnerExhibitionDO); - - //是否是会销面试 - //1. 非会销面试 - if (partnerExhibitionDO == null || partnerExhibitionDO.getParticipationStatus().compareTo(ExhibitionPartnerStatus.INTERVIEWING.getCode()) < 0) { - return getCommonTipsFix(Long.parseLong(request.getPartnerLineId()), partnerId, workflowStage, workflowStatus); - } else { - //2. 会销面试 - return getExhibitionTipsInfoFix(Long.parseLong(request.getPartnerLineId())); - } - } - - private String getCommonTipsFix(Long partnerLineId, String partnerId, String workflowStage, String workflowStatus) { - //1. 查询该线索需要展示的操作类型相应的操作记录 - List operationLogs = hyPartnerTaskInfoLogMapper.getLastTipsLog(partnerLineId); - HyPartnerTaskInfoLogDO lastLog; - if (!operationLogs.isEmpty()) { - lastLog = operationLogs.stream().filter(operationLog -> - //修改面试时间的 log 只要线索操作的 - (OperateTypeEnum.MODIFY_INTERVIEW_TIME.getCode().equals(operationLog.getOperateType()) - && operationLog.getOperateUserId().equals(partnerId)) - || !operationLog.getOperateType().equals(OperateTypeEnum.MODIFY_INTERVIEW_TIME.getCode()) - ).findFirst().orElse(new HyPartnerTaskInfoLogDO()); - } else { - return null; - } - - String interviewTips = ""; - //2. 判断类型并返回对应的tips - OperateTypeEnum operateType = OperateTypeEnum.getOperateTypeEnum(lastLog.getOperateType()); - switch (operateType) { - case INTERVIEWER_BOOK_INTERVIEW: - interviewTips = getInterviewTipsFix(lastLog, "通过操作后台于", "主动为客户预约面试时间"); - break; - case INTERVIEW_APPOINTMENT: - interviewTips = getInterviewTipsFix(lastLog, "通过合伙人小程序于", "发起预约面试申请"); - break; - case MODIFY_INTERVIEW_TIME: - interviewTips = getInterviewTipsFix(lastLog, "于", "修改面试预约时间"); - break; - case INTERVIEW_APPOINTMENT_AGREEMENT: - interviewTips = getInterviewTipsFix(lastLog, "于", "同意了客户的预约面试申请"); - break; - case AUTO_OPEN_INTERVIEW: - interviewTips = getInterviewTipsFix(lastLog, "面试房间于", "正式开放").trim(); - break; - case FINISH_INTERVIEW: - interviewTips = getInterviewTipsFix(lastLog, "于", "结束面试"); - break; - case CREATE_QUALIFYVERIFY: - interviewTips = getInterviewTipsFix(lastLog, "于", "发起加盟商资质审核"); - break; - case QUALIFYVERIFY_PASS: - HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); - String intentionContractNo = null; - if(partnerCertificationInfoDO != null){ - intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); - } - interviewTips = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | " + intentionContractNo); - break; - default: - break; - } - return interviewTips; - } - - private String getExhibitionTipsInfoFix(Long partnerLineId) { - String interviewTips = ""; - //1. 查询该线索需要展示的操作类型相应的操作记录 - List operationLogs = hyPartnerTaskInfoLogMapper.getLastTipsLog(partnerLineId); - HyPartnerTaskInfoLogDO lastLog; - if (!operationLogs.isEmpty()) { - lastLog = operationLogs.get(0); - } else { - return null; - } - //2. 判断类型并返回对应的tips - OperateTypeEnum operateType = OperateTypeEnum.getOperateTypeEnum(lastLog.getOperateType()); - switch (operateType) { - case INTERVIEWER_BOOK_INTERVIEW: - interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "发起面试"); - break; - case FINISH_INTERVIEW: - interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "结束面试"); - break; - case EXHIBITION_CREATE_QUALIFYVERIFY: - interviewTips = getInterviewTipsFix(lastLog, "通过展会于", "发起加盟商资质审核"); - break; - case QUALIFYVERIFY_PASS: - HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); - String intentionContractNo = null; - if(partnerCertificationInfoDO != null){ - intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); - } - interviewTips = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | " + intentionContractNo); - break; - default: - break; - } - return interviewTips; - } - - public String getInterviewTipsFix(HyPartnerTaskInfoLogDO lastLog, String middleInfo, String action) { - StringBuilder sb = new StringBuilder(); - sb.append(StringUtil.REPLACE_0) - .append(" ") - .append(StringUtil.REPLACE_1) - .append(" ") - .append(middleInfo) - .append(" ") - .append(StringUtil.REPLACE_2) - .append(" ").append(action); - String content = sb.toString(); - String fieldCopy = lastLog.getFieldCopy(); - List logFieldDTOS = JSON.parseArray(fieldCopy, LogFieldDTO.class); - List params = new ArrayList<>(); - String[] replaceKeys = new String[]{ - OperateLogFieldValueEnum.OPERATE_USER_NAME.getCode(), - OperateLogFieldValueEnum.MOBILE.getCode(), - OperateLogFieldValueEnum.OPERATE_TIME.getCode() - }; - for (String replaceKey : replaceKeys) { - String value = ""; - Optional logFieldDTOOptional = logFieldDTOS.stream().filter(l -> l.getCode().equals(replaceKey)).findFirst(); - if (logFieldDTOOptional.isPresent()) { - value = logFieldDTOOptional.get().getValue(); - try { - value = DateUtil.format(DateUtil.parseDateTime(value), "yyyy/MM/dd HH:mm:ss"); - } catch (Exception e) { - //异常代表不是时间格式，不做处理 - } - } - params.add(value); - } - return MessageFormat.format(content, params.toArray()); - } - - //普通线索 - @Deprecated - private String getCommonTipsInfo(String workflowStage, String workflowStatus, Long partnerLineId) { - String interviewTips = ""; - //1. 预约面试待审核 - if ((workflowStage.equals(WorkflowStageEnum.RESERVATION.getCode()) && workflowStatus.equals(WorkflowStatusEnum.RESERVATION_1.getCode()))) { - //该阶段既可能是预约面试提醒的 tip，也可能是修改面试时间的 tip，按照操作时间先后顺序判断 - String interviewTipsOne = getInterviewTips(partnerLineId, OperateTypeEnum.MODIFY_INTERVIEW_TIME, "于", "修改面试预约时间"); - String interviewTipsTwo = getInterviewTips(partnerLineId, OperateTypeEnum.INTERVIEW_APPOINTMENT, "通过合伙人小程序于", "发起预约面试申请"); - String[] tipsOneSplit = interviewTipsOne.split(" "); - String[] tipsTwoSplit = interviewTipsTwo.split(" "); - interviewTips = (tipsOneSplit[3] + tipsOneSplit[4]).compareTo(tipsTwoSplit[3] + tipsTwoSplit[4]) > 0 ? interviewTipsOne : interviewTipsTwo; - //2. 待面试 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_2.getCode())) { - String interviewTipsLocal = getInterviewTips(partnerLineId, OperateTypeEnum.INTERVIEW_APPOINTMENT_AGREEMENT, "于", "同意了客户的预约面试申请"); - if (interviewTipsLocal!= null &&!interviewTipsLocal.isEmpty()) { - interviewTips = interviewTipsLocal; - } - //3. 面试已开始 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_3.getCode())) { - String interviewTipsLocal = getInterviewTips(partnerLineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, "面试房间于", "正式开放"); - if (interviewTipsLocal != null && !interviewTipsLocal.isEmpty()) { - interviewTips = interviewTips.trim(); - } - //4. 面试已结束 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) { - String interviewTipsLocal = getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "于", "结束面试"); - if (interviewTipsLocal!= null &&!interviewTipsLocal.isEmpty()) { - interviewTips = interviewTipsLocal; - } - //5. 发起资质审批 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_5.getCode())) { - String interviewTipsLocal = getInterviewTips(partnerLineId, OperateTypeEnum.CREATE_QUALIFYVERIFY, "于","发起加盟商资质审核"); - if (interviewTipsLocal!= null &&!interviewTipsLocal.isEmpty()) { - interviewTips = interviewTipsLocal; - } - //6. 资质审批通过 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_6.getCode())) { - HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); - String intentionContractNo = null; - if(partnerCertificationInfoDO != null){ - intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); - } - String interviewTipsLocal = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | " + intentionContractNo); - if (interviewTipsLocal!= null &&!interviewTipsLocal.isEmpty()) { - interviewTips = interviewTipsLocal; - } - } - return interviewTips; - } - - //会销面试线索，通过会销进行面试的线索已开始就是面试已开始状态 - @Deprecated - private String getExhibitionTipsInfo(String workflowStage, String workflowStatus, Long partnerLineId) { - String interviewTips = ""; - //1. 面试已开始 - if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_3.getCode())) { - interviewTips = getInterviewTips(partnerLineId, OperateTypeEnum.INTERVIEWER_BOOK_INTERVIEW, "通过展会于", "发起面试"); - //2. 面试已结束 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) { - interviewTips = getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "通过展会于", "结束面试"); - //3. 发起资质审批 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_5.getCode())) { - interviewTips = getInterviewTips(partnerLineId, OperateTypeEnum.EXHIBITION_CREATE_QUALIFYVERIFY, "通过展会于", "发起加盟商资质审核"); - if (interviewTips == null) { - getInterviewTips(partnerLineId, OperateTypeEnum.CREATE_QUALIFYVERIFY, "于", "发起加盟商资质审核"); - } - //4. 资质审批通过 - } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_6.getCode())) { - HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId); - String intentionContractNo = null; - if(partnerCertificationInfoDO != null){ - intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo(); - } - interviewTips = getVerifyResultTips(partnerLineId, OperateTypeEnum.QUALIFYVERIFY_PASS, "审核通过 | "+intentionContractNo); - } - return interviewTips; - } - - public String getInterviewTips(Long partnerLineId, OperateTypeEnum operateTypeEnum, String middleInfo, String action) { - StringBuilder sb = new StringBuilder(); - sb.append(StringUtil.REPLACE_0) - .append(" ") - .append(StringUtil.REPLACE_1) - .append(" ") - .append(middleInfo) - .append(" ") - .append(StringUtil.REPLACE_2) - .append(" ").append(action); - String content = sb.toString(); - return getSuitableTipsInfo(content, partnerLineId, - operateTypeEnum, - OperateLogFieldValueEnum.OPERATE_USER_NAME.getCode(), - OperateLogFieldValueEnum.MOBILE.getCode(), - OperateLogFieldValueEnum.OPERATE_TIME.getCode()); - } - - public String getVerifyResultTips(Long partnerLineId, OperateTypeEnum operateTypeEnum, String action) { - StringBuffer sb = new StringBuffer(); - sb.append("于 ").append(StringUtil.REPLACE_0).append(" ").append(action); - String content = sb.toString(); - return getSuitableTipsInfo(content, partnerLineId, - operateTypeEnum, - OperateLogFieldValueEnum.OPERATE_TIME.getCode()); - } - - public String getSuitableTipsInfo(String content, Long partnerLineId, OperateTypeEnum operateTypeEnum, String... replaceKeys) { - List hyPartnerTaskInfoLogDOS = hyPartnerTaskInfoLogMapper.selectByPartnerLineIdAndOperateType(partnerLineId, operateTypeEnum.getCode()); - if (CollectionUtils.isEmpty(hyPartnerTaskInfoLogDOS)) { - return null; - } - HyPartnerTaskInfoLogDO hyPartnerTaskInfoLogDO = hyPartnerTaskInfoLogDOS.get(0); - String fieldCopy = hyPartnerTaskInfoLogDO.getFieldCopy(); - List logFieldDTOS = JSONObject.parseArray(fieldCopy, LogFieldDTO.class); - List params = new ArrayList<>(); - for (String replaceKey : replaceKeys) { - String value = ""; - Optional logFieldDTOOptional = logFieldDTOS.stream().filter(l -> l.getCode().equals(replaceKey)).findFirst(); - if (logFieldDTOOptional.isPresent()) { - value = logFieldDTOOptional.get().getValue(); - try { - value = DateUtil.format(DateUtil.parseDateTime(value), "yyyy/MM/dd HH:mm:ss"); - } catch (Exception e) { - //异常代表不是时间格式，不做处理 - } - } - params.add(value); - } - - return MessageFormat.format(content, params.toArray()); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java deleted file mode 100644 index 818f89b6b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.RedisConstant; -import com.cool.store.dao.ContentDAO; -import com.cool.store.dto.content.ContentAddDto; -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.dto.content.ContentUpdateDto; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyContentInfoMapper; -import com.cool.store.service.ContentService; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.HyContentInfoVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class ContentServiceImpl implements ContentService { - - @Autowired - private ContentDAO contentDAO; - - @Autowired - private HyContentInfoMapper contentInfoMapper; - - @Autowired - private RedisUtilPool redisUtilPool; - - /** - * - * @param dto - * @return contentId 新增动态id - */ - @Override - public String addNews(ContentAddDto dto) throws ApiException { - //增加不允许重复标题的逻辑 - Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle()); - if (isDuplicated) { - throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED); - } - HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); - BeanUtil.copyProperties(dto, hyContentInfoDO); - hyContentInfoDO.setUpdateUserId(dto.getCreateUserId()); - return Integer.toString(contentInfoMapper.insertSelective(hyContentInfoDO)); - } - - /** - * 删除动态 - * @param contentId - */ - @Override - public void deleteContent(String contentId) { - contentInfoMapper.deleteSelective(contentId); - } - - /** - * 更新动态信息 - * @param dto - */ - @Override - public void updateContent(ContentUpdateDto dto) throws ApiException { - HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); - BeanUtil.copyProperties(dto, hyContentInfoDO); - hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); - contentInfoMapper.updateByPrimaryKeySelective(hyContentInfoDO); - } - - /** - * 查询动态列表 - */ - @Override - public List queryContentList(ContentQueryListDto dto) { - return contentInfoMapper.queryContentList(dto); - } - - /** - * 查询动态列表 C 端用 - */ - @Override - public List queryContentListToC(ContentQueryListDto dto) { - return contentInfoMapper.queryContentListForC(dto); - } - - /** - * 查询动态详情 - * @param contentId - * @return - */ - @Override - public HyContentInfoDO queryContentInfo(String contentId) { - return contentInfoMapper.queryContentInfo(contentId); - } - - /** - * 标题是否重复 - */ - @Override - public Boolean queryTitles(String title) { - List titles = (List) JSONObject.parseObject(redisUtilPool.getString(RedisConstant.CONTENT_TITLES), List.class); - if (titles != null && titles.size() != 0) { - return titles.contains(title); - } - titles = contentInfoMapper.queryTitles(); - redisUtilPool.setString(RedisConstant.CONTENT_TITLES, JSONObject.toJSONString(titles), 60); - return titles.contains(title); - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java deleted file mode 100644 index a8e50f910..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyPartnerInterviewPlanDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dto.calendar.UserCalendarsEventDTO; -import com.cool.store.dto.partner.AdvanceLineDTO; -import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.service.DeskService; -import com.cool.store.service.HyPartnerInterviewPlanService; -import com.cool.store.service.HyPartnerLineInfoService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.vo.InterviewDetailInfoVO; -import com.cool.store.vo.InterviewPlanVO; -import com.cool.store.vo.InterviewScheduleInfoVO; -import com.cool.store.vo.StageCountVO; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/8 14:45 - * @Version 1.0 - */ -@Service -public class DeskServiceImpl implements DeskService { - - @Resource - HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - HyPartnerInterviewPlanService hyPartnerInterviewPlanService; - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - @Resource - private ISVHttpRequest isvHttpRequest; - - @Override - public HashMap getInterviewPlan(String userId) { - - String currentDate = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_DAY); - String endDate = DateUtil.format(CoolDateUtils.getDateFormatDay(new Date(), 13), CoolDateUtils.DATE_FORMAT_DAY); - List currentDateInterviewList = hyPartnerInterviewPlanDAO.getCurrentDateInterviewCount(userId, currentDate,endDate); - Map dateIntegerMap = currentDateInterviewList.stream().collect(Collectors.toMap(AdvanceLineDTO::getDate, AdvanceLineDTO::getCount)); - //临期数量 - List adventLineList = hyPartnerLineInfoDAO.getAdventLineCount(userId, currentDate,endDate); - Map adventLinerMap = adventLineList.stream().collect(Collectors.toMap(AdvanceLineDTO::getDate, AdvanceLineDTO::getCount)); - - HashMap resultMap = new HashMap<>(); - String tempDate = currentDate; - int i = 0; - while (true){ - tempDate = DateUtil.format(CoolDateUtils.getDateFormatDay(new Date(), i++), CoolDateUtils.DATE_FORMAT_DAY); - Integer currentDateInterviewCount = dateIntegerMap.getOrDefault(tempDate, 0); - Integer adventLineCount = adventLinerMap.getOrDefault(tempDate,0); - InterviewPlanVO interviewPlanVO = new InterviewPlanVO(); - interviewPlanVO.setHasInterview(currentDateInterviewCount>0); - interviewPlanVO.setHasAdventLine(adventLineCount>0); - resultMap.put(tempDate,interviewPlanVO); - if (tempDate.equals(endDate)){ - break; - } - } - return resultMap; - } - - - @Override - public InterviewScheduleInfoVO interviewSchedule(String userId,String selectedData) { - if (StringUtils.isEmpty(userId)||selectedData==null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - Date dateTime = CoolDateUtils.parseDate(selectedData,CoolDateUtils.DATE_FORMAT_SEC); - - InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); - //查询面试数量 - - String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); - String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(dateTime,1), CoolDateUtils.DATE_FORMAT_SEC); - String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(dateTime,6), CoolDateUtils.DATE_FORMAT_SEC); - SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); - - interviewScheduleInfoVO.setCurrentDayInterviewCount(interviewCount.getCurrentDayInterviewCount()); - interviewScheduleInfoVO.setLastSevenDayInterviewCount(interviewCount.getCurrentDayInterviewCount()+interviewCount.getLastSevenDayInterviewCount()); - - //查询面试列表 - //当天时间 与入参无关 - List interviewPlanList = hyPartnerInterviewPlanService.getInterviewPlanList(userId,dateTime); - interviewScheduleInfoVO.setInterviewDetailInfoVOS(interviewPlanList); - - return interviewScheduleInfoVO; - } - - @Override - public StageCountVO getStageCountByType(String userId, String type) { - if (CommonConstants.PENDING.equals(type)){ - return hyPartnerLineInfoService.selectStagePendingCount(userId); - } - if (CommonConstants.FOLLOW.equals(type)){ - return hyPartnerLineInfoService.selectStageFollowCount(userId); - } - return null; - } - - @Override - public List getUserCalendarsEvents(String userId, long startTime, long endTime) throws ApiException { - List userCalendarsEvents = isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime); - Collections.sort(userCalendarsEvents); - return userCalendarsEvents; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java deleted file mode 100644 index 9907ff9ca..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ /dev/null @@ -1,541 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.*; -import com.cool.store.dto.log.BlackListLogDTO; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.dto.partner.LineCountDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.http.UserSourceResponse; -import com.cool.store.mapper.HyPartnerEcTrackLogMapper; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.request.CustomerInfoRequest; -import com.cool.store.request.GetTagRequest; -import com.cool.store.sdk.ec.EcClient; -import com.cool.store.sdk.ec.bo.ChangeFollowUserBo; -import com.cool.store.sdk.ec.bo.UpdateCustomerBo; -import com.cool.store.sdk.ec.request.ChangeFollowUserRequest; -import com.cool.store.sdk.ec.request.UpdateCustomerRequest; -import com.cool.store.sdk.ec.response.ChangeFollowUserResponse; -import com.cool.store.sdk.ec.response.UpdateCustomerResponse; -import com.cool.store.service.EcSyncService; -import com.cool.store.service.LabelGroupService; -import com.cool.store.service.LabelService; -import com.cool.store.utils.*; -import com.cool.store.utils.poi.constant.Constants; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import javax.annotation.Resource; -import java.io.IOException; -import java.util.*; -import java.util.stream.Collectors; - -@Slf4j -@Service -public class EcSyncServiceImpl implements EcSyncService { - - - @Value("${ec.baseUrl:null}") - private String baseUrl; - - @Resource - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Resource - private HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - - @Resource - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - - - @Resource - HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - - @Resource - private MybatisBatchUtils mybatisBatchUtils; - - @Resource - private HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - - @Resource - private LabelGroupService labelGroupService; - - @Resource - private LabelService labelService; - - - @Resource - private EventCenterHttpRequest eventCenterHttpRequest; - - - @Value("${ec.sync.createUserId:null}") - private String operateId; - - - private final String operateName="EC系统"; - - @Override - public boolean ecToApplet(List queryListData) { - Map> sendUserMap = new HashMap<>(); - for (CustomerInfoRequest customerInfoItem : queryListData) { - try { - insertSelectiveSync(customerInfoItem, false, sendUserMap); - } catch (Exception e) { - log.error("ec同步至招商小程序报错" + JSONObject.toJSONString(e)); - sendFeiShuRobotMessage("推送：" + JSONObject.toJSONString(e), "27243d49-97ca-4981-8aec-7c3bf84eb660"); - } - } - sendUserMap.forEach((k, v) -> { - //将多个电话与姓名拼接在一块 - String str = v.stream().map(item -> item.getUsername().concat(item.getMobile())).collect(Collectors.joining(Constants.COMMA)); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(new ArrayList() {{ - add(k); - }}); - List feishuIds = feishuUserIdsByUserIds.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); - try { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.EC_RECEIVE_LINE,feishuIds,v.size(),str); - } catch (ApiException e) { - log.error("ec同步至招商发送飞书通知错误" + JSONObject.toJSONString(e)); - } - }); - return false; - } - - @Override - public void getChannelSource() { - String s = HttpUtil.get(baseUrl + "/ec/getChannelSource"); - UserSourceResponse userSourceResponse = JSONObject.parseObject(s, UserSourceResponse.class); - for (UserSourceResponse.ChannelSource channelSource : userSourceResponse.getData()) { - Long id = channelSource.getId(); - HyPartnerUserChannelDO selectByChannel = hyPartnerUserChannelMapper.selectByChannel(id,channelSource.getName()); - HyPartnerUserChannelDO hyPartnerUserChannel = new HyPartnerUserChannelDO(); - hyPartnerUserChannel.setChannelId(channelSource.getId()).setChannelName(channelSource.getName()); - //有就更新 没有插入 - if (ObjectUtil.isNotNull(selectByChannel)) { - hyPartnerUserChannel.setUpdateTime(new Date()).setId(selectByChannel.getId()); - hyPartnerUserChannelMapper.updateByPrimaryKeySelective(hyPartnerUserChannel); - } else { - hyPartnerUserChannel.setCreateTime(new Date()); - hyPartnerUserChannelMapper.insertSelective(hyPartnerUserChannel); - } - } - } - - @Override - public Boolean labelInfo(List getTagRequestList) { - for (GetTagRequest getTagRequest : getTagRequestList) { - Long groupId = getTagRequest.getGroupId(); - if (ObjectUtil.isNotNull(labelGroupService.selectByPrimaryKey(groupId))) { - continue; - } - HyPartnerLabelGroupDO hyPartnerLabelGroupDO = new HyPartnerLabelGroupDO(); - hyPartnerLabelGroupDO.setLabelGroupName(getTagRequest.getGroupName()).setId(groupId); - labelGroupService.addEcLabelGroup(hyPartnerLabelGroupDO); - for (GetTagRequest.GetTagItem item : getTagRequest.getList()) { - if (ObjectUtil.isNotNull(labelService.selectByPrimaryKey(item.getClassId()))) { - continue; - } - HyPartnerLabelDO hyPartnerLabelDO = new HyPartnerLabelDO(); - hyPartnerLabelDO.setLabelName(item.getClassName()).setId(item.getClassId()).setLabelGroupId(groupId); - labelService.addEcLabel(hyPartnerLabelDO); - } - } - return Boolean.TRUE; - } - - @Override - public String getLastCrmCreateTime() { - return hyPartnerUserInfoDAO.selectLastCrmCreateTime(); - } - - - @SneakyThrows - @Override - public Boolean historyLine(List resultCustomerInfoList) { - for (CustomerInfoRequest customerInfoRequest : resultCustomerInfoList) { - customerInfoRequest.setUpdateTime(DateUtil.parse(customerInfoRequest.getCrmCreateTime(), DatePattern.NORM_DATETIME_PATTERN)); - Map> sendUserMap = new HashMap<>(); - insertSelectiveSync(customerInfoRequest, true, sendUserMap); - } - return Boolean.TRUE; - } - - @Override - public Integer historyLineTrajectory(List resultTrajectoryList) { - List result=new ArrayList<>(); - for (HyPartnerEcTrackLogDO hyPartnerEcTrackLogDO : resultTrajectoryList) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(hyPartnerEcTrackLogDO.getMobile()); - if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) { - hyPartnerEcTrackLogDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - result.add(hyPartnerEcTrackLogDO); - } - } - return mybatisBatchUtils.batchInsertOrUpdate(result, HyPartnerEcTrackLogMapper.class, (record, mapper) -> mapper.insertSelective(record)); - } - - /** - * 同步ec数据到表中 同时将部分数据同步到ec - * - * @param customerInfoItem - */ - @Transactional(rollbackFor = Exception.class) - public void insertSelectiveSync(CustomerInfoRequest customerInfoItem, Boolean pan, Map> sendUserMap) throws ApiException { - //发送消息 - customerInfoItem.setMobile(customerInfoItem.getMobile().split(" ")[1]); - String newPartnerId = UUIDUtils.get32UUID(); - HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO(); - HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); - resultUser.setUsername(customerInfoItem.getName()).setMobile(customerInfoItem.getMobile()).setUserChannelId(Convert.toInt(getChannelId(customerInfoItem.getChannel()))).setEcWantShopArea(customerInfoItem.getEcWantShopArea()); - Date time = new Date(); - if (ObjectUtil.isNotNull(customerInfoItem.getUpdateTime()) && pan) { - //历史线索创建时间与更新时间设置为ec同步过来的时间 - time = customerInfoItem.getUpdateTime(); - resultUser.setCrmCreateTime(time); - //放入历史标签id - if (StringUtil.isNotEmpty(customerInfoItem.getLabelIds())) { - resultBase.setUserPortrait(CommonConstants.COMMA.concat(customerInfoItem.getLabelIds()).concat(CommonConstants.COMMA)); - } - } - HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); - String followUserName = customerInfoItem.getFollowUserName(); - String followUserMobile = customerInfoItem.getFollowUserMobile(); - //获取招商经理 - String investmentManager = getInvestmentManager(followUserName, followUserMobile); - resultLine.setInvestmentManager(investmentManager); - resultLine.setAllotTime(StringUtil.isEmpty(investmentManager)?null:new Date()); - resultLine.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()) - .setLineStatus(StringUtil.isEmpty(customerInfoItem.getFollowUserName()) ? LineStatusEnum.PUBLIC_SEAS.getCode() : LineStatusEnum.PRIVATE_SEAS.getCode()); - resultBase.setUsername(customerInfoItem.getName()).setMobile(customerInfoItem.getMobile()); - - HyPartnerUserInfoDO newUserInfo = hyPartnerUserInfoDAO.selectByMobile(resultUser.getMobile()); - EcClient ecClient = new EcClient(); - //有就更新ec没有就插入 - if (newUserInfo != null) { - //招商客户姓名为空 - if (ObjectUtil.isNull(newUserInfo.getUsername()) || StringUtil.isEmpty(newUserInfo.getUsername())) { - newUserInfo.setUsername(resultUser.getUsername()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(newUserInfo); - } - // EC与沪姨合伙人同时存在的线索用户，但用户姓名不同，将沪姨合伙人线索姓名同步至EC覆盖原EC线索姓名 - if (!newUserInfo.getUsername().equals(resultUser.getUsername())) { - updateEcCustomer(customerInfoItem, newUserInfo, ecClient); - } - String oldPartnerId = newUserInfo.getPartnerId(); - //线索表 - HyPartnerLineInfoDO partnerLine = hyPartnerLineInfoDAO.getByPartnerId(oldPartnerId); - if (partnerLine != null) { - // EC与沪姨合伙人同时存在的线索用户，但存在不同的跟进人，将沪姨合伙人跟进人信息同步至EC覆盖原EC跟进人信息 - if (StringUtil.isEmpty(partnerLine.getInvestmentManager())) { - if (StringUtil.isNotEmpty(resultLine.getInvestmentManager()) && !getFollowLineStatus(partnerLine)) { - resultLine.setId(partnerLine.getId()).setUpdateTime(new Date()); - //沪姨合伙人线索存在黑名单，EC该线索分配跟进人同步到沪姨合伙人但线索状态不变，还存在黑名单中 - resultLine.setLineStatus(partnerLine.getLineStatus().intValue() == LineStatusEnum.BLACKLIST.getCode().intValue() - ? LineStatusEnum.BLACKLIST.getCode() : resultLine.getLineStatus()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine); - - //分配招商经理发送消息通知 - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(new ArrayList() {{ - add(resultLine.getInvestmentManager()); - }}); - List feishuIds = feishuUserIdsByUserIds.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); - try { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,feishuIds,operateName,newUserInfo.getUsername(),newUserInfo.getMobile()); - } catch (ApiException e) { - log.error("ec同步至招商发送飞书通知错误" + JSONObject.toJSONString(e)); - } - - //添加新增线索的ec操作日志 - LineLogInfo lineLogInfo = new LineLogInfo(partnerLine.getPartnerId(), resultLine.getId(), operateId, - operateName, OperateTypeEnum.ALLOCATION_INVESTMENT_MANAGER, - WorkflowStageEnum.getWorkflowStageByCode(partnerLine.getWorkflowStage()), - partnerLine.getWorkflowStatus(), ""); - BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(operateId).operateUsername(operateName) - .mobile(resultBase.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - } - } else { - if (!getFollowLineStatus(partnerLine)) { - //私海 - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(partnerLine.getInvestmentManager()); - enterpriseUser.setMobile(getNoWith86Number(enterpriseUser.getMobile())); - //电话相同但是名字不同 - if (enterpriseUser.getMobile().equals(followUserMobile) && !enterpriseUser.getName().equals(followUserName)) { - changeEcFollowUser(customerInfoItem, ecClient, enterpriseUser, 1); - } - //电话不同 - if (!enterpriseUser.getMobile().equals(followUserMobile)) { - changeEcFollowUser(customerInfoItem, ecClient, enterpriseUser, 2); - } - } - } - //base表 - HyPartnerBaseInfoDO partnerIdAndLine = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(partnerLine.getPartnerId(), partnerLine.getId()); - if (partnerIdAndLine == null) { - resultBase.setPartnerId(oldPartnerId).setPartnerLineId(partnerLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). - setCreateTime(time).setUpdateTime(time); - hyPartnerBaseInfoDAO.insertSelective(resultBase); - } else { - //标签共有 取并集 更改用户画像 - updateUserPortrait(partnerIdAndLine, partnerIdAndLine.getUserPortrait(), resultBase.getUserPortrait()); - } - } - else { - insertUserInfo(sendUserMap, oldPartnerId, resultBase, resultUser, time, resultLine); - } - newUserInfo.setEcWantShopArea(resultUser.getEcWantShopArea()); - //添加ec意向区域同步 - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(newUserInfo); - } else { - resultUser.setPartnerId(newPartnerId).setCreateTime(time).setUpdateTime(time); - hyPartnerUserInfoDAO.insertSelective(resultUser); - - insertUserInfo(sendUserMap, newPartnerId, resultBase, resultUser, time, resultLine); - } - } - - /** - * 发送请求更改ec线索跟进人 - * - * @param customerInfoItem - * @param ecClient - * @param enterpriseUser - * @param i - */ - private void changeEcFollowUser(CustomerInfoRequest customerInfoItem, EcClient ecClient, EnterpriseUserDO enterpriseUser, int i) { - ChangeFollowUserRequest changeFollowUserRequest = new ChangeFollowUserRequest(); - ChangeFollowUserBo changeFollowUserBo = new ChangeFollowUserBo(); - changeFollowUserBo.setFollowUserId(customerInfoItem.getLastFollowUserId()).setCrmId(customerInfoItem.getCrmId()) - .setType(i).setUsername(enterpriseUser.getName()).setMobile(enterpriseUser.getMobile()); - changeFollowUserRequest.setParameter(changeFollowUserBo); - ChangeFollowUserResponse changeFollowUserExec = ecClient.exec(baseUrl, changeFollowUserRequest); - } - - /** - * 发送请求更改ec客户 - * - * @param customerInfoItem - * @param newUserInfo - * @param ecClient - */ - private void updateEcCustomer(CustomerInfoRequest customerInfoItem, HyPartnerUserInfoDO newUserInfo, EcClient ecClient) { - UpdateCustomerRequest updateUserRequest = new UpdateCustomerRequest(); - UpdateCustomerBo updateCustomerBo = new UpdateCustomerBo(); - updateCustomerBo.setUsername(newUserInfo.getUsername()).setMobile(newUserInfo.getMobile()).setCrmId(customerInfoItem.getCrmId()); - updateUserRequest.setParameter(updateCustomerBo); - UpdateCustomerResponse updateUserExec = ecClient.exec(baseUrl, updateUserRequest); - } - - /** - * 添加线索信息 - * @param sendUserMap - * @param newPartnerId - * @param resultBase - * @param resultUser - * @param time - * @param resultLine - */ - private void insertUserInfo(Map> sendUserMap, String newPartnerId, HyPartnerBaseInfoDO resultBase, HyPartnerUserInfoDO resultUser, Date time, HyPartnerLineInfoDO resultLine) { - resultLine.setPartnerId(newPartnerId).setCreateTime(time).setUpdateTime(time); - hyPartnerLineInfoDAO.insertSelective(resultLine); - - resultBase.setPartnerId(newPartnerId).setPartnerLineId(resultLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). - setCreateTime(time).setUpdateTime(time); - hyPartnerBaseInfoDAO.insertSelective(resultBase); - //存放待发送飞书通知消息 - putElement(sendUserMap, resultLine.getInvestmentManager(), resultUser); - //添加新增线索的ec操作日志 - LineLogInfo lineLogInfo = new LineLogInfo(newPartnerId, resultLine.getId(), operateId, - operateName, OperateTypeEnum.EC_SYNC_ADD_LINE, - WorkflowStageEnum.getWorkflowStageByCode(resultLine.getWorkflowStage()), - WorkflowStatusEnum.INTENT_0.getCode(), ""); - BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(operateId).operateUsername(operateName) - .mobile(resultBase.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - } - - - /** - * 存放待发送飞书通知消息 - * - * @param sendUserMap - * @param key - * @param element - */ - private void putElement(Map> sendUserMap, String key, HyPartnerUserInfoDO element) { - if (StringUtil.isEmpty(key)) { - return; - } - List list = sendUserMap.get(key); - if (CollectionUtils.isEmpty(list)) { - ArrayList hyPartnerUserInfoDOS = new ArrayList<>(); - hyPartnerUserInfoDOS.add(element); - sendUserMap.put(key, hyPartnerUserInfoDOS); - } else { - list.add(element); - } - - } - - /** - * 更改用户画像取并集 - * - * @param partnerIdAndLine - * @param oldUserPortrait - * @param newUserPortrait - */ - private void updateUserPortrait(HyPartnerBaseInfoDO partnerIdAndLine, String oldUserPortrait, String newUserPortrait) { - if (StringUtil.isEmpty(newUserPortrait)||ObjectUtil.isNull(partnerIdAndLine)) { - return; - } - if (StringUtil.isEmpty(oldUserPortrait)) { - partnerIdAndLine.setUserPortrait(newUserPortrait); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(partnerIdAndLine); - return; - } - if (!newUserPortrait.equals(oldUserPortrait)) { - List oldList = new ArrayList<>(Arrays.asList(oldUserPortrait.split(Constants.COMMA))).stream().filter(item->StringUtil.isNotEmpty(item)).collect(Collectors.toList()); - List newList = new ArrayList<>(Arrays.asList(newUserPortrait.split(Constants.COMMA))).stream().filter(item->StringUtil.isNotEmpty(item)).collect(Collectors.toList()); - oldList.addAll(newList); - String userPortrait = Constants.COMMA.concat(oldList.stream().distinct().collect(Collectors.joining(Constants.COMMA))).concat(Constants.COMMA); - partnerIdAndLine.setUserPortrait(userPortrait); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(partnerIdAndLine); - } - } - - /*** - * 获取跟进人id - * @param followUserName - * @param followUserMobile - * @return - * @throws ApiException - */ - private String getInvestmentManager(String followUserName, String followUserMobile) throws ApiException { - //传递过来有跟进人的情况下查询跟进人是否存在 - if (StringUtil.isNotEmpty(followUserMobile) && StringUtil.isNotEmpty(followUserName)) { - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(followUserMobile); - if (enterpriseUserDO==null) { - // 给飞书群发送消息 跟进人找不到 - sendFeiShuRobotMessage("推送：飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile, "27243d49-97ca-4981-8aec-7c3bf84eb660"); - return ""; - } - return enterpriseUserDO.getUserId(); - } - return ""; - } - - /** - * @param channel - * @return - */ - private Long getChannelId(String channel) { - //获取客户来源id - HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); - Long channelId = null; - if (StringUtil.isNotEmpty(channel)) { - if (ObjectUtil.isNull(hyPartnerUserChannelDO) || ObjectUtil.isNull(hyPartnerUserChannelDO.getChannelId())) { - getChannelSource(); - } - HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); - channelId = channelDO.getChannelId(); - } - return channelId; - } - - - /** - * 招商公海内跟进次数大于等于1的用户EC同步该用户进去公海,假若跟进次数为0的同步到EC跟进人就是唐佑玉 - * - * @param partnerLine - * @return true为公海 false:私海 - */ - public Boolean getFollowLineStatus(HyPartnerLineInfoDO partnerLine) { - if (partnerLine.getLineStatus() != 0) { - return Boolean.FALSE; - } - ArrayList list = new ArrayList<>(); - list.add(partnerLine.getPartnerId()); - List followCountList = hyPartnerLineInfoDAO.getFollowCountList(list); - if (!CollectionUtils.isEmpty(followCountList)) { - return followCountList.get(0).getFollowCount() > 0; - } - return Boolean.FALSE; - } - - /** - * 得到不带86开头的号码 - * - * @param number - * @return - */ - public static String getNoWith86Number(String number) { - String regular = number; - if (StringUtils.isNotBlank(regular)) { - // 去掉+号 - while (regular.startsWith("+")) { - regular = regular.substring(1); - } - // 号码以0开始,去掉前缀 - while (regular.startsWith("0")) { - regular = regular.substring(1); - } - // 号码以86开始,去掉前缀 - while (regular.startsWith("86")) { - regular = regular.substring(2); - } - // 号码以0开始，去掉前缀 - while (regular.startsWith("0")) { - regular = regular.substring(1); - } - } - return regular; - } - - - /** - * 发送飞书机器人 - * - * @param text - * @param token - * @return - */ - public String sendFeiShuRobotMessage(String text, String token) { - HashMap map = new HashMap<>(4); - HashMap textMap = new HashMap(4); - textMap.put("text", text); - map.put("content", textMap); - map.put("msg_type", "text"); - String body = JSON.toJSONString(map); - String send = ""; - try { - send = Post.send("https://open.feishu.cn/open-apis/bot/v2/hook/" + token, body, new HashMap(4) {{ - put("Content-Type", "application/json"); - }}); - } catch (IOException e) { - e.printStackTrace(); - } - return send; - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java deleted file mode 100644 index d27363eda..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java +++ /dev/null @@ -1,335 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.*; -import com.cool.store.dto.buser.UserEventDTO; -import com.cool.store.dto.dept.DepartmentEventDTO; -import com.cool.store.dto.enterprise.*; -import com.cool.store.entity.*; -import com.cool.store.enums.DataSourceEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.FSEventTypeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.service.EnterpriseSyncService; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -import static com.cool.store.enums.FSEventTypeEnum.*; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseInitService - * @Description: 企业初始化 - * @date 2023-05-26 16:28 - */ - -@Slf4j -@Service -public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { - - @Resource - private ISVHttpRequest isvHttpRequest; - @Resource - private RegionDAO regionDAO; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - @Resource - private SysRoleDAO sysRoleDAO; - @Resource - private UserRegionMappingDAO userRegionMappingDAO; - - @Override - public void syncAll() { - AuthScopeDTO authScope = isvHttpRequest.getAuthScope(); - List authUserIdList = authScope.getUserIdList(); - //同步部门 - Pair, Multimap> listMultimapPair = syncRegion(); - List regionList = listMultimapPair.getKey(); - Multimap leaderDeptMap = listMultimapPair.getValue(); - Multimap roleUserMap = ArrayListMultimap.create(); - //同步用户及部门 - syncUserAndUserRegion(regionList, authUserIdList, roleUserMap, leaderDeptMap); - //处理用户角色 删除多余的角色 - if(!roleUserMap.isEmpty()){ - List insertOrUpdateList = new ArrayList<>(); - List userRoleInsertOrUpdateList = new ArrayList<>(); - List roleIds = new ArrayList<>(); - for (String roleName : roleUserMap.keys()) { - SysRoleDO sysRole = SysRoleDO.convertSyncDO(roleName); - roleIds.add(sysRole.getRoleId()); - Collection userIds = roleUserMap.get(roleName); - insertOrUpdateList.add(sysRole); - userRoleInsertOrUpdateList.addAll(EnterpriseUserRoleDO.convertSyncDO(sysRole.getRoleId(), new ArrayList<>(userIds))); - //删除角色下不存在的用户 - enterpriseUserRoleDAO.deleteRoleInUser(sysRole.getRoleId(), DataSourceEnum.SYNC, new ArrayList<>(userIds)); - } - sysRoleDAO.batchInsertSelective(insertOrUpdateList); - enterpriseUserRoleDAO.batchInsertOrUpdate(userRoleInsertOrUpdateList); - //删除不存在的角色？ - sysRoleDAO.deleteRole(DataSourceEnum.SYNC, roleIds); - }else { - //如果为空 是不是得删除角色 及用户角色信息？ - } - } - - /** - * 同步组织架构 - * @return - */ - private Pair, Multimap> syncRegion(){ - //同步部门 - List departments = isvHttpRequest.getSubDepartments(CommonConstants.ROOT_DEPT_ID_STR, true); - //获取企业信息 - AuthInfoDTO authInfo = isvHttpRequest.getAuthInfo(); - Multimap leaderDeptMap = ArrayListMultimap.create(); - //组织架构中增加根节点，处理部门上下级关系 - List regionList = SysDepartmentDTO.convertRegionDO(departments, leaderDeptMap); - //添加根节点 - regionList.add(getRootRegion(authInfo)); - List regionIds = regionList.stream().map(RegionDO::getRegionId).distinct().collect(Collectors.toList()); - //批量插入 - regionDAO.batchInsertOrUpdate(regionList); - //删除不存在的区域 - regionDAO.deleteNotExistRegion(regionIds); - //删除区域管理的人员 - userRegionMappingDAO.deleteRegionUserByExcludeRegionIds(regionIds); - return Pair.of(regionList, leaderDeptMap); - } - - /** - * 处理用户及部门之间的关系 - * @param regionList - * @param roleUserMap - * @param leaderDeptMap - */ - private void syncUserAndUserRegion(List regionList, List authUserIdList, Multimap roleUserMap, Multimap leaderDeptMap){ - Map regionPathMap = regionList.stream().collect(Collectors.toMap(RegionDO::getRegionId, RegionDO::getRegionPath)); - List userList = new ArrayList<>(); - List userRegionList = new ArrayList<>(); - List userIds = new ArrayList<>(); - //按部门获取用户 - for (RegionDO region : regionList) { - List departmentUsers = isvHttpRequest.getDepartmentUsers(region.getRegionId()); - List deptUserIds = ListUtils.emptyIfNull(departmentUsers).stream().map(EnterpriseUserDTO::getUserId).collect(Collectors.toList()); - userRegionMappingDAO.deleteUserRegion(region.getRegionId(), DataSourceEnum.SYNC, deptUserIds); - if(CollectionUtils.isEmpty(departmentUsers)){ - continue; - } - userIds.addAll(deptUserIds); - userRegionList.addAll(UserRegionMappingDO.convertSyncDO(region.getRegionId(), departmentUsers)); - //系统内的角色 获取飞书的职务 一个人只能一个职务 - List deptUserList = EnterpriseUserDTO.transUserDtoToDo(departmentUsers, regionPathMap, leaderDeptMap, roleUserMap); - userList.addAll(deptUserList); - if(userList.size() > CommonConstants.DEAL_RECORD_MAX_SIZE){ - enterpriseUserDAO.batchInsertOrUpdate(userList); - userList.clear(); - } - if(userRegionList.size() > CommonConstants.DEAL_RECORD_MAX_SIZE){ - userRegionMappingDAO.batchInsertOrUpdateUserRegion(userRegionList); - userRegionList.clear(); - } - } - if(CollectionUtils.isNotEmpty(authUserIdList)){ - userIds.addAll(authUserIdList); - List userDetailList = isvHttpRequest.getUserDetailByUserIds(authUserIdList); - List enterpriseUserList = EnterpriseUserDTO.transUserDtoToDo(userDetailList, regionPathMap, leaderDeptMap, roleUserMap); - List userRegionMapping = UserRegionMappingDO.convertSyncDO(enterpriseUserList); - userRegionList.addAll(userRegionMapping); - userList.addAll(enterpriseUserList); - } - enterpriseUserDAO.batchInsertOrUpdate(userList); - userRegionMappingDAO.batchInsertOrUpdateUserRegion(userRegionList); - //删除不存在的用户 - enterpriseUserDAO.deleteUser(userIds); - userRegionMappingDAO.deleteRegionUserByExcludeUserIds(userIds); - } - - /** - * 获取跟部门 - * @param authInfo - * @return - */ - private RegionDO getRootRegion(AuthInfoDTO authInfo){ - RegionDO rootRegion = new RegionDO(); - rootRegion.setName(authInfo.getAuthCorpInfo().getCorpName()); - rootRegion.setRegionId(CommonConstants.ROOT_DEPT_ID_STR); - rootRegion.setParentId(CommonConstants.ZERO_STR); - rootRegion.setThirdDeptId(CommonConstants.ROOT_DEPT_ID_STR); - rootRegion.setOrderNum(CommonConstants.ZERO); - rootRegion.setRegionPath(CommonConstants.PATH_SPILT + rootRegion.getRegionId() + CommonConstants.PATH_SPILT); - rootRegion.setDeleted(Boolean.FALSE); - return rootRegion; - } - - @Override - public void userUpdateEvent(UserEventDTO param) { - FSEventTypeEnum eventType = parseValue(param.getEventType()); - switch (eventType){ - case USER_CREATED: - case USER_UPDATED: - EnterpriseUserDTO userDetail = isvHttpRequest.getUserDetailByUserId(param.getOpenId()); - List departmentLists = userDetail.getDepartmentLists(); - Multimap leaderDeptMap = ArrayListMultimap.create(); - Map regionPathMap = new HashMap<>(); - if(CollectionUtils.isNotEmpty(departmentLists)){ - List regionList = regionDAO.getRegionByRegionIds(departmentLists); - List regionIds = ListUtils.emptyIfNull(regionList).stream().map(RegionDO::getRegionId).collect(Collectors.toList()); - //判断两个集合是否都是包含关系，不包含的情况下 说明组织架构数据不全 重新同步 - if(!(regionIds.containsAll(departmentLists) && departmentLists.containsAll(regionIds))){ - Pair, Multimap> regionPair = syncRegion(); - regionList = regionPair.getKey(); - leaderDeptMap = regionPair.getValue(); - } - regionPathMap = regionList.stream().collect(Collectors.toMap(k->k.getRegionId(), v->v.getRegionPath())); - } - String jobTitle = userDetail.getJobTitle(); - if(StringUtils.isNotBlank(jobTitle)){ - SysRoleDO role = sysRoleDAO.getRoleByName(jobTitle, DataSourceEnum.SYNC); - if(Objects.isNull(role)){ - //新增角色 - role = SysRoleDO.convertSyncDO(jobTitle); - sysRoleDAO.batchInsertSelective(new ArrayList<>(Arrays.asList(role))); - } - List enterpriseUserRole = EnterpriseUserRoleDO.convertSyncDO(role.getRoleId(), new ArrayList<>(Arrays.asList(userDetail.getUserId()))); - enterpriseUserRoleDAO.batchInsertOrUpdate(enterpriseUserRole); - enterpriseUserRoleDAO.deleteUserInRole(userDetail.getUserId(), DataSourceEnum.SYNC, role.getRoleId()); - }else{ - enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId()); - } - EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap, eventType); - if(StringUtils.isNotBlank(enterpriseUser.getMobile())){ - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(enterpriseUser.getMobile()); - //如果没有用户信息 但是飞书推的是更新的事件 - if (enterpriseUserDO==null&&enterpriseUser.getIsLeader()==null){ - log.info("没有用户信息 但是飞书推的是更新的事件"); - enterpriseUser.setIsLeader(Boolean.FALSE); - enterpriseUser.setLeaderDeptIds("[]"); - } - } - enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser))); - userRegionMappingDAO.batchInsertOrUpdateUserRegion(UserRegionMappingDO.convertSyncDO(Arrays.asList(enterpriseUser))); - userRegionMappingDAO.deleteUserRegionByUserId(userDetail.getUserId(), DataSourceEnum.SYNC, departmentLists); - break; - case USER_DELETED: - //人员职位删除状态，角色职位删除状态，人员从部门去除 - userRegionMappingDAO.deleteUserRegionByUserId(param.getUserId()); - enterpriseUserRoleDAO.deleteUserRole(param.getUserId()); - enterpriseUserDAO.deleteUserByUserId(param.getUserId()); - break; - default: - return; - } - } - - @Override - public void deptUpdateEvent(DepartmentEventDTO param) { - SysDepartmentDTO departmentDetail = isvHttpRequest.getDepartmentDetail(param.getDepartmentId()); - if(Objects.isNull(departmentDetail)){ - return; - } - log.info("部门变更：{}", JSONObject.toJSONString(param)); - switch (parseValue(param.getEventType())){ - case DEPARTMENT_CREATED: - RegionDO parentRegionInfo = regionDAO.getRegionInfoByRegionId(departmentDetail.getParentId()); - if(Objects.isNull(parentRegionInfo)){ - throw new ServiceException(ErrorCodeEnum.PARENT_NODE_NOT_EXIST); - } - Multimap leaderDeptMap = ArrayListMultimap.create(); - RegionDO region = SysDepartmentDTO.convertRegionDO(departmentDetail, leaderDeptMap, parentRegionInfo); - regionDAO.batchInsertOrUpdate(Arrays.asList(region)); - dealUserLeaderDept(departmentDetail.getId(), leaderDeptMap); - break; - case DEPARTMENT_UPDATED: - if(param.getIsChangeParent()){ - syncAll(); - return; - } - RegionDO parentRegion = regionDAO.getRegionInfoByRegionId(departmentDetail.getParentId()); - Multimap updateLeaderDeptMap = ArrayListMultimap.create(); - RegionDO updateRegion = SysDepartmentDTO.convertRegionDO(departmentDetail, updateLeaderDeptMap, parentRegion); - regionDAO.batchInsertOrUpdate(Arrays.asList(updateRegion)); - dealUserLeaderDept(departmentDetail.getId(), updateLeaderDeptMap); - break; - case DEPARTMENT_DELETED: - boolean leafNode = regionDAO.isLeafNode(departmentDetail.getId()); - boolean isExistUser = enterpriseUserDAO.isExistDeptUser(departmentDetail.getId()); - if(leafNode && !isExistUser){ - //叶子节点的时候会删除部门 - regionDAO.deleteRegionByRegionId(departmentDetail.getId()); - //清除负责人信息 - List leaderUserList = enterpriseUserDAO.getUserListByDeptLeader(departmentDetail.getId()); - for (EnterpriseUserDO enterpriseUser : leaderUserList) { - List existDeptIds = JSONObject.parseArray(enterpriseUser.getLeaderDeptIds()).stream().map(String::valueOf).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(existDeptIds)){ - existDeptIds.remove(departmentDetail.getId()); - } - if(CollectionUtils.isEmpty(existDeptIds)){ - enterpriseUser.setIsLeader(Boolean.FALSE); - } - enterpriseUser.setLeaderDeptIds(JSONObject.toJSONString(existDeptIds)); - } - enterpriseUserDAO.batchInsertOrUpdate(leaderUserList); - }else{ - syncAll(); - } - break; - default: - return; - } - } - - /** - * 处理用户负责部门信息 - * @param leaderDeptMap - */ - public void dealUserLeaderDept(String deptId, Multimap leaderDeptMap){ - if(leaderDeptMap.isEmpty()){ - //删除用户存在的部门主管 - List userList = enterpriseUserDAO.getUserListByDeptLeader(deptId); - for (EnterpriseUserDO enterpriseUser : userList) { - String leaderDeptIds = enterpriseUser.getLeaderDeptIds(); - List existDeptIds = JSONObject.parseArray(leaderDeptIds).stream().map(String::valueOf).collect(Collectors.toList()); - //取并集 - existDeptIds.remove(deptId); - List allDeptIds = existDeptIds.stream().distinct().collect(Collectors.toList()); - if(CollectionUtils.isEmpty(allDeptIds)){ - enterpriseUser.setIsLeader(Boolean.FALSE); - } - enterpriseUser.setLeaderDeptIds(JSONObject.toJSONString(allDeptIds)); - } - enterpriseUserDAO.batchInsertOrUpdate(userList); - return; - } - List userIds = leaderDeptMap.keys().stream().collect(Collectors.toList()); - List userList = enterpriseUserDAO.getUserInfoByUserIds(userIds); - for (EnterpriseUserDO enterpriseUser : userList) { - List deptIds = leaderDeptMap.get(enterpriseUser.getUserId()).stream().collect(Collectors.toList()); - String leaderDeptIds = enterpriseUser.getLeaderDeptIds(); - if(StringUtils.isNotBlank(leaderDeptIds)){ - List existDeptIds = JSONObject.parseArray(leaderDeptIds).stream().map(String::valueOf).collect(Collectors.toList()); - //取并集 - existDeptIds.addAll(deptIds); - List allDeptIds = existDeptIds.stream().distinct().collect(Collectors.toList()); - enterpriseUser.setLeaderDeptIds(JSONObject.toJSONString(allDeptIds)); - }else{ - enterpriseUser.setLeaderDeptIds(JSONObject.toJSONString(deptIds)); - } - enterpriseUser.setIsLeader(Boolean.TRUE); - } - enterpriseUserDAO.batchInsertOrUpdate(userList); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java deleted file mode 100644 index d5b487fab..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.*; -import com.cool.store.dto.buser.UserPositionAndUserScopeDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.UserPositionEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.service.EnterpriseUserService; -import com.cool.store.service.ZoneService; -import com.cool.store.vo.EnterpriseUserSingleInfoVO; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseUserServiceImpl - * @Description: - * @date 2023-05-29 19:58 - */ -@Slf4j -@Service -public class EnterpriseUserServiceImpl implements EnterpriseUserService { - - - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - @Resource - private ZoneService zoneService; - @Resource - private RegionDAO regionDAO; - @Resource - private UserRegionMappingDAO userRegionMappingDAO; - @Resource - private HyIntendDevZoneInfoDAO hyIntendDevZoneInfoDAO; - - - - @Override - public EnterpriseUserDO getUserInfoByUserId(String userId) { - return enterpriseUserDAO.getUserInfoById(userId); - } - - @Override - public List getInvestmentManagerList(String type,String userId, String keyword) { - //查询当前人员信息 - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); - - //当前登录人所在组织机构 - List regionIds = userRegionMappingDAO.getRegionIdsByUserId(userId); - - //所有绑定了战区的组织机构 - List list = zoneService.queryAllBingZoneRegionList("intent"); - HashSet regionList = new HashSet<>(); - regionIds.forEach(x->{ - if (list.contains(x)){ - regionList.add(x); - } - }); - //分配 - //如果是招商经理 只能分配给自己 - //如果是负责人 分配给负责人所在战区人员 - List enterpriseUserDOS = new ArrayList<>(); - if (CommonConstants.ALLOCATION.equals(type)){ - if (userInfo.getIsLeader()){ - enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class)); - } - if (CollectionUtils.isNotEmpty(regionList)){ - //只有招商经理本人 - enterpriseUserDOS.add(userInfo); - } - } - //转交 所有的招商经理 - if (CommonConstants.TRANSFER.equals(type)){ - enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(list), keyword, null); - } - if (CollectionUtils.isEmpty(enterpriseUserDOS)){ - enterpriseUserDOS.add(userInfo); - } - return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS); - } - - @Override - public UserPositionAndUserScopeDTO getUserIdsByScope(String userId) { - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); - if(Objects.isNull(userInfo)){ - throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST); - } - UserPositionAndUserScopeDTO result = new UserPositionAndUserScopeDTO(); - if(!userInfo.getIsLeader()){ - result.setDevelopmentUserIds(Arrays.asList(userId)); - result.setInvestmentUserIds(Arrays.asList(userId)); - return result; - } - List leadDeptIds = JSONObject.parseArray(userInfo.getLeaderDeptIds()).stream().map(String::valueOf).collect(Collectors.toList()); - //获取这些区域的子节点 - List subRegionIds = regionDAO.getSubRegionIds(leadDeptIds); - //这些部门是否关联了意向区域 - List zoneInfoList = hyIntendDevZoneInfoDAO.getZoneInfoByRegionIds(subRegionIds); - if(CollectionUtils.isEmpty(zoneInfoList)){ - result.setDevelopmentUserIds(Arrays.asList(userId)); - result.setInvestmentUserIds(Arrays.asList(userId)); - return result; - } - //意向区域 - List intendList = zoneInfoList.stream().filter(o -> "intent".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); - result.setInvestmentUserIds(Lists.newArrayList()); - result.setDevelopmentUserIds(Lists.newArrayList()); - if(CollectionUtils.isNotEmpty(intendList)){ - //获取负责的区域 - intendList.retainAll(subRegionIds); - List userList = userRegionMappingDAO.getUserListByRegionIds(intendList); - userList.add(userId); - result.setInvestmentUserIds(userList); - } - //开发区域 - List developmentList = zoneInfoList.stream().filter(o -> "dev".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(developmentList)){ - //获取负责的区域 - developmentList.retainAll(subRegionIds); - List userList = userRegionMappingDAO.getUserListByRegionIds(developmentList); - userList.add(userId); - result.setDevelopmentUserIds(userList); - } - return result; - } - - @Override - public List getDevelopmentDirectorList(String wantShopArea) { - List devList = hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList("dev"); - List regionIds = ListUtils.emptyIfNull(devList).stream().flatMap(o -> JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); - List userList = enterpriseUserDAO.getUserListByDeptLeaders(regionIds); - return EnterpriseUserSingleInfoVO.convertVO(userList); - } - - @Override - public EnterpriseUserDO getDevelopmentByZoneId(Long zoneId) { - HyIntendDevZoneInfoDO zoneInfo = hyIntendDevZoneInfoDAO.selectById(zoneId); - if(Objects.isNull(zoneInfo)){ - throw new ServiceException(ErrorCodeEnum.ZONE_NOT_EXIST); - } - List regionIds = JSONObject.parseArray(zoneInfo.getAssociatedRegionId(), String.class); - List userList = enterpriseUserDAO.getUserListByDeptLeaders(regionIds); - if(CollectionUtils.isEmpty(userList)){ - return null; - } - return userList.stream().findAny().get(); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java deleted file mode 100644 index 454ef06c3..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.cool.store.dto.calendar.UserFreeBusyInfoDTO; -import com.cool.store.entity.HyPartnerInterviewPlanDO; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.service.FeiShuService; -import com.cool.store.service.InterviewService; -import com.cool.store.vo.interview.CalendarInfo; -import com.cool.store.vo.interview.FreeBusyInfo; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:13 - * @Description: - */ -@Service -public class FeiShuServiceImpl implements FeiShuService { - - @Autowired - private ISVHttpRequest isvHttpRequest; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private InterviewService interviewService; - - /** - * - * @param request - * @return - * @throws ApiException - * @deprecated {@link com.cool.store.service.impl.InterviewServiceImpl#getFreeBusyList} - */ - @Deprecated - @Override - public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) throws ApiException { - GetFreeBusyListVO freeBusyListVO = new GetFreeBusyListVO(); - String startDate = request.getStartDate();//开始日期 - String endDate = request.getEndDate();//结束日期 - String partnerId = request.getPartnerId();//加盟商用户ID - String interviewerId = request.getInterviewerId();//面试官ID - String lineId = request.getLineId();//线索id - //如果加盟商用户ID为空且面试官ID为空，返回错误信息 - if (!(StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) && StringUtils.isEmpty(interviewerId)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_AND_PARTNER_ID_IS_NULL); - } - //如果加盟商用户ID不为空且面试官ID为空 - if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { - interviewerId = interviewService.getInterviewerByPartner(partnerId, lineId); - } - long startTime = 0L; - long endTime = 0L; - DateTime startDateTime = null; - DateTime endDateTime = null; - - if (!StringUtils.isEmpty(startDate)&&!StringUtils.isEmpty(endDate)) { - startDateTime = DateUtil.beginOfDay(DateUtil.parse(startDate)); - endDateTime = DateUtil.endOfDay(DateUtil.parse(endDate)); - } - if (startDateTime.isAfter(endDateTime)) { - throw new ServiceException(ErrorCodeEnum.DATE_PARAMS_IS_ERROR); - } - - startTime = startDateTime.getTime(); - endTime = endDateTime.getTime(); - - List UserFreeBusyInfoList = isvHttpRequest.getFreeBusyList(interviewerId, startTime, endTime); - - //把startTime和endTime转换成yyyy-MM-dd格式 - String startTimeStr = DateUtil.format(startDateTime, "yyyy-MM-dd"); - String endTimeStr = DateUtil.format(endDateTime, "yyyy-MM-dd"); - List daySlots = TimeSlotGenerator.generateDaySlots(startTimeStr, endTimeStr); - freeBusyListVO.setCalendarList(daySlots); - - //如果查询结果为空，则直接返回全部时间段都是空闲的 - if (!CollectionUtils.isEmpty(UserFreeBusyInfoList)) { - for (CalendarInfo daySlot : daySlots) { - List freeBusyList = daySlot.getFreeBusyList(); - for (FreeBusyInfo freeBusyInfo : freeBusyList) { - //把日期和时间拼接成yyyy-MM-dd HH:mm格式 - String startStr = daySlot.getDateStr() + " " + freeBusyInfo.getStartTime(); - String endStr = daySlot.getDateStr() + " " + freeBusyInfo.getEndTime(); - //把yyyy-MM-dd HH:mm格式转换成long类型 - long startTimeLong = DateUtil.parse(startStr).getTime(); - long endTimeLong = DateUtil.parse(endStr).getTime(); - - for (UserFreeBusyInfoDTO userFreeBusyInfoDTO : UserFreeBusyInfoList) { - //比较两个时间段是否有重叠 - if(!(endTimeLong <= userFreeBusyInfoDTO.getStartTime() || startTimeLong >= userFreeBusyInfoDTO.getEndTime())){ - freeBusyInfo.setFree(false); - break; - } - } - - } - } - } - - - return freeBusyListVO; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java deleted file mode 100644 index c77237a10..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ /dev/null @@ -1,425 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyInterviewDAO; -import com.cool.store.dao.HyPartnerBaseInfoDAO; -import com.cool.store.dao.HyPartnerExhibitionDAO; -import com.cool.store.dto.log.CreateQualifyVerifyDTO; -import com.cool.store.dto.log.LogBasicDTO; -import com.cool.store.dto.response.DictResultDTO; -import com.cool.store.dto.response.MDMResultDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.http.MDMHttpRequest; -import com.cool.store.mapper.*; -import com.cool.store.oss.OSSServer; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.CreateQualifyVerifyReq; -import com.cool.store.request.QualificationCallbackReq; -import com.cool.store.request.RpcCreateQualifyVerifyReq; -import com.cool.store.request.data.flow.SkrRelshipProve; -import com.cool.store.service.FlowService; -import com.cool.store.service.HyPartnerLineInfoService; -import com.cool.store.service.LogService; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.PassLetterUtils; -import com.cool.store.utils.RedisUtilPool; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.io.ByteArrayResource; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author: young.yu - * @Date: 2023-06-14 14:22 - * @Description: - */ -@Slf4j -@Service -public class FlowServiceImpl implements FlowService { - - - @Autowired - private RedisUtilPool redisUtilPool; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private EnterpriseUserDAO enterpriseUserDAO; - - @Autowired - private DingdingUserMapper dingdingUserMapper; - - @Autowired - private HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - private HyPartnerCertificationInfoMapper hyPartnerCertificationInfoMapper; - - @Autowired - private OSSServer ossServer; - - @Autowired - private HyInterviewDAO interviewDAO; - - @Autowired - private LogService logService; - - @Autowired - private HyPartnerLineInfoService hyPartnerLineInfoService; -// @Autowired -// private SmsService smsService; - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - - @Autowired - private HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - - @Autowired - private HyInspectionMapper inspectionMapper; - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Value("${hs.mdm.appkey:null}") - private String mdmAppKey; - - @Autowired - private MDMHttpRequest mdmHttpRequest; - - @Autowired - private HyPartnerExhibitionDAO hyPartnerExhibitionDAO; - - @Override - @Transactional(rollbackFor = Exception.class) - public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException { - //根据面试id获取面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.selectByPrimaryKeySelective(request.getInterviewId()); - if (Objects.isNull(hyPartnerInterviewDO)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - //根据面试状态限制 - if (!hyPartnerInterviewDO.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()))) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); - } - //1.发起加盟商资质审核 - RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); - RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data(); - dataBody.setFraSource(request.getFraSource()); - //copy properties - BeanUtil.copyProperties(request, dataBody); - dataBody.setIsNewFranchisee(request.getWhetherNewFranchisee()); - //日期格式问题 - if (request.getWantSignTime().endsWith("00:00:00")) { - dataBody.setIntendedSignDate(request.getWantSignTime()); - } - dataBody.setIntendedSignDate(request.getWantSignTime() + " 00:00:00"); - dataBody.setAmtDeposit(request.getSecurityFund()); - dataBody.setIntendedSigner(request.getIntentionSignerUsername()); - dataBody.setIntendedSignerTel(request.getIntentionSignerMobile()); - dataBody.setSignerEdu(request.getIntentionEdu()); - dataBody.setSkrName(request.getRealControlUsername()); - dataBody.setSkrIDCard(request.getRealControlIdcard()); - dataBody.setSkrRelship(request.getSignerRealControlRelation()); - dataBody.setSkrRelshipOther(request.getSignerOtherRealControlRelation()); - dataBody.setAmtJoin(request.getPartnerFee()); - dataBody.setAmtTechSer(request.getTechnicalServiceFee()); - dataBody.setAmtIntended(request.getIntentionMoney()); - dataBody.setSystemsource(mdmAppKey); - rpcRequest.setData(dataBody); - - //获取授权码 - String authCode = null; - if (!StringUtils.isBlank(request.getLineId())) { - //根据线索id获取线索信息 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(request.getLineId())); - if (!Objects.isNull(hyPartnerLineInfoDO)) { - String investmentManagerId = hyPartnerLineInfoDO.getInvestmentManager(); - String developmentDirectorId = request.getDevtDirectorId(); - EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(investmentManagerId); - EnterpriseUserDO developmentDirector = enterpriseUserDAO.getUserInfoById(developmentDirectorId); - //招商经理信息（客户经理） - if (!Objects.isNull(investmentManager)) { - String jobNumber = investmentManager.getJobnumber(); - String mobile = investmentManager.getMobile(); - DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { - throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); - } - rpcRequest.setDingUserId(dingdingUserDO.getUserid()); - authCode = generateAuthCode(jobNumber); - rpcRequest.getData().setAuthCode(authCode); - rpcRequest.getData().setUserCustDingUserId(dingdingUserDO.getUserid()); - } - //开发主管信息 - if (!Objects.isNull(developmentDirector)) { - String mobile = developmentDirector.getMobile(); - DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { - throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); - } - rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid()); - } - } else { - throw new ApiException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - } else { - throw new ApiException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - //通过 rpc 请求审核系统获取返回数据 - //上传证明文件数据 - Map headers = new HashMap<>(); - headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); - if (StringUtils.isNotEmpty(request.getSignerRealControlRelationCert())) { - List certFileList = Arrays.asList(request.getSignerRealControlRelationCert().split(",")); - List relshipProves = OSSFileToMDMFile(headers, certFileList); - rpcRequest.getData().setSkrRelshipProve(relshipProves); - } - //调用接口发起审批 - String qualifyVerify = mdmHttpRequest.createQualifyVerify(headers, rpcRequest); - Map qualifyVerifyRespData = JSON.parseObject(qualifyVerify, new TypeReference>() {}); - - //2.更新审核信息 - HyPartnerCertificationInfoDO partnerCertificationInfoDO = new HyPartnerCertificationInfoDO(); - partnerCertificationInfoDO.setPartnerId(request.getPartnerId()); - partnerCertificationInfoDO.setPartnerLineId(Long.valueOf(request.getLineId())); - partnerCertificationInfoDO.setPartnerInterviewId(Long.valueOf(request.getInterviewId())); - partnerCertificationInfoDO.setCertificationInfoRecordJson(JSONObject.toJSONString(request)); - partnerCertificationInfoDO.setCreateTime(new Date()); - partnerCertificationInfoDO.setUpdateTime(new Date()); - //set 资质审核流程id - partnerCertificationInfoDO.setQualifyVerifyId(qualifyVerifyRespData.get("id")); - //set 意向合同编号 - partnerCertificationInfoDO.setIntentionContractNo(qualifyVerifyRespData.get("sequenceNo")); - hyPartnerCertificationInfoMapper.insertSelective(partnerCertificationInfoDO); - - //3.更新面试信息 - //更新面试状态 - interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_5); - hyPartnerInterviewDO.setUpdateTime(new Date()); - //注意将 hyPartnerInterviewDO 的 status 设置为 null，否则又会修改回 4 - hyPartnerInterviewDO.setStatus(null); - //获取当前操作人并添加面试总结/记录信息 - LoginUserInfo operator = CurrentUserHolder.getUser(); - hyPartnerInterviewDO.setRecorder(operator.getUserId()); - hyPartnerInterviewDO.setRecordTime(new Date()); - hyPartnerInterviewDO.setSummary(request.getSummary()); - hyPartnerInterviewDO.setApproveTime(new Date()); - hyPartnerInterviewDO.setAuthCode(authCode); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - - //4. 更新线索信息（开发主管） - if (!StringUtils.isEmpty(request.getDevtDirectorId())) { - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(Long.parseLong(request.getLineId())); - hyPartnerLineInfoDO.setDevelopmentDirector(request.getDevtDirectorId()); - hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - } - - //5. 生成通过函并修改数据库相关信息 - String verifyCity = hyPartnerInterviewMapper.getVerifyCityByInterviewId(request.getInterviewId()); - String[] split = verifyCity.split("/"); - //根据长度来取市级行政区域 - if (split.length == 2) { - verifyCity = split[1]; - } else if (split.length == 3) { - verifyCity = split[1]; - } else if (split.length == 4) { - verifyCity = split[2]; - } else { - throw new ServiceException(ErrorCodeEnum.INTENT_INFO_NOT_EXIST); - } - // TODO pass_reason 暂无 - //将通过时间修改为本系统处理回调的时间，不以 request 的 modifiedTime 为准（有误） - String partnerName = request.getIntentionSignerUsername(); - //TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失 - genPassLetterAndUpdateDB(partnerName, verifyCity, new Date(), request.getInterviewId()); - //发送加盟商资质面试通过短信 - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(Long.valueOf(request.getLineId())); - eventCenterHttpRequest.sendSmsVariable(hyPartnerBaseInfoDO.getMobile(), SMSMsgEnum.INTERVIEW_PASS,wechatMiniAppService.getMiniAppUrl()); - //记录日志 - CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .summary(request.getSummary()).qualiVerifyContent(JSON.toJSONString(partnerCertificationInfoDO)).build(); - //是否由会销发起 - if (request.getWhetherExhibition() == null || Boolean.FALSE.equals(request.getWhetherExhibition())) { - logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.CREATE_QUALIFYVERIFY, log); - } else { - //更新线索报名会销状态 - hyPartnerExhibitionDAO.updateStatusAfterSubmitQualification(request.getInterviewPlanId()); - logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.EXHIBITION_CREATE_QUALIFYVERIFY, log); - } - } - - @Override - @Transactional - public void qualificationCallback(QualificationCallbackReq request) throws ApiException { - log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request)); - //1. 信息是否完整 - if (null == request.getInstanceStatus() || "".equals(request.getInstanceStatus())) { - log.error("MDM回调入参缺失，request{}", JSON.toJSONString(request)); - throw new ServiceException("MDM回调错误！"); - } - //根据审核流程 id 获取面试会议相关 id -// String interviewId = hyPartnerCertificationInfoMapper.getInterviewIdByQualifyVerifyId(request.getInstanceId()); -// String interviewPlanId = hyPartnerCertificationInfoMapper.getInterviewPlanIdByQualifyVerifyId(request.getInstanceId()); - HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.getInterviewInfoByQualifyVerifyId(request.getInstanceId()); - if (hyPartnerInterviewDO == null || hyPartnerInterviewDO.getInterviewPlanId() == null) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - String interviewPlanId = hyPartnerInterviewDO.getInterviewPlanId().toString(); - Long partnerLineId = hyPartnerInterviewDO.getPartnerLineId(); - //审核通过 - if ("FINISHED".equals(request.getInstanceStatus())) { - //更新面试状态 - interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_6); - // TODO pass_reason 暂无 - //将通过时间修改为本系统处理回调的时间，不以 request 的 modifiedTime 为准（有误） - Date passDate = new Date(); - //4. 向面试稽核表中新增一条信息 - HyInspectionDO hyInspectionDO = new HyInspectionDO(); - hyInspectionDO.setInterviewPlanId(Long.parseLong(interviewPlanId)); - hyInspectionDO.setCreateTime(DateUtil.formatDateTime(passDate)); - hyInspectionDO.setType(InspectionTyeEnum.INTERVIEW_INSPECTION.getCode()); - inspectionMapper.insertSelective(hyInspectionDO); - //记录日志 - //这里记录的日志时间为 passTime，而不是当前时间，否则 getTipsInfo 接口返回的时间是这里记录的当前时间，与 passTime 不符 - LogBasicDTO log = LogBasicDTO.builder().operateTime(DateUtil.format(passDate, CoolDateUtils.DATE_FORMAT_SEC)) - .build(); - logService.recordBizLog(null,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_PASS,log); - //审核未通过 - } else if ("CANCELED".equals(request.getInstanceStatus())) { - CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setRejectRealReason("资质审核流程拒绝"); - closeFollowRequest.setLineId(partnerLineId); - closeFollowRequest.setType("reject"); - hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); - interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); - LogBasicDTO log = LogBasicDTO.builder().operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .build(); - logService.recordBizLog(null,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.QUALIFYVERIFY_REJECT,log); - } - } - - @SneakyThrows - @Override - public List getDictList() { - String s = JSONObject.toJSONString(mdmHttpRequest.getDictList().getBody().getData()); - DictResultDTO dictResultDTO = JSON.parseObject(s, new TypeReference() { - }); - List collect = dictResultDTO.getConfigList().stream().map(item -> { - HyPartnerFraSourceDO hyPartnerFraSourceDO = new HyPartnerFraSourceDO(); - BeanUtil.copyProperties(item, hyPartnerFraSourceDO); - hyPartnerFraSourceDO.setSourceId(item.getId()); - return hyPartnerFraSourceDO; - }).collect(Collectors.toList()); - return collect; - } - - private List OSSFileToMDMFile(Map headers, List fileUrlList) throws ApiException, IOException { - ByteArrayOutputStream outputStream = null; - List relshipProves = new ArrayList<>(); - ResponseEntity responseEntity = null; - - //逐个处理文件 - for (String fileUrl : fileUrlList) { - //1. 获取 OSS 下载的文件流 - String fileName = fileUrl.substring(fileUrl.lastIndexOf('/') + 1); - outputStream = ossServer.downloadFileServer(fileName); - //2. 将下载到的文件上传到 MDM 系统中 - try { - //将文件流编辑为 formdata 格式的数据 - ByteArrayResource resource = new ByteArrayResource(outputStream.toByteArray()) { - @Override - public String getFilename() throws IllegalStateException { - return fileName; - } - }; - //上传文件 - responseEntity = mdmHttpRequest.uploadFile(headers, resource); - Map data = (Map) responseEntity.getBody().getData(); - SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); - relshipProves.add(skrRelshipProve); - } catch (Exception e) { - log.info("上传文件到MDM出错, e{}", e); - throw new ApiException(e.getMessage()); - } finally { - if (outputStream != null) { - outputStream.close(); - } - } - } - return relshipProves; - } - - - /** - * 生成授权码 - * - * @param jobNumber - * @return - */ - public String generateAuthCode(String jobNumber) { - String prefix = jobNumber + DateUtil.format(new Date(), "yyyyMMdd"); - return prefix + redisUtilPool.incrby(prefix, 1, 60 * 60 * 25); - } - - /** - * 生成通知函上传 OSS 和修改数据库相应数据 - * @return passCode - */ - private void genPassLetterAndUpdateDB(String partnerName, String verifyCity, Date passTime, String interviewId) { - try { - String passCode = PassLetterUtils.genPassCode(passTime); - //生成的 pdf 通过函内存输出流 - ByteArrayOutputStream pdfOut = PassLetterUtils.genPassLetter(partnerName, passCode, verifyCity, passTime); - //生成的 pdf 通过函内存输入流 - ByteArrayInputStream inputStream = new ByteArrayInputStream(pdfOut.toByteArray()); - String passPdfUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".pdf"); - //不再转换为图片 - //inputStream.reset(); - //ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f); - //inputStream = new ByteArrayInputStream(imageOut.toByteArray()); - //上传 OSS - //String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); - //计算有效期截止日期 - Date expiryDate = DateUtil.offsetDay(passTime, 60); - expiryDate = DateUtil.endOfDay(expiryDate); - HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO(); - interviewDO.setId(Long.parseLong(interviewId)); - interviewDO.setPassCode(passCode); - interviewDO.setPassTime(passTime); - interviewDO.setExpiryDate(DateUtil.formatDateTime(expiryDate)); - interviewDO.setPassPdfUrl(passPdfUrl); - //interviewDO.setPassImageUrl(passImageUrl); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(interviewDO); - inputStream.close(); - pdfOut.close(); - //imageOut.close(); - } catch (Exception e) { - log.error("资格面试通过函生成失败 e{}", e.getMessage()); - throw new ServiceException("通过函生成失败！"); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java deleted file mode 100644 index 45a922dff..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ /dev/null @@ -1,300 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.MessageConstants; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyFollowTaskDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerTaskInfoLogDAO; -import com.cool.store.dto.follow.FollowTaskNumDTO; -import com.cool.store.dto.log.LogFieldDTO; -import com.cool.store.dto.partner.PartnerSimpleInfoDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerEcTrackLogMapper; -import com.cool.store.request.follow.AddFollowLogRequest; -import com.cool.store.request.follow.AddFollowTaskRequest; -import com.cool.store.request.follow.FollowTaskIdRequest; -import com.cool.store.request.follow.UpdateFollowTaskRequest; -import com.cool.store.service.CallService; -import com.cool.store.service.FollowTaskService; -import com.cool.store.service.LogService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.follow.FollowTaskLogVO; -import com.cool.store.vo.follow.FollowTaskPageVO; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskServiceImpl - * @Description: - * @date 2023-08-10 11:10 - */ -@Slf4j -@Service -public class FollowTaskServiceImpl implements FollowTaskService { - - @Resource - private HyFollowTaskDAO hyFollowTaskDAO; - @Resource - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - private LogService logService; - @Resource - private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private CallService callService; - @Resource - private RedisUtilPool redisUtilPool; - @Resource - private NoticeService noticeService; - @Resource - private EventCenterHttpRequest eventCenterHttpRequest; - - @Resource - private HyPartnerEcTrackLogMapper hyPartnerEcTrackLogMapper; - - @Value("${feishu.notice.link.url}") - private String linkUrl; - - @Override - public PageInfo getFollowTaskPage(Integer pageNum, Integer pageSize, Integer taskStatus, String queryDate, String followUserId) { - String deadlineStartTime = null, deadlineEndTIme = null; - if(StringUtils.isNotBlank(queryDate) && FollowTaskStatusEnum.TODO.getCode().equals(taskStatus)){ - //只有待完成的时候需要根据截止时间查询 - deadlineStartTime = queryDate + CommonConstants.DAY_START_TIME_SUFFIX; - deadlineEndTIme = queryDate + CommonConstants.DAY_END_TIME_SUFFIX; - } - Page taskPage = hyFollowTaskDAO.getTaskPage(followUserId, taskStatus, deadlineStartTime, deadlineEndTIme, pageNum, pageSize); - PageInfo resultPage = new PageInfo(taskPage); - if(CollectionUtils.isNotEmpty(taskPage)){ - List partnerLineIds = taskPage.stream().map(HyFollowTaskDO::getPartnerLineId).distinct().collect(Collectors.toList()); - Map partnerSimpleInfoMap = hyPartnerLineInfoDAO.getPartnerSimpleInfoByLineIds(partnerLineIds); - List resultList = FollowTaskPageVO.convertVO(taskPage, partnerSimpleInfoMap); - resultPage.setList(resultList); - } - return resultPage; - } - - @Override - public PageInfo getFollowLogPage(Integer pageNum, Integer pageSize, Long partnerLineId) { - Page logPage = hyPartnerTaskInfoLogDAO.getFollowTaskLogPage(pageNum, pageSize, partnerLineId); - List resultList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(logPage)){ - List taskIds = logPage.stream().filter(o->OperateTypeEnum.ADD_FOLLOW_TASK.getCode().equals(o.getOperateType())).map(o->{ - List logField = JSONObject.parseArray(o.getFieldCopy(), LogFieldDTO.class); - String value = logField.stream().filter(f -> f.getCode().equals(OperateLogFieldValueEnum.FOLLOW_TASK_ID.getCode())).findFirst().get().getValue(); - return Long.valueOf(value); - }).collect(Collectors.toList()); - List followTaskList = hyFollowTaskDAO.getFollowTaskList(taskIds); - List callTransNos = logPage.stream().filter(o->OperateTypeEnum.CALL_UP.getCode().equals(o.getOperateType())).map(o->{ - List logField = JSONObject.parseArray(o.getFieldCopy(), LogFieldDTO.class); - return logField.stream().filter(f -> f.getCode().equals(OperateLogFieldValueEnum.CALL_TRANS_NO.getCode())).findFirst().get().getValue(); - }).collect(Collectors.toList()); - List callRecordList = callService.getCallRecordByTransNos(callTransNos); - resultList = FollowTaskLogVO.convertVO(logPage, followTaskList, callRecordList); - } - PageInfo resultPage = new PageInfo(logPage); - resultPage.setList(resultList); - return resultPage; - } - - @Override - public Integer addFollowLog(AddFollowLogRequest request, LoginUserInfo userInfo) { - HyPartnerLineInfoDO lineInfo = checkLine(request.getPartnerLineId()); - JSONObject jsonObject = new JSONObject(); - jsonObject.put(OperateLogFieldValueEnum.FOLLOW_LOG.getCode(), request.getFollowLog()); - logService.recordBizLog(userInfo, request.getPartnerLineId(), OperateTypeEnum.ADD_FOLLOW_LOG, jsonObject); - return null; - } - - @Override - public Long addFollowTask(AddFollowTaskRequest request, LoginUserInfo userInfo) throws ApiException { - if(request.getDeadline().getTime() < System.currentTimeMillis()){ - throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW); - } - HyPartnerLineInfoDO lineInfo = checkLine(request.getPartnerLineId()); - HyFollowTaskDO task = AddFollowTaskRequest.convertDO(request); - task.setFollowUserId(lineInfo.getInvestmentManager()); - Long followTaskId = hyFollowTaskDAO.addFollowTask(task); - JSONObject jsonObject = new JSONObject(); - jsonObject.put(OperateLogFieldValueEnum.FOLLOW_TASK_ID.getCode(), followTaskId); - logService.recordBizLog(userInfo, request.getPartnerLineId(), OperateTypeEnum.ADD_FOLLOW_TASK, jsonObject); - if((request.getDeadline().getTime() - System.currentTimeMillis()) /CommonConstants.ONE_THOUSAND < CommonConstants.AN_HOUR_SECONDS){ - //一小时内的任务立即发送通知 - sendMessage(task); - } - return followTaskId; - } - - @Override - public Integer updateFollowTask(UpdateFollowTaskRequest request, String userId) throws ApiException { - HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); - if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.CANCELLED.getCode().equals(followTask.getTaskStatus())|| FollowTaskStatusEnum.OVERDUE_CANCELLED.getCode().equals(followTask.getTaskStatus())){ - throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); - } - if(Objects.nonNull(request.getDeadline()) && request.getDeadline().getTime() < System.currentTimeMillis()){ - throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW); - } - checkLine(followTask.getPartnerLineId()); - HyFollowTaskDO task = UpdateFollowTaskRequest.convertDO(followTask.getPartnerLineId(),followTask.getFollowUserId(), request); - if(!request.getDeadline().equals(followTask.getDeadline()) && (request.getDeadline().getTime() - System.currentTimeMillis()) / CommonConstants.ONE_THOUSAND < CommonConstants.AN_HOUR_SECONDS){ - //一小时内的任务立即发送通知 - sendMessage(task); - } - return hyFollowTaskDAO.updateFollowTask(task); - } - - @Override - public Integer finishFollowTask(FollowTaskIdRequest request, String userId) { - HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); - if(!FollowTaskStatusEnum.TODO.getCode().equals(followTask.getTaskStatus()) && !FollowTaskStatusEnum.OVERDUE.getCode().equals(followTask.getTaskStatus())){ - throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); - } - checkLine(followTask.getPartnerLineId()); - FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.FINISHED; - if(followTask.getDeadline().getTime() < System.currentTimeMillis()){ - followTaskStatus = FollowTaskStatusEnum.OVERDUE_FINISH; - } - return hyFollowTaskDAO.finishFollowTask(request.getFollowTaskId(), followTaskStatus); - } - - @Override - public Integer cancelFollowTask(FollowTaskIdRequest request, String userId) { - HyFollowTaskDO followTask = hyFollowTaskDAO.getFollowTask(request.getFollowTaskId()); - if(FollowTaskStatusEnum.FINISHED.getCode().equals(followTask.getTaskStatus()) || FollowTaskStatusEnum.OVERDUE_FINISH.getCode().equals(followTask.getTaskStatus())){ - throw new ServiceException(ErrorCodeEnum.TASK_STATUS_NOT_ALLOW_OPERATE); - } - checkLine(followTask.getPartnerLineId()); - FollowTaskStatusEnum followTaskStatus = FollowTaskStatusEnum.CANCELLED; - if(followTask.getDeadline().getTime() < System.currentTimeMillis()){ - followTaskStatus = FollowTaskStatusEnum.OVERDUE_CANCELLED; - } - return hyFollowTaskDAO.cancelFollowTask(request.getFollowTaskId(), followTaskStatus); - } - - @Override - public void followTaskAnHourAgoRemind() throws ApiException { - //更新过期的任务状态 - hyFollowTaskDAO.updateUndoTaskStatusToOverdue(); - //获取一个小时后的任务 - Boolean hasNext = true; - int pageNum = CommonConstants.ONE, pageSize = CommonConstants.HUNDRED; - String startTime = DateUtil.format(DateUtils.addMinutes(new Date(), CommonConstants.FIFTY_FIVE), CoolDateUtils.DATE_FORMAT_SEC); - String endTime = DateUtil.format(DateUtils.addMinutes(new Date(), CommonConstants.SIXTY_FIVE), CoolDateUtils.DATE_FORMAT_SEC); - while (hasNext){ - Page undoTaskList = hyFollowTaskDAO.getUndoTaskPage(startTime, endTime, pageNum, pageSize); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(undoTaskList.stream().map(HyFollowTaskDO::getFollowUserId).distinct().collect(Collectors.toList())); - if(CollectionUtils.isEmpty(undoTaskList)){ - break; - } - if(undoTaskList.size() < pageSize){ - hasNext = false; - } - pageNum++; - List lineIds = undoTaskList.stream().map(HyFollowTaskDO::getPartnerLineId).distinct().collect(Collectors.toList()); - Map partnerSimpleInfoMap = hyPartnerLineInfoDAO.getPartnerSimpleInfoByLineIds(lineIds); - for (HyFollowTaskDO followTask : undoTaskList) { - PartnerSimpleInfoDTO partnerInfo = partnerSimpleInfoMap.get(followTask.getPartnerLineId()); - if(Objects.isNull(partnerInfo)){ - continue; - } - String lockKey = MessageFormat.format(CommonConstants.FOLLOW_TASK_NOTICE_KEY, followTask.getFollowUserId(), followTask.getId()); - boolean result = redisUtilPool.setNxExpire(lockKey, DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC), CommonConstants.FOLLOW_TASK_NOTICE_LOCK_TIMES); - if(!result){ - //一小时内发送过不再发送通知 - continue; - } - String dateline = DateUtil.format(followTask.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_7); - String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(feishuUserIdsByUserIds.get(followTask.getFollowUserId())), content); - } - } - } - - @Override - public void followTaskDailyRemind() throws ApiException { - //获取已逾期的 以及截止时间为当天的任务 的招商经理 - Boolean hasNext = true; - int pageNum = CommonConstants.ONE, pageSize = CommonConstants.HUNDRED; - Date today = new Date(); - while (hasNext){ - Page remindFollowUserIds = hyFollowTaskDAO.getRemindFollowUserIds(today, pageNum, pageSize); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(remindFollowUserIds); - if(CollectionUtils.isEmpty(remindFollowUserIds)){ - break; - } - if(remindFollowUserIds.size() < pageSize){ - hasNext = false; - } - pageNum++; - List followTaskList = hyFollowTaskDAO.getUserTaskNum(remindFollowUserIds, today); - for (FollowTaskNumDTO followTask : followTaskList) { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(feishuUserIdsByUserIds.get(followTask.getFollowUserId())), FollowTaskNumDTO.getMessageContent(followTask)); - } - } - } - - @Override - public PageInfo getEcFollowLogPage(Integer pageNum, Integer pageSize, String partnerId) { - if(Objects.isNull(partnerId)){ - return new PageInfo<>(); - } - PageHelper.startPage(pageNum, pageSize); - Page logPage = hyPartnerEcTrackLogMapper.getEcLogPageByPartnerId(partnerId); - for (HyPartnerEcTrackLogDO hyPartnerEcTrackLogDO : logPage) { - hyPartnerEcTrackLogDO.setDetailContent(HyPartnerEcTrackLogDO.getDetailContentJoint(hyPartnerEcTrackLogDO)); - } - return new PageInfo(logPage); - } - - /** - * 线索校验 - * @param partnerLineId - * @return - */ - private HyPartnerLineInfoDO checkLine(Long partnerLineId){ - HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(partnerLineId); - if(Objects.isNull(lineInfo) || lineInfo.getDeleted()){ - throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - if(!LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineInfo.getLineStatus())){ - //线索只有私海的时候才能操作 - throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); - } - return lineInfo; - } - - private void sendMessage(HyFollowTaskDO task) throws ApiException { - PartnerSimpleInfoDTO partnerInfo = hyPartnerLineInfoDAO.getPartnerSimpleInfoByLineId(task.getPartnerLineId()); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(Arrays.asList(task.getFollowUserId())); - if(Objects.isNull(partnerInfo)){ - return; - } - String dateline = DateUtil.format(task.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_7); - String content = MessageFormat.format(MessageConstants.FOLLOW_TASK_MESSAGE_CONTENT, dateline, partnerInfo.getUsername(), partnerInfo.getMobile()); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(feishuUserIdsByUserIds.get(task.getFollowUserId())), content); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java deleted file mode 100644 index e9c76742f..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyOutboundServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.outbound.AddNumberDTO; -import com.cool.store.dto.outbound.DeleteNumberDTO; -import com.cool.store.dto.outbound.OutboundListDTO; -import com.cool.store.dto.outbound.UpdateNumberDTO; -import com.cool.store.entity.HyOutboundMobileDO; -import com.cool.store.entity.HyPartnerLabelGroupDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyOutboundMobileMapper; -import com.cool.store.service.HyOutboundService; -import com.cool.store.vo.HyOutboundVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author Fun Li 2023/8/9 15:36 - * @version 1.0 - */ -@Service -public class HyOutboundServiceImpl implements HyOutboundService { - - @Autowired - private HyOutboundMobileMapper outboundMobileMapper; - - /** - * 获取呼出手机号列表信息 - * @return 手机号信息列表 - */ - @Override - public List getOutboundNumberList(OutboundListDTO dto) { - return outboundMobileMapper.getOutboundNumberList(dto, CurrentUserHolder.getUserId()); - } - - /** - * 新增呼出手机号 - * @param dto 新增手机号信息 - */ - @Override - public void addOutboundNumber(AddNumberDTO dto) throws ApiException { - HyOutboundMobileDO hyOutboundMobile = new HyOutboundMobileDO(); - hyOutboundMobile.setMobile(dto.getOutboundNumber()); - if (whetherRepeat(hyOutboundMobile)) { - throw new ApiException(ErrorCodeEnum.OUTBOUND_NUMBER_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - hyOutboundMobile.setEditUserId(userId); - hyOutboundMobile.setCreateUserId(userId); - hyOutboundMobile.setUpdateUserId(userId); - outboundMobileMapper.insertSelective(hyOutboundMobile); - } - - /** - * 编辑呼出手机号 - * @param dto 修改的手机号信息 - */ - @Override - public void updateOutboundNumber(UpdateNumberDTO dto) throws ApiException { - HyOutboundMobileDO hyOutboundMobile = new HyOutboundMobileDO(); - hyOutboundMobile.setId(dto.getId()); - hyOutboundMobile.setMobile(dto.getNewOutboundNumber()); - if (whetherRepeat(hyOutboundMobile)) { - throw new ApiException(ErrorCodeEnum.OUTBOUND_NUMBER_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - hyOutboundMobile.setEditUserId(userId); - hyOutboundMobile.setUpdateUserId(userId); - hyOutboundMobile.setUpdateTime(new Date()); - outboundMobileMapper.updateByPrimaryKeySelective(hyOutboundMobile); - } - - /** - * 删除呼出手机号 - * @param dto 待删除的手机号信息编号 - */ - @Override - public void deleteOutboundNumber(DeleteNumberDTO dto) { - HyOutboundMobileDO hyOutboundMobile = new HyOutboundMobileDO(); - String userId = CurrentUserHolder.getUserId(); - hyOutboundMobile.setId(dto.getId()); - hyOutboundMobile.setUpdateUserId(userId); - hyOutboundMobile.setDeleted(true); - outboundMobileMapper.updateByPrimaryKeySelective(hyOutboundMobile); - } - - /** - * 查询某个手机号是否重复 - * @param hyOutboundMobileDO 手机号信息 - * @return 是否重复 - */ - public boolean whetherRepeat(HyOutboundMobileDO hyOutboundMobileDO) { - Long id = hyOutboundMobileDO.getId(); - hyOutboundMobileDO.setId(null); - List outboundMobileList = outboundMobileMapper.selectByPrimarySelective(hyOutboundMobileDO); - hyOutboundMobileDO.setId(id); - //如果修改后的号码与原号码一致也不算重复，但是要记录更新人 - if (outboundMobileList != null && outboundMobileList.size() > 0) { - //更新操作还要检查是否与原号码信息相同，相同的话也不算重复 - if (outboundMobileList.get(0).getId().equals(id)) { - return Boolean.FALSE; - } - return Boolean.TRUE; - } - return Boolean.FALSE; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java deleted file mode 100644 index 1de80ff82..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java +++ /dev/null @@ -1,350 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dao.*; -import com.cool.store.dto.log.AddTagsDTO; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.dto.log.WantInfoUpdateDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.HyPartnerCertificationInfoMapper; -import com.cool.store.request.AddTagsRequest; -import com.cool.store.request.PartnerBaseInfoRequest; -import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.PartnerBaseInfoVO; -import com.cool.store.vo.PartnerUserInfoVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/13 21:37 - * @Version 1.0 - */ -@Service -@Slf4j -public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService { - - @Resource - HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Resource - HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Resource - private RedisUtilPool redisUtilPool; - - @Resource - HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - @Resource - HyPhoneLocationService hyPhoneLocationService; - @Resource - HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; - - @Resource - HyInterviewDAO hyInterviewDAO; - - @Resource - HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; - - @Resource - HyPartnerClerkDAO hyPartnerClerkDAO; - - @Resource - HyPartnerCertificationInfoMapper hyPartnerCertificationInfoMapper; - - @Autowired - private LogService logService; - @Resource - private LabelService labelService; - @Resource - private HyFollowTaskDAO hyFollowTaskDAO; - - - @Override - public Boolean addTags(LoginUserInfo user, AddTagsRequest addTagsRequest) { - HyPartnerBaseInfoDO hyPartnerBaseInfo = hyPartnerBaseInfoDAO.selectById(addTagsRequest.getPartnerBaseInfoId()); - if (hyPartnerBaseInfo==null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_BASE_INFO_NOT_EXIST); - } - String oldUserPortrait = hyPartnerBaseInfo.getUserPortrait(); - hyPartnerBaseInfo.setId(addTagsRequest.getPartnerBaseInfoId()); - hyPartnerBaseInfo.setUserPortrait(CollectionUtils.isNotEmpty(addTagsRequest.getTags())? - addTagsRequest.getTags().stream().map(Object::toString).collect(Collectors.joining(CommonConstants.COMMA, CommonConstants.COMMA, CommonConstants.COMMA)):""); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfo); - HyPartnerLineInfoDO line = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerBaseInfo.getPartnerId()); - //添加日志 - String newUserPortrait = hyPartnerBaseInfo.getUserPortrait(); - List oldLabels = new ArrayList<>(), newLabels = new ArrayList<>(); - if (StringUtils.isNotEmpty(oldUserPortrait)){ - Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(oldUserPortrait)); - oldLabels = userPortraitMap.values().stream().collect(Collectors.toList()); - } - if (StringUtils.isNotEmpty(newUserPortrait)){ - Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(newUserPortrait)); - newLabels = userPortraitMap.values().stream().collect(Collectors.toList()); - } - List addLabels = new ArrayList<>(newLabels); - List removeLabels = new ArrayList<>(oldLabels); - addLabels.removeAll(oldLabels); - removeLabels.removeAll(newLabels); - if(CollectionUtils.isEmpty(addLabels) && CollectionUtils.isEmpty(removeLabels)){ - return Boolean.TRUE; - } - LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.ADD_TAGS, - WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()), - line.getWorkflowStatus(), ""); - AddTagsDTO logDTO = AddTagsDTO.builder().operateUserId(user.getUserId()).operateUsername(user.getName()) - .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).addLabels(addLabels).removeLabels(removeLabels).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - return Boolean.TRUE; - } - - /** - * //前提 未提交加盟申请 - * //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 - * @param request - * @return - */ - @Override - public Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser) { - log.info("HyPartnerBaseInfoServiceImpl#submitPartnerBaseInfo request:{}", JSONObject.toJSONString(request)); - - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); - if(!request.getSubmitFlag()){ - // 自动保存时 - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - return Boolean.TRUE; - } - WantInfoUpdateDTO.BaseInfoUpdate beforeBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); - WantInfoUpdateDTO.BaseInfoUpdate afterBaseInfoUpdate = new WantInfoUpdateDTO.BaseInfoUpdate(); - OperateTypeEnum operateTypeEnum = OperateTypeEnum.INTENT_INFO_UPDATE; - - HyPartnerBaseInfoDO baseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - if(baseInfoDO == null){ - baseInfoDO = new HyPartnerBaseInfoDO(); - fillBaseInfo(baseInfoDO, request); - hyPartnerBaseInfoDAO.insertSelective(baseInfoDO); - BeanUtil.copyProperties(baseInfoDO, afterBaseInfoUpdate); - operateTypeEnum = OperateTypeEnum.INTENT_INFO_SUBMIT; - }else { - BeanUtil.copyProperties(baseInfoDO, beforeBaseInfoUpdate); - fillBaseInfo(baseInfoDO, request); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(baseInfoDO); - BeanUtil.copyProperties(baseInfoDO, afterBaseInfoUpdate); - } - if(request.getSubmitFlag()){ - // 更新线索表状态 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId()); - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_1.getCode()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - // 更新意向基本信息表状态 - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - hyPartnerBaseInfoDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_1.getCode())); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfoDO); - - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId()); - if(!hyPartnerUserInfoDO.getUsername().equals(request.getUsername())){ - hyPartnerUserInfoDO.setUsername(request.getUsername()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - } - - HyPartnerTaskInfoLogDO logDO = new HyPartnerTaskInfoLogDO(request.getPartnerId(), request.getPartnerLineId(), WorkflowStageEnum.INTENT.getCode(), WorkflowStatusEnum.INTENT_1.getCode(), currentUser.getPartnerId(), currentUser.getUsername(), null); - - // hyPartnerTaskInfoLogDAO.insertSelective(logDO); - } - // 清空暂存信息 - redisUtilPool.delKey(cacheKey); - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .beforeBaseInfoUpdate(beforeBaseInfoUpdate).afterBaseInfoUpdate(afterBaseInfoUpdate).build(); - logService.recordPartnerBizLog(operator, baseInfoDO.getPartnerLineId(), operateTypeEnum,log); - return Boolean.TRUE; - } - - @Override - public PartnerBaseInfoVO queryPartnerBaseInfo(String partnerId, Long lineId) { - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, partnerId, lineId); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerBaseInfoVO partnerBaseInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerBaseInfoVO.class); - return partnerBaseInfoVO; - } - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(partnerId, lineId); - PartnerBaseInfoVO baseInfoVO = new PartnerBaseInfoVO(); - if (hyPartnerBaseInfoDO != null){ - BeanUtil.copyProperties(hyPartnerBaseInfoDO, baseInfoVO); - } - return baseInfoVO; - } - - @Override - public PartnerBaseInfoVO getByPartnerLineId(Long lineId) { - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(lineId); - if (hyPartnerBaseInfoDO == null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_BASEINFO_NOT_EXIST); - } - PartnerBaseInfoVO baseInfoVO = new PartnerBaseInfoVO(); - BeanUtil.copyProperties(hyPartnerBaseInfoDO, baseInfoVO); - return baseInfoVO; - } - - @Override - public HyPartnerBaseInfoDO getByIdCard(String idCard) { - return hyPartnerBaseInfoDAO.getByIdCard(idCard); - } - - @Override - public Boolean changeBinding(String idCard, Long lineId, PartnerUserInfoVO currentUser) { - // 把旧线索的身份证号置空，状态改为待提交 - HyPartnerBaseInfoDO oldBaseInfo = hyPartnerBaseInfoDAO.getByIdCard(idCard); - HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldBaseInfo.getPartnerLineId()); - HyPartnerUserInfoDO oldPartnerUser = hyPartnerUserInfoDAO.selectByPartnerId(oldBaseInfo.getPartnerId()); - // 该身份证当前申请状态同步至该账号下，原账号变为【加盟意向申请 待提交状态】 - HyPartnerLineInfoDO newLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - Long newLindId = newLineInfo.getId(); - String newPartnerId = newLineInfo.getPartnerId(); - BeanUtil.copyProperties(oldLineInfo,newLineInfo,"createTime","updateTime","id","deleted"); - newLineInfo.setId(newLindId); - newLineInfo.setPartnerId(newPartnerId); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(newLineInfo); - cleanOldLineInfo(oldLineInfo); - hyPartnerLineInfoDAO.updateByPrimaryKey(oldLineInfo); - // 新线索绑定身份证号 - HyPartnerBaseInfoDO newBaseInfo = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(currentUser.getPartnerId(), lineId); - fillBaseInfoIdCard(newBaseInfo, oldBaseInfo.getIdCard(), oldBaseInfo.getIdCardPhotoFront(), oldBaseInfo.getIdCardPhotoBlack(), oldBaseInfo.getUsername(), - oldBaseInfo.getSex(), oldBaseInfo.getBirthdate(), oldBaseInfo.getNation(), oldBaseInfo.getLiveAddress(), oldBaseInfo.getStatus(),oldBaseInfo.getUserPortrait()); - newBaseInfo.setStatus(oldBaseInfo.getStatus()); - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(newBaseInfo); - //修改名称 - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId); - HyPartnerIntentInfoDO oldIntentInfo = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(oldLineInfo.getPartnerId(), oldLineInfo.getId()); - if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername()) || !hyPartnerUserInfoDO.getWantShopArea().equals(oldIntentInfo.getWantShopArea()) - || !hyPartnerUserInfoDO.getAcceptAdjustType().equals(oldIntentInfo.getAcceptAdjustType())){ - hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername()); - hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea()); - hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType()); - - } - hyPartnerUserInfoDO.setRecommendPartnerId(oldPartnerUser.getRecommendPartnerId()); - hyPartnerUserInfoDO.setRecommendPartnerName(oldPartnerUser.getRecommendPartnerName()); - hyPartnerUserInfoDO.setRecommendPartnerMobile(oldPartnerUser.getRecommendPartnerMobile()); - hyPartnerUserInfoDO.setShopCode(oldPartnerUser.getShopCode()); - hyPartnerUserInfoDO.setShopName(oldPartnerUser.getShopName()); - hyPartnerUserInfoDO.setShopId(oldPartnerUser.getShopId()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - // 老的身份证信息置空 - fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null,null); - oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); - hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo); - hyPartnerIntentInfoDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - hyPartnerClerkDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - hyPartnerInterviewPlanDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - hyInterviewDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - hyPartnerCertificationInfoMapper.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - //软删新线索操作日志 - hyPartnerTaskInfoLogDAO.deleteByLineId(newLindId, "换绑"); - hyPartnerTaskInfoLogDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId()); - //先作废新的线索跟进任务 - hyFollowTaskDAO.cancelUndoFollowTask(newLindId); - hyFollowTaskDAO.changeLineId(oldLineInfo.getId(), newLindId); - String cacheKeyBaseInfo = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, newPartnerId, newLindId); - String cacheKeyClerkInfo = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY,newPartnerId, newLindId); - String cacheKeyIntentInfo = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, newPartnerId, newLindId); - redisUtilPool.delKey(cacheKeyBaseInfo); - redisUtilPool.delKey(cacheKeyClerkInfo); - redisUtilPool.delKey(cacheKeyIntentInfo); - return true; - } - - private void cleanOldLineInfo(HyPartnerLineInfoDO oldLineInfo) { - oldLineInfo.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - oldLineInfo.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - oldLineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); - oldLineInfo.setInvestmentManager(null); - oldLineInfo.setDevelopmentDirector(null); - oldLineInfo.setDevelopmentManager(null); - oldLineInfo.setDeadline(null); - oldLineInfo.setPassReason(null); - oldLineInfo.setRejectPublicReason(null); - oldLineInfo.setRejectRealReason(null); - oldLineInfo.setCertifyFile(null); - oldLineInfo.setCloseTime(null); - oldLineInfo.setCloseUserId(null); - oldLineInfo.setJoinBlackReason(null); - oldLineInfo.setRemoveBlackReason(null); - } - - @Override - public HyPartnerBaseInfoDO generateBaseInfo(HyPartnerUserInfoDO hyPartnerUserInfoDO, Long partnerLineId, String userPortrait) { - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), partnerLineId); - if(hyPartnerBaseInfoDO == null){ - hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); - hyPartnerBaseInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - hyPartnerBaseInfoDO.setPartnerLineId(partnerLineId); - hyPartnerBaseInfoDO.setMobile(hyPartnerUserInfoDO.getMobile()); - hyPartnerBaseInfoDO.setUsername(hyPartnerUserInfoDO.getUsername()); - hyPartnerBaseInfoDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())); - hyPartnerBaseInfoDO.setSex(1); - if(StringUtils.isNotBlank(userPortrait)){ - hyPartnerBaseInfoDO.setUserPortrait(userPortrait); - } - hyPartnerBaseInfoDAO.insertSelective(hyPartnerBaseInfoDO); - } - return hyPartnerBaseInfoDO; - } - - private void fillBaseInfoIdCard(HyPartnerBaseInfoDO newBaseInfo, String idCard, String idCardPhotoFront, String idCardPhotoBlack, - String username, Integer sex, Date birthdate, String nation, String liveAddress, Integer status,String userPortrait) { - newBaseInfo.setIdCard(idCard); - newBaseInfo.setIdCardPhotoBlack(idCardPhotoFront); - newBaseInfo.setIdCardPhotoFront(idCardPhotoBlack); - newBaseInfo.setUsername(username); - newBaseInfo.setSex(sex); - newBaseInfo.setUserPortrait(userPortrait); - newBaseInfo.setBirthdate(birthdate); - newBaseInfo.setNation(nation); - newBaseInfo.setLiveAddress(liveAddress); - newBaseInfo.setStatus(status); - } - - private void fillBaseInfo(HyPartnerBaseInfoDO baseInfoDO, PartnerBaseInfoRequest request) { - baseInfoDO.setPartnerId(request.getPartnerId()); - baseInfoDO.setPartnerLineId(request.getPartnerLineId()); - baseInfoDO.setMobile(request.getMobile()); - baseInfoDO.setUsername(request.getUsername()); - baseInfoDO.setSex(request.getSex()); - baseInfoDO.setNation(request.getNation()); - baseInfoDO.setBirthdate(request.getBirthdate()); - baseInfoDO.setIdCard(request.getIdCard()); - baseInfoDO.setIdCardPhotoFront(request.getIdCardPhotoFront()); - baseInfoDO.setIdCardPhotoBlack(request.getIdCardPhotoBlack()); - baseInfoDO.setLiveAddress(request.getLiveAddress()); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java deleted file mode 100644 index 8a87b5415..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerClerkServiceImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dao.HyPartnerClerkDAO; -import com.cool.store.dto.enterprise.SysDepartmentDTO; -import com.cool.store.dto.log.WantInfoUpdateDTO; -import com.cool.store.entity.HyPartnerClerkDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.request.PartnerClerkInfoRequest; -import com.cool.store.service.HyPartnerClerkService; -import com.cool.store.service.LogService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.PartnerClerkVO; -import com.cool.store.vo.PartnerUserInfoVO; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @Author wxp - * @Date 2023/6/14 21:37 - * @Version 1.0 - */ -@Slf4j -@Service -public class HyPartnerClerkServiceImpl implements HyPartnerClerkService { - - @Resource - HyPartnerClerkDAO hyPartnerClerkDAO; - - @Resource - private RedisUtilPool redisUtilPool; - - @Autowired - private LogService logService; - - @Override - public List getPartnerClerkList(Long lineId) { - List hyPartnerClerkList = hyPartnerClerkDAO.getHyPartnerClerkList(lineId); - List result= new ArrayList<>(); - hyPartnerClerkList.forEach(x->{ - PartnerClerkVO partnerClerkVO = new PartnerClerkVO(); - partnerClerkVO.setPartnerId(x.getPartnerId()); - partnerClerkVO.setPartnerLineId(x.getPartnerLineId()); - partnerClerkVO.setAge(x.getAge()); - partnerClerkVO.setChooseReason(x.getChooseReason()); - partnerClerkVO.setUsername(x.getUsername()); - partnerClerkVO.setRelationship(x.getRelationship()); - result.add(partnerClerkVO); - }); - return result; - } - - @Override - public Boolean submitPartnerClerkInfo(PartnerClerkInfoRequest request) { - log.info("HyPartnerClerkServiceImpl#submitPartnerClerkInfo request:{}", JSONObject.toJSONString(request)); - if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); - if(!request.getSubmitFlag()){ - // 自动保存时 - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - return Boolean.TRUE; - } - List beforeClerkUpdate = Lists.newArrayList(); - List afterClerkUpdate = Lists.newArrayList(); - List beforClerkDOList = hyPartnerClerkDAO.listByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - hyPartnerClerkDAO.deleteByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - List clerkDOList = new ArrayList<>(); - ListUtils.emptyIfNull(request.getPartnerClerkRequestList()).stream().forEach(x->{ - HyPartnerClerkDO clerkDO = new HyPartnerClerkDO(); - clerkDO.setPartnerLineId(request.getPartnerLineId()); - clerkDO.setPartnerId(request.getPartnerId()); - clerkDO.setUsername(x.getUsername()); - clerkDO.setRelationship(x.getRelationship()); - clerkDO.setAge(x.getAge()); - clerkDO.setChooseReason(x.getChooseReason()); - clerkDOList.add(clerkDO); - }); - if (CollectionUtils.isNotEmpty(clerkDOList)){ - hyPartnerClerkDAO.batchInsert(clerkDOList); - afterClerkUpdate = JSONObject.parseArray(JSONObject.toJSONString(clerkDOList), WantInfoUpdateDTO.ClerkUpdate.class); - } - if (CollectionUtils.isNotEmpty(beforClerkDOList)){ - beforeClerkUpdate = JSONObject.parseArray(JSONObject.toJSONString(beforClerkDOList), WantInfoUpdateDTO.ClerkUpdate.class); - } - redisUtilPool.delKey(cacheKey); - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .beforeClerkUpdate(beforeClerkUpdate).afterClerkUpdate(afterClerkUpdate).build(); - logService.recordPartnerBizLog(operator, request.getPartnerLineId(), OperateTypeEnum.INTENT_INFO_UPDATE,log); - return true; - } - - @Override - public List queryPartnerClerkInfo(String partnerId, Long lineId) { - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_CLERKINFO_CACHE_KEY, partnerId, lineId); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerClerkInfoRequest partnerClerkInfoRequest = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerClerkInfoRequest.class); - List clerkVOList = ListUtils.emptyIfNull(partnerClerkInfoRequest.getPartnerClerkRequestList()).stream().map(clerkRequest -> { - PartnerClerkVO clerkVO = new PartnerClerkVO(); - BeanUtil.copyProperties(clerkRequest, clerkVO); - return clerkVO; - }).collect(Collectors.toList()); - return clerkVOList; - } - List clerkDOList = hyPartnerClerkDAO.listByPartnerIdAndLineId(partnerId, lineId); - List clerkVOList = ListUtils.emptyIfNull(clerkDOList).stream().map(clerkDO -> { - PartnerClerkVO clerkVO = new PartnerClerkVO(); - BeanUtil.copyProperties(clerkDO, clerkVO); - return clerkVO; - }).collect(Collectors.toList()); - return clerkVOList; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java deleted file mode 100644 index 4b727d256..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ /dev/null @@ -1,541 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dao.*; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.dto.log.UserInfoUpdateDTO; -import com.cool.store.dto.log.WantInfoUpdateDTO; -import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerLabelMapper; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.request.BaseUserInfoRequest; -import com.cool.store.request.IndustryCognitionInfoRequest; -import com.cool.store.request.PartnerIntentInfoRequest; -import com.cool.store.request.PartnerWantShopInfoRequest; -import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.PartnerIntentApplyInfoVO; -import com.cool.store.vo.PartnerIntentInfoVO; -import com.cool.store.vo.PartnerUserInfoVO; -import com.cool.store.vo.WantShopInfoVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/9 15:00 - * @Version 1.0 - */ -@Slf4j -@Service -public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoService { - - @Resource - HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; - @Resource - HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - @Resource - private RedisUtilPool redisUtilPool; - @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - @Resource - HyPhoneLocationService hyPhoneLocationService; - @Resource - HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - @Autowired - private LogService logService; - @Resource - HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - @Resource - LabelService labelService; - @Autowired - private NoticeService noticeService; - @Resource - HyPartnerUserChannelDAO hyPartnerUserChannelDAO; - @Autowired - EventCenterHttpRequest eventCenterHttpRequest; - @Resource - EnterpriseUserDAO enterpriseUserDAO; - - @Override - public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList) { - String workflowStatus = ""; - if (CommonConstants.PENDING.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTENT_1.getCode(); - } - if (CommonConstants.FOLLOW.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTENT_0.getCode(); - } - String lastFollowStartTimeStr = null; - String lastFollowEndTimeStr = null; - if (lastFollowStartTime!=null||lastFollowEndTime!=null){ - lastFollowStartTimeStr = DateUtil.format(new Date(lastFollowStartTime), CoolDateUtils.DATE_FORMAT_SEC); - lastFollowEndTimeStr = DateUtil.format(new Date(lastFollowEndTime), CoolDateUtils.DATE_FORMAT_SEC); - } - PageHelper.startPage(pageNumber,pageSize); - PageInfo partnerIntentApplyInfo = new PageInfo(hyPartnerIntentInfoDAO.selectPartnerIntentApplyInfoList(userId, WorkflowStageEnum.INTENT.getCode(), workflowStatus,keyword - ,callStatus,userPortraitIdList,lastFollowStartTimeStr,lastFollowEndTimeStr,userChannelIdList)); - if (partnerIntentApplyInfo==null){ - return new PageInfo<>(); - } - List list = partnerIntentApplyInfo.getList(); - List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PartnerIntentApplyInfoDTO::getUserChannelId).collect(Collectors.toList()); - Map userChannelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); - List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PartnerIntentApplyInfoDTO::getUserPortrait).collect(Collectors.toList()); - List wantShopAreaList = list.stream().filter(x->StringUtils.isNotEmpty(x.getWantShopArea())).map(PartnerIntentApplyInfoDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList()); - Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); - List resultList = PartnerIntentApplyInfoVO.convertList(list, wantShopAreaNameMap, workflowStatus,userChannelMap,labelService.getUserPortraitMap(userPortraitList)); - partnerIntentApplyInfo.setList(resultList); - return partnerIntentApplyInfo; - } - - - - @Override - public Boolean updatePartnerIntentInfo(LoginUserInfo userInfo, BaseUserInfoRequest baseUserInfoRequest) { - - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(baseUserInfoRequest.getPartnerId())); - if (hyPartnerUserInfoDO==null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - UserInfoUpdateDTO.UserInfoUpdate beforeUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getLiveArea(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType()); - hyPartnerUserInfoDO.setUsername(baseUserInfoRequest.getUsername()); - hyPartnerUserInfoDO.setMobile(baseUserInfoRequest.getMobile()); - hyPartnerUserInfoDO.setLiveArea(baseUserInfoRequest.getLiveArea()); - hyPartnerUserInfoDO.setWantShopArea(baseUserInfoRequest.getWantShopArea()); - hyPartnerUserInfoDO.setAcceptAdjustType(baseUserInfoRequest.getAcceptAdjustType()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - - UserInfoUpdateDTO.UserInfoUpdate afterUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(baseUserInfoRequest.getUsername(), baseUserInfoRequest.getMobile(), baseUserInfoRequest.getLiveArea(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType()); - - - //修改意向申请信息中的加盟商名称与手机号 - hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId()); - - // 更新线索状态 1.4开始 无需更新线索状态 - //HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE); - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(baseUserInfoRequest.getPartnerId()); - //更新意向申请表中信息 - HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId()); - if (hyPartnerIntentInfoDO!=null){ - hyPartnerIntentInfoDO.setLiveArea(baseUserInfoRequest.getLiveArea()); - hyPartnerIntentInfoDO.setWantShopArea(baseUserInfoRequest.getWantShopArea()); - hyPartnerIntentInfoDO.setAcceptAdjustType(baseUserInfoRequest.getAcceptAdjustType()); - hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(hyPartnerIntentInfoDO); - } - - - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, baseUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerIntentInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoRequest.class); - if(!baseUserInfoRequest.getWantShopArea().equals(request.getWantShopArea()) - || !baseUserInfoRequest.getAcceptAdjustType().equals(request.getAcceptAdjustType())){ - request.setWantShopArea(baseUserInfoRequest.getWantShopArea()); - request.setAcceptAdjustType(baseUserInfoRequest.getAcceptAdjustType()); - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - } - } - - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), userInfo.getUserId(), - userInfo.getName(), OperateTypeEnum.USERINFO_UPDATE, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - UserInfoUpdateDTO logDTO = UserInfoUpdateDTO.builder().operateUserId(userInfo.getUserId()).operateUsername(userInfo.getName()) - .beforeUserinfoUpdate(beforeUserinfoUpdate).afterUserinfoUpdate(afterUserinfoUpdate) - .mobile(userInfo.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - return Boolean.TRUE; - } - - @Override - public PartnerIntentInfoVO getPartnerIntentApplyDetail(Long lineId) { - HyPartnerIntentInfoDO hyPartnerIntentInfoDO= hyPartnerIntentInfoDAO.selectByLineId(lineId); - if(Objects.isNull(hyPartnerIntentInfoDO)){ - return null; - } - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - PartnerIntentInfoVO partnerIntentInfoVO = convertPartnerIntentApplyInfoDOToVO(hyPartnerIntentInfoDO); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId()); - partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); - partnerIntentInfoVO.setWorkflowStage(hyPartnerLineInfoDO.getWorkflowStage()); - partnerIntentInfoVO.setWorkflowStatus(hyPartnerLineInfoDO.getWorkflowStatus()); - partnerIntentInfoVO.setDetailedAddress(hyPartnerIntentInfoDO.getDetailedAddress()); - partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); - partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," ")); - return partnerIntentInfoVO; - } - - @Override - public Integer submitPartnerIntentInfo(PartnerIntentInfoRequest request) throws ApiException { - boolean isUpdateIntentInfo = true; - log.info("HyPartnerClerkServiceImpl#submitPartnerIntentInfo request:{}", JSONObject.toJSONString(request)); - if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); - if(!request.getSubmitFlag()){ - // 自动保存时 - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - return null; - } - WantInfoUpdateDTO.IntentInfoUpdate beforeIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); - WantInfoUpdateDTO.IntentInfoUpdate afterIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate(); - OperateTypeEnum operateTypeEnum = OperateTypeEnum.INTENT_INFO_UPDATE; - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - if(intentInfoDO == null){ - isUpdateIntentInfo = false; - intentInfoDO = new HyPartnerIntentInfoDO(); - fillIntentInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); - BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate); - operateTypeEnum = OperateTypeEnum.INTENT_INFO_SUBMIT; - }else { - BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate); - fillIntentInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO); - //PC端 AcquaintanceFlag 不传值 移动端修改必填 - if (request.getAcquaintanceFlag()!=null){ - hyPartnerIntentInfoDAO.updateAcquaintanceFlag(intentInfoDO.getId(),request.getAcquaintanceFlag(), request.getAcquaintanceName(), - request.getAcquaintanceRelationshipType(),request.getOtherRelationshipType()); - } - BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate); - } - redisUtilPool.delKey(cacheKey); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId()); - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId()); - List userIdList = new ArrayList<>(); - if(!request.getWantShopArea().equals(hyPartnerUserInfoDO.getWantShopArea()) || !request.getAcceptAdjustType().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ - hyPartnerUserInfoDO.setLiveArea(request.getLiveArea()); - hyPartnerUserInfoDO.setWantShopArea(request.getWantShopArea()); - hyPartnerUserInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - } - // 更新线索状态和招商经理 - //是公海线索 才会修改线索状态与招商经理 - if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ - Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType(),Boolean.TRUE); - hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); - if (flag){ - String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); - hyPartnerLineInfoDO.setInvestmentManager(investmentManager); - userIdList.add(investmentManager); - hyPartnerLineInfoDO.setAllotTime(new Date()); - } - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - - if(flag){//分配招商经理成功才发送分配招商经理的飞书工作通知 - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIdList); - List feishuUserIds = new ArrayList<>(feishuUserIdsByUserIds.values()); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER,feishuUserIds,dateTime,hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile()); - } - } - if(!isUpdateIntentInfo){ - if(CollectionUtils.isEmpty(userIdList)){ - userIdList.add(hyPartnerLineInfoDO.getInvestmentManager()); - } - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIdList); - List feishuUserIds = new ArrayList<>(feishuUserIdsByUserIds.values()); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTENTION_APPLY,feishuUserIds,hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile(), dateTime); - } - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .beforeIntentInfoUpdate(beforeIntentInfoUpdate).afterIntentInfoUpdate(afterIntentInfoUpdate).build(); - logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), operateTypeEnum, log); - return hyPartnerLineInfoDO.getLineStatus(); - } - - @Override - public String submitWantShopInfo(PartnerWantShopInfoRequest request) { - - log.info("HyPartnerClerkServiceImpl#submitWantShopInfo request:{}", JSONObject.toJSONString(request)); - if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_WANTSHOPINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); - if(!request.getSubmitFlag()){ - // 自动保存时 - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - return ""; - } - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - if(intentInfoDO == null){ - intentInfoDO = new HyPartnerIntentInfoDO(); - fillWantShopInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); - }else { - fillWantShopInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO); - } - redisUtilPool.delKey(cacheKey); - if(StringUtils.isNotBlank(request.getWantShopArea())){ - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId()); - hyPartnerUserInfoDO.setWantShopArea(request.getWantShopArea()); - hyPartnerUserInfoDO.setLiveArea(request.getLiveArea()); - hyPartnerUserInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(request.getWantShopArea())); - return hyOpenAreaInfoDO != null ? hyOpenAreaInfoDO.getAreaStatus() : null; - } - return null; - } - - @Override - public Boolean submitIndustryCognitionInfo(IndustryCognitionInfoRequest request) { - log.info("HyPartnerClerkServiceImpl#submitPartnerIntentInfo request:{}", JSONObject.toJSONString(request)); - if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INDUSTRYCOGNITIONINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId()); - if(!request.getSubmitFlag()){ - // 自动保存时 - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - return true; - } - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId()); - if(intentInfoDO == null){ - intentInfoDO = new HyPartnerIntentInfoDO(); - fillIndustryCognitionInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.insertSelective(intentInfoDO); - }else { - fillIndustryCognitionInfo(intentInfoDO, request); - hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO); - } - redisUtilPool.delKey(cacheKey); - return true; - } - - @Override - public PartnerIntentInfoVO queryPartnerIntentInfo(PartnerUserInfoVO userInfoVO, Long lineId) { - log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo userInfoVO:{}", JSONObject.toJSONString(userInfoVO)); - - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); - intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); - return intentInfoVO; - } - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId); - PartnerIntentInfoVO intentInfoVO = null; - if (intentInfoDO != null){ - intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO); - }else { - intentInfoVO = new PartnerIntentInfoVO(); - } - if(StringUtils.isBlank(intentInfoVO.getLiveArea())){ - intentInfoVO.setLiveArea(userInfoVO.getLiveArea()); - } - if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){ - intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea()); - } - if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){ - intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); - } - intentInfoVO.setWantShopAreaName(userInfoVO.getWantShopAreaName()); - log.info("HyPartnerClerkServiceImpl#queryPartnerIntentInfo intentInfoVO:{}", JSONObject.toJSONString(intentInfoVO)); - - return intentInfoVO; - } - - @Override - public PartnerIntentInfoVO queryWantShopInfo(PartnerUserInfoVO userInfoVO, Long lineId) { - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_WANTSHOPINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); - return intentInfoVO; - } - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId); - PartnerIntentInfoVO intentInfoVO = null; - if (intentInfoDO != null){ - intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO); - }else { - intentInfoVO = new PartnerIntentInfoVO(); - } - if(StringUtils.isBlank(intentInfoVO.getLiveArea())){ - intentInfoVO.setLiveArea(userInfoVO.getLiveArea()); - } - if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){ - intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea()); - } - if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){ - intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType()); - } - return intentInfoVO; - } - - @Override - public PartnerIntentInfoVO queryIndustryCognitionInfo(PartnerUserInfoVO userInfoVO, Long lineId) { - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INDUSTRYCOGNITIONINFO_CACHE_KEY, userInfoVO.getPartnerId(), lineId); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerIntentInfoVO intentInfoVO = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoVO.class); - return intentInfoVO; - } - HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId); - PartnerIntentInfoVO intentInfoVO = null; - if (intentInfoDO != null){ - intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO); - } - return intentInfoVO; - } - - private void fillWantShopInfo(HyPartnerIntentInfoDO intentInfoDO, PartnerWantShopInfoRequest request) { - intentInfoDO.setPartnerId(request.getPartnerId()); - intentInfoDO.setPartnerLineId(request.getPartnerLineId()); - intentInfoDO.setLiveArea(request.getLiveArea()); - intentInfoDO.setWantShopArea(request.getWantShopArea()); - intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); - intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop()); - if (CollectionUtils.isNotEmpty(request.getWantShopInfo())){ - intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo())); - } - intentInfoDO.setMaxBudget(request.getMaxBudget()); - intentInfoDO.setMoneySource(request.getMoneySource()); - if(CollectionUtils.isNotEmpty(request.getMoneyProve())){ - intentInfoDO.setMoneyProve(JSONObject.toJSONString(request.getMoneyProve())); - } - intentInfoDO.setEducation(""); - intentInfoDO.setWorkYear(""); - intentInfoDO.setWorkExp(""); - intentInfoDO.setOtherBand(""); - intentInfoDO.setBrandStrength(""); - intentInfoDO.setNeedImprove(""); - intentInfoDO.setStrength(""); - intentInfoDO.setWeakness(""); - } - - private void fillIndustryCognitionInfo(HyPartnerIntentInfoDO intentInfoDO, IndustryCognitionInfoRequest request) { - intentInfoDO.setPartnerId(request.getPartnerId()); - intentInfoDO.setPartnerLineId(request.getPartnerLineId()); - intentInfoDO.setEducation(request.getEducation()); - intentInfoDO.setWorkYear(request.getWorkYear()); - intentInfoDO.setIsHaveWorkExp(request.getIsHaveWorkExp()); - intentInfoDO.setWorkExp(request.getWorkExp()); - intentInfoDO.setIsConsumer(request.getIsConsumer()); - intentInfoDO.setOtherBand(request.getOtherBand()); - intentInfoDO.setBrandStrength(request.getBrandStrength()); - intentInfoDO.setNeedImprove(request.getNeedImprove()); - intentInfoDO.setStrength(request.getStrength()); - intentInfoDO.setWeakness(request.getWeakness()); - } - - private void fillIntentInfo(HyPartnerIntentInfoDO intentInfoDO, PartnerIntentInfoRequest request) { - intentInfoDO.setPartnerId(request.getPartnerId()); - intentInfoDO.setPartnerLineId(request.getPartnerLineId()); - intentInfoDO.setLiveArea(request.getLiveArea()); - intentInfoDO.setWantShopArea(request.getWantShopArea()); - intentInfoDO.setDetailedAddress(request.getDetailedAddress()); - intentInfoDO.setEmail(request.getEmail()); - intentInfoDO.setAcquaintanceFlag(request.getAcquaintanceFlag()); - intentInfoDO.setAcquaintanceName(request.getAcquaintanceName()); - intentInfoDO.setAcquaintanceRelationshipType(request.getAcquaintanceRelationshipType()); - intentInfoDO.setOtherRelationshipType(request.getOtherRelationshipType()); - intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); - intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop()); - intentInfoDO.setWantShopInfo(""); - if (CollectionUtils.isNotEmpty(request.getWantShopInfo()) && request.getIsHaveWantShop() == 1){ - intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo())); - } - intentInfoDO.setMaxBudget(request.getMaxBudget()); - intentInfoDO.setMoneySource(request.getMoneySource()); - if(CollectionUtils.isNotEmpty(request.getMoneyProve())){ - intentInfoDO.setMoneyProve(JSONObject.toJSONString(request.getMoneyProve())); - } - if(CollectionUtils.isNotEmpty(request.getCreditProve())){ - intentInfoDO.setCreditProve(JSONObject.toJSONString(request.getCreditProve())); - } - intentInfoDO.setEducation(request.getEducation()); - intentInfoDO.setWorkYear(request.getWorkYear()); - intentInfoDO.setIsHaveWorkExp(request.getIsHaveWorkExp()); - intentInfoDO.setWorkExp(request.getWorkExp()); - intentInfoDO.setIsConsumer(request.getIsConsumer()); - intentInfoDO.setOtherBand(request.getOtherBand()); - intentInfoDO.setBrandStrength(request.getBrandStrength()); - intentInfoDO.setNeedImprove(request.getNeedImprove()); - intentInfoDO.setStrength(request.getStrength()); - intentInfoDO.setWeakness(request.getWeakness()); - } - - - - /** - * - * @param hyPartnerIntentInfoDO - * @return - */ - private PartnerIntentInfoVO convertPartnerIntentApplyInfoDOToVO(HyPartnerIntentInfoDO hyPartnerIntentInfoDO){ - PartnerIntentInfoVO partnerIntentInfoVO = new PartnerIntentInfoVO(); - partnerIntentInfoVO.setId(hyPartnerIntentInfoDO.getId()); - partnerIntentInfoVO.setPartnerId(hyPartnerIntentInfoDO.getPartnerId()); - partnerIntentInfoVO.setPartnerLineId(hyPartnerIntentInfoDO.getPartnerLineId()); - partnerIntentInfoVO.setAcceptAdjustType(hyPartnerIntentInfoDO.getAcceptAdjustType()); - partnerIntentInfoVO.setLiveArea(hyPartnerIntentInfoDO.getLiveArea()); - partnerIntentInfoVO.setWantShopArea(hyPartnerIntentInfoDO.getWantShopArea()); - partnerIntentInfoVO.setEducation(hyPartnerIntentInfoDO.getEducation()); - partnerIntentInfoVO.setMaxBudget(hyPartnerIntentInfoDO.getMaxBudget()); - partnerIntentInfoVO.setBrandStrength(hyPartnerIntentInfoDO.getBrandStrength()); - partnerIntentInfoVO.setIsConsumer(hyPartnerIntentInfoDO.getIsConsumer()); - partnerIntentInfoVO.setIsHaveWantShop(hyPartnerIntentInfoDO.getIsHaveWantShop()); - partnerIntentInfoVO.setIsHaveWorkExp(hyPartnerIntentInfoDO.getIsHaveWorkExp()); - partnerIntentInfoVO.setMoneyProve(StringUtil.isEmpty(hyPartnerIntentInfoDO.getMoneyProve())? - Lists.newArrayList(): JSONObject.parseArray(hyPartnerIntentInfoDO.getMoneyProve(),String.class)); - partnerIntentInfoVO.setCreditProve(StringUtil.isEmpty(hyPartnerIntentInfoDO.getCreditProve())? - Lists.newArrayList(): JSONObject.parseArray(hyPartnerIntentInfoDO.getCreditProve(),String.class)); - partnerIntentInfoVO.setMoneySource(hyPartnerIntentInfoDO.getMoneySource()); - partnerIntentInfoVO.setWorkYear(hyPartnerIntentInfoDO.getWorkYear()); - partnerIntentInfoVO.setWorkExp(hyPartnerIntentInfoDO.getWorkExp()); - partnerIntentInfoVO.setWeakness(hyPartnerIntentInfoDO.getWeakness()); - partnerIntentInfoVO.setCreateTime(hyPartnerIntentInfoDO.getCreateTime()); - partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand()); - partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength()); - partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove()); - partnerIntentInfoVO.setDetailedAddress(hyPartnerIntentInfoDO.getDetailedAddress()); - partnerIntentInfoVO.setEmail(hyPartnerIntentInfoDO.getEmail()); - if(StringUtils.isNotEmpty(hyPartnerIntentInfoDO.getWantShopInfo())){ - partnerIntentInfoVO.setWantShopInfo(JSONObject.parseArray(hyPartnerIntentInfoDO.getWantShopInfo(), WantShopInfoVO.class)); - } - partnerIntentInfoVO.setAcquaintanceFlag(hyPartnerIntentInfoDO.getAcquaintanceFlag()); - partnerIntentInfoVO.setAcquaintanceName(hyPartnerIntentInfoDO.getAcquaintanceName()); - partnerIntentInfoVO.setAcquaintanceRelationshipType(hyPartnerIntentInfoDO.getAcquaintanceRelationshipType()); - partnerIntentInfoVO.setOtherRelationshipType(hyPartnerIntentInfoDO.getOtherRelationshipType()); - return partnerIntentInfoVO; - } - - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java deleted file mode 100644 index 5b7e01e07..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ /dev/null @@ -1,425 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.constants.CommonConstants; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.*; -import com.cool.store.dto.log.AutoOpenInterviewRoomDTO; -import com.cool.store.dto.message.RemindInterviewMsgDTO; -import com.cool.store.dto.partner.PartnerInterviewInfoDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.GetInterviewListReq; -import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.vo.InterviewDetailInfoVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/8 19:32 - * @Version 1.0 - */ -@Slf4j -@Service -public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlanService { - - @Resource - HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; - @Resource - HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Autowired - HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - HyPartnerLineInfoService hyPartnerLineInfoService; - - @Autowired - HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private HyInterviewDAO interviewDAO; - @Resource - EnterpriseUserDAO enterpriseUserDAO; - - @Autowired - private InterviewService interviewService; - @Resource - LabelService labelService; - @Resource - HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - @Resource - HyPartnerUserChannelDAO hyPartnerUserChannelDAO; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - - @Value("${feishu.notice.link.url}") - private String linkUrl; - -// @Autowired -// private ISVHttpRequest isvHttpRequest; - -// @Autowired -// private SmsService smsService; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Autowired - private LogService logService; - - @Override - public List getInterviewPlanList(String userId,Date dateTime) { - String currentDay = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); - String currentTime = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_SEC); - List interviewPlanList = hyPartnerInterviewPlanDAO.getInterviewPlanList(userId, currentTime,currentDay); - if (CollectionUtils.isEmpty(interviewPlanList)){ - return Lists.newArrayList(); - } - List partnerIdList = interviewPlanList.stream().map(HyPartnerInterviewPlanDO::getPartnerId).collect(Collectors.toList()); - List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); - List interviewPlanIds = interviewPlanList.stream().map(HyPartnerInterviewPlanDO::getId).collect(Collectors.toList()); - List exhibitionInterviewPlanIds = partnerExhibitionDAO.queryIdListByInterviewPlanIds(interviewPlanIds); - Map hyPartnerUserInfoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data)); - List result = new ArrayList<>(); - interviewPlanList.stream() - //去掉在会销中进行的面试 - .filter(interviewPlan -> !exhibitionInterviewPlanIds.contains(interviewPlan.getId())) - .collect(Collectors.toList()) - .forEach(x->{ - InterviewDetailInfoVO interviewDetailInfoVO = convertDoToInterviewDetailInfoVO(x); - HyPartnerUserInfoDO userInfoDO = hyPartnerUserInfoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerUserInfoDO()); - interviewDetailInfoVO.setUserId(userInfoDO.getPartnerId()); - interviewDetailInfoVO.setUserName(userInfoDO.getUsername()); - interviewDetailInfoVO.setUserPhone(userInfoDO.getMobile()); - result.add(interviewDetailInfoVO); - }); - return result; - } - - @Override - public PageInfo getPartnerInterviewInfoList(String userId ,String type,Integer pageSize,Integer pageNumber) { - String workflowStatus = ""; - Boolean filter = Boolean.FALSE; - if (CommonConstants.PENDING.equals(type)) { - workflowStatus = WorkflowStatusEnum.RESERVATION_1.getCode(); - filter = Boolean.TRUE; - } - if (CommonConstants.FOLLOW.equals(type)) { - workflowStatus = WorkflowStatusEnum.RESERVATION_0.getCode(); - } - PageHelper.startPage(pageNumber,pageSize); - //查询预约面试列表 - PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus,filter)); - List list = partnerInterviewInfoList.getList(); - if (CollectionUtils.isEmpty(list)){ - return partnerInterviewInfoList; - } - List result = new ArrayList<>(); - List partnerIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerId).collect(Collectors.toList()); - List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds); - List userChannelIds = hyPartnerUserInfoDOS.stream().filter(x -> x.getUserChannelId() != null).map(HyPartnerUserInfoDO::getUserChannelId).collect(Collectors.toList()); - Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); - - List interviewerUserIds = list.stream().filter(x-> StringUtils.isNotEmpty(x.getInterviewer())).map(PartnerInterviewInfoDTO::getInterviewer).collect(Collectors.toList()); - List userInfoByUserIds = enterpriseUserDAO.getUserInfoByUserIds(interviewerUserIds); - Map interviewerUserMap = userInfoByUserIds.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); - Map userNameMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, Data->Data)); - List lineIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerLineId).collect(Collectors.toList()); - List hyPartnerLineInfoDOS= hyPartnerLineInfoDAO.getHyPartnerLineInfoListByIds(lineIds); - Map hyPartnerLineInfoDOMap = hyPartnerLineInfoDOS.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, data -> data)); - List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PartnerInterviewInfoDTO::getUserPortrait).collect(Collectors.toList()); - Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - //获取对应时间段的预约情况 - Map orderSituationMap; - if (CommonConstants.PENDING.equals(type)) { - Optional minInterviewStartTime = list.stream().min((info1, info2) -> info1.getStartTime().compareTo(info2.getStartTime())); - Optional maxInterviewEndTime = list.stream().max((info1, info2) -> info1.getEndTime().compareTo(info2.getEndTime())); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - List interviewBookSituation = hyPartnerInterviewPlanMapper.getInterviewBookSituation(userId, dateFormat.format(minInterviewStartTime.get().getStartTime()), dateFormat.format(maxInterviewEndTime.get().getEndTime())); - orderSituationMap = interviewBookSituation.stream().collect(Collectors.toMap(HyPartnerInterviewBookSituation::getStartTime, situation -> situation)); - } else { - orderSituationMap = new HashMap<>(); - } - list.stream().forEach(x->{ - PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x,userPortraitMap,userNameMap.get(x.getPartnerId()),channelMap); - partnerInterviewInfoVO.setPartnerName(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getUsername()); - partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getMobile()); - partnerInterviewInfoVO.setInterviewerName(interviewerUserMap.getOrDefault(x.getInterviewer(),new EnterpriseUserDO()).getName()); - partnerInterviewInfoVO.setInterviewerPhone(interviewerUserMap.getOrDefault(x.getInterviewer(),new EnterpriseUserDO()).getMobile()); - partnerInterviewInfoVO.setLineStatus(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getLineStatus()); - partnerInterviewInfoVO.setLineId(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getId()); - if (CommonConstants.PENDING.equals(type)) { - //设置对应时间段的被预约情况 - HyPartnerInterviewBookSituation bookSituation = orderSituationMap.getOrDefault(partnerInterviewInfoVO.getStartTime().replace("/", "-"), new HyPartnerInterviewBookSituation(0, Boolean.FALSE)); - //预约人数 - partnerInterviewInfoVO.setAppointmentCount(bookSituation.getBookingCount()); - //是否被预约 - partnerInterviewInfoVO.setBooked(bookSituation.getBooked()); - } - result.add(partnerInterviewInfoVO); - }); - partnerInterviewInfoList.setList(result); - return partnerInterviewInfoList; - } - - @Override - public PageInfo getQualifiedInterviewList(String userId, String type, Integer pageSize, Integer pageNumber) { - String workflowStatus = ""; - if (CommonConstants.PENDING.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTERVIEW_4.getCode(); - } - if (CommonConstants.FOLLOW.equals(type)) { - workflowStatus = WorkflowStatusEnum.INTERVIEW_5.getCode(); - } - - PageHelper.startPage(pageNumber,pageSize); - //查询预约面试列表 - PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus,Boolean.TRUE)); - List list = partnerInterviewInfoList.getList(); - if (CollectionUtils.isEmpty(list)){ - return partnerInterviewInfoList; - } - List partnerIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerId).collect(Collectors.toList()); - List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIds); - Map userNameMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, Data->Data)); - List userChannelIds = hyPartnerUserInfoDOS.stream().filter(x -> x.getUserChannelId() != null).map(HyPartnerUserInfoDO::getUserChannelId).collect(Collectors.toList()); - Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); - List lineIds = list.stream().map(PartnerInterviewInfoDTO::getPartnerLineId).collect(Collectors.toList()); - List hyPartnerLineInfoDOS= hyPartnerLineInfoDAO.getHyPartnerLineInfoListByIds(lineIds); - Map hyPartnerLineInfoDOMap = hyPartnerLineInfoDOS.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, data -> data)); - List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(PartnerInterviewInfoDTO::getUserPortrait).collect(Collectors.toList()); - Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - List result = new ArrayList<>(); - list.stream().forEach(x->{ - PartnerInterviewInfoVO partnerInterviewInfoVO = convertPartnerInterviewInfoDTOToVo(x,userPortraitMap,userNameMap.get(x.getPartnerId()),channelMap); - partnerInterviewInfoVO.setPartnerName(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getUsername()); - partnerInterviewInfoVO.setPartnerPhone(userNameMap.getOrDefault(x.getPartnerId(),new HyPartnerUserInfoDO()).getMobile()); - partnerInterviewInfoVO.setLineStatus(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getLineStatus()); - partnerInterviewInfoVO.setLineId(hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerLineId(),new HyPartnerLineInfoDO()).getId()); - result.add(partnerInterviewInfoVO); - }); - partnerInterviewInfoList.setList(result); - return partnerInterviewInfoList; - } - - @Override - @Transactional - public void updateInterviewOverTime() throws ApiException { - List overTimeReserveLineList = hyPartnerLineInfoMapper.getOverTimeReserveLineList(new Date(), WorkflowStageEnum.RESERVATION.getCode(), WorkflowStatusEnum.RESERVATION_0.getCode()); - if(CollectionUtils.isEmpty(overTimeReserveLineList)){ - return; - } - List lineIds = overTimeReserveLineList.stream().map(o -> o.getId()).collect(Collectors.toList()); - for (Long lineId : lineIds) { - CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setRejectPublicReason("超时未预约"); - closeFollowRequest.setRejectRealReason("超时未预约"); - closeFollowRequest.setLineId(lineId); - closeFollowRequest.setType("overtime_interview"); - hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); - } - } - - @Override - @Transactional - public void openInterviewRoom() { - //更新会议开始时间为5分钟之内的房间状态为开启,会议状态变为已开始 - Date startTime = new Date(); - - List waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(DateUtil.offsetDay(startTime,-1), DateUtil.offsetMinute(startTime, 5)); - if(CollectionUtils.isEmpty(waitForOpenInterviewLineList)){ - return; - } - //更新房间状态为开启 - List lineIds = waitForOpenInterviewLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); - hyPartnerInterviewPlanMapper.openInterviewRoom(lineIds,RoomStatus.OPEN.getCode()); - interviewDAO.batchUpdateInterviewWorkflowStatus(lineIds,Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); - - //记录日志 - LoginUserInfo user = CurrentUserHolder.getUser(); - AutoOpenInterviewRoomDTO autoOpenInterviewRoomLog = AutoOpenInterviewRoomDTO.builder() - .operateTime(DateUtil.now()).build(); - for (Long lineId : lineIds) { - logService.recordBizLog(user, lineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, autoOpenInterviewRoomLog); - } - } - - @Override - @Transactional - public void updateAbsentInterview() throws ApiException { - Date now = new Date(); - //查询当天未参加的面试 - String startTime = DateUtil.formatDateTime(DateUtil.offsetHour(now,-6)); - String endTime = DateUtil.formatDateTime(now); - GetInterviewListReq getInterviewListReq = new GetInterviewListReq(); - getInterviewListReq.setStartTime(startTime); - getInterviewListReq.setEndTime(endTime); - getInterviewListReq.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_3.getCode())); - getInterviewListReq.setIsPartnerInterview(0); - List interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoList(getInterviewListReq); - if(CollectionUtils.isEmpty(interviewBaseInfoList)){ - return; - } - handleOverTimeInterview(interviewBaseInfoList,"超时未面试"); - } - - @Override - public void approvalReminder() throws ApiException { - //查询即将超时但未审批的面试 - Date startTime = new Date(); - Date endTime = DateUtil.offsetMinute(startTime,30); - List remindInterviewMsgDTOS = hyPartnerInterviewPlanMapper.selectRemindInterviewPlan(startTime, endTime, WorkflowStageEnum.RESERVATION.getCode(), WorkflowStatusEnum.RESERVATION_1.getCode()); - if(CollectionUtils.isEmpty(remindInterviewMsgDTOS)){ - return; - } - //发送消息 - List userIds = remindInterviewMsgDTOS.stream().map(RemindInterviewMsgDTO::getInterviewerId).collect(Collectors.toList()); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIds); - remindInterviewMsgDTOS.stream().forEach(interviewMsgDTO->{ - try { -// SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); -// sendCardMessageDTO.setUserIds(userIds); -// sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); -// sendCardMessageDTO.setMessageUrl(linkUrl); -// sendCardMessageDTO.setTitle("面试预约申请"); -// sendCardMessageDTO.setContent(interviewService.generateFeiShuInterviewMsg(interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime())); - //替换为事件中心发送 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, - Arrays.asList(feishuUserIdsByUserIds.get(interviewMsgDTO.getInterviewerId())), - interviewMsgDTO.getPartnerName(), interviewMsgDTO.getPartnerMobile(), interviewMsgDTO.getStartTime()); - } catch (ApiException e) { - log.error("发送面试提醒消息失败",e); - } - }); - } - - /** - * 统一处理面试超时情况，包括超时未预约和超时未面试 - * @param interviewBaseInfoList - * @param rejectPublicReason - */ - public void handleOverTimeInterview(List interviewBaseInfoList,String rejectPublicReason) throws ApiException { - //1.更新面试信息表中超时的面试信息 - List interviewIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getId).distinct().collect(Collectors.toList()); - hyPartnerInterviewMapper.batchUpdateInterviewStatus(interviewIds,Integer.valueOf(WorkflowStatusEnum.RESERVATION_8.getCode()),1); - //2.更新面试计划表中超时的信息 - List interviewPlanIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getInterviewPlanId).distinct().collect(Collectors.toList()); - hyPartnerInterviewPlanMapper.batchDeleteInterviewPlans(interviewPlanIds); - //3.更新线索表中超时未预约的线路信息 - List lineIds = interviewBaseInfoList.stream().map(HyPartnerInterviewDO::getPartnerLineId).distinct().collect(Collectors.toList()); - for (Long lineId : lineIds) { - CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setRejectPublicReason(rejectPublicReason); - closeFollowRequest.setRejectRealReason(rejectPublicReason); - closeFollowRequest.setLineId(lineId); - closeFollowRequest.setType("overtime_interview"); - hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); - } - } - /** - * convertDoToInterviewDetailInfoVO - * @param hyPartnerInterviewPlanDO - * @return - */ - private InterviewDetailInfoVO convertDoToInterviewDetailInfoVO(HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO){ - InterviewDetailInfoVO interviewDetailInfoVO = new InterviewDetailInfoVO(); - if (hyPartnerInterviewPlanDO==null){ - return interviewDetailInfoVO; - } - interviewDetailInfoVO.setLineId(hyPartnerInterviewPlanDO.getPartnerLineId()); - interviewDetailInfoVO.setStartTime(hyPartnerInterviewPlanDO.getStartTime()); - interviewDetailInfoVO.setInterviewPlanId(hyPartnerInterviewPlanDO.getId()); - return interviewDetailInfoVO; - } - - /** - * PartnerInterviewInfoDTOToVo - * @param partnerInterviewInfoDTO - * @return - */ - private PartnerInterviewInfoVO convertPartnerInterviewInfoDTOToVo(PartnerInterviewInfoDTO partnerInterviewInfoDTO,Map userPortraitMap, HyPartnerUserInfoDO hyPartnerUserInfoDO,Map channelMap){ - PartnerInterviewInfoVO partnerInterviewInfoVO = new PartnerInterviewInfoVO(); - partnerInterviewInfoVO.setInterviewId(partnerInterviewInfoDTO.getInterviewId()); - partnerInterviewInfoVO.setInterviewPlanId(partnerInterviewInfoDTO.getId()); - partnerInterviewInfoVO.setPartnerId(partnerInterviewInfoDTO.getPartnerId()); - partnerInterviewInfoVO.setInterviewerId(partnerInterviewInfoDTO.getInterviewer()); - partnerInterviewInfoVO.setProcessInfo(partnerInterviewInfoDTO.getProcessInfo()); - partnerInterviewInfoVO.setCreateTime(DateUtil.format(partnerInterviewInfoDTO.getCreateTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerInterviewInfoVO.setRoomId(partnerInterviewInfoDTO.getRoomId()); - partnerInterviewInfoVO.setDeadline(DateUtil.format(partnerInterviewInfoDTO.getDeadline(),CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus()); - partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getIntentionContractNo()); - partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerInterviewInfoVO.setApproveTime(DateUtil.format(partnerInterviewInfoDTO.getApproveTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); - partnerInterviewInfoVO.setLastFollowTime(DateUtil.format(partnerInterviewInfoDTO.getLastFollowTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); - Integer callStatus = null; - if(partnerInterviewInfoDTO.getCallStatus()!=null){ - callStatus = partnerInterviewInfoDTO.getCallStatus()==1?partnerInterviewInfoDTO.getCallStatus():0; - } - partnerInterviewInfoVO.setCallStatus(callStatus); - if (hyPartnerUserInfoDO!=null){ - partnerInterviewInfoVO.setUserChannelName(channelMap.get(hyPartnerUserInfoDO.getUserChannelId())); - } - List userPortrait = labelService.getUserPortraitList(userPortraitMap, partnerInterviewInfoDTO.getUserPortrait()); - partnerInterviewInfoVO.setUserPortraitList(userPortrait); - return partnerInterviewInfoVO; - } - - @Override - public void remindInterviewStartTomorrow() throws ApiException { - List tomorrowInterviewInfos = hyPartnerInterviewPlanMapper.getTomorrowInterview(); - SimpleDateFormat timeFormatter = new SimpleDateFormat("HH:mm"); - SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy年MM月dd日"); - Date startTime; - for (HyInterviewRemindDO tomorrowInterviewInfo : tomorrowInterviewInfos) { - startTime = tomorrowInterviewInfo.getStartTime(); - eventCenterHttpRequest.sendSmsVariable(tomorrowInterviewInfo.getMobile(), SMSMsgEnum.INTERVIEW_BEGIN_IN_DAY, timeFormatter.format(startTime), dateFormatter.format(startTime), wechatMiniAppService.getMiniAppUrl()); - } - } - - //每半小时执行一次，查询有无面试时间 x 在当前时间 y < x <= y + 30m 内，有就发短信 - @Override - public void remindInterviewStartMinutes() throws ApiException { - List minutesInterviewInfos = hyPartnerInterviewPlanMapper.remindInterviewStartMinutes(); - for (HyInterviewRemindDO minutesInterviewInfo : minutesInterviewInfos) { - eventCenterHttpRequest.sendSmsVariable(minutesInterviewInfo.getMobile(), SMSMsgEnum.INTERVIEW_BEGIN_IN_MINUTES, wechatMiniAppService.getMiniAppUrl()); - } - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java deleted file mode 100644 index 8f5e583f0..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ /dev/null @@ -1,1198 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.*; -import com.cool.store.dto.buser.UserPositionAndUserScopeDTO; -import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; -import com.cool.store.dto.log.*; -import com.cool.store.dto.partner.*; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.request.*; -import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.*; -import com.cool.store.vo.interview.InterviewVO; -import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Author suzhuhong - * @Date 2023/6/9 10:30 - * @Version 1.0 - */ -@Service -@Slf4j -public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { - - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - @Resource - EnterpriseUserDAO enterpriseUserDAO; - @Resource - private RedisUtilPool redisUtilPool; - @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - @Resource - EnterpriseUserService enterpriseUserService; - @Resource - AliyunService aliyunService; - @Resource - HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - @Resource - HyIntendDevMappingDAO hyIntendDevMappingDAO; - @Resource - HyIntendDevZoneInfoDAO hyIntendDevZoneInfoDAO; - @Resource - InterviewService interviewService; - @Resource - HyPartnerInterviewPlanDAO hyPartnerInterviewPlanDAO; - @Resource - private HyPartnerBaseInfoService hyPartnerBaseInfoService; - @Resource - WorkFlowService workFlowService; - @Resource - HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - @Resource - HyPhoneLocationService hyPhoneLocationService; - @Resource - HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - @Resource - HyPartnerUserChannelDAO hyPartnerUserChannelDAO; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - // @Autowired -// private NoticeService noticeService; - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - @Resource - LabelService labelService; - -// @Autowired -// private SmsService smsService; - - @Resource - HyFollowTaskDAO hyFollowTaskDAO; - @Resource - private HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; - @Resource - SuperAdminConfigDAO superAdminConfigDAO; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Override - public StageCountVO selectStagePendingCount(String userId) { - StageCountDTO stageCountDTO = hyPartnerLineInfoDAO.selectStagePendingCount(userId); - return stageCountDTOToVo(stageCountDTO); - } - - @Override - public StageCountVO selectStageFollowCount(String userId) { - StageCountDTO stageCountDTO = hyPartnerLineInfoDAO.selectStageFollowCount(userId); - return stageCountDTOToVo(stageCountDTO); - } - - @Override - public PartnerLineInfoAndBaseInfoVO selectPartnerLineInfoAndBaseInfo(Long lineId) { - PartnerLineInfoAndBaseInfoDTO partnerLineInfoAndBaseInfoDTO = hyPartnerLineInfoDAO.selectPartnerLineInfoAndBaseInfo(lineId); - if (partnerLineInfoAndBaseInfoDTO == null) { - throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO); - - String userPortrait = partnerLineInfoAndBaseInfoDTO.getUserPortrait(); - if (StringUtils.isNotEmpty(userPortrait)) { - Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait)); - - List userPortraitDTOS = userPortraitMap.entrySet().stream() - .map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue())) - .collect(Collectors.toList()); - partnerLineInfoAndBaseInfoVO.setUserPortrait(userPortraitDTOS); - } - - List userIds = new ArrayList<>(); - if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassUserId())) { - userIds.add(partnerLineInfoAndBaseInfoDTO.getPassUserId()); - } - if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getInvestmentManager())) { - userIds.add(partnerLineInfoAndBaseInfoVO.getInvestmentManager()); - } - if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector())) { - userIds.add(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector()); - } - - List userList = enterpriseUserDAO.getUserInfoByUserIds(userIds); - Map userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); - partnerLineInfoAndBaseInfoVO.setPassUserName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(), new EnterpriseUserDO()).getName()); - partnerLineInfoAndBaseInfoVO.setPassUserMobile(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(), new EnterpriseUserDO()).getMobile()); - partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(), new EnterpriseUserDO()).getName()); - partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(), new EnterpriseUserDO()).getMobile()); - partnerLineInfoAndBaseInfoVO.setDevelopmentDirectorName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector(), new EnterpriseUserDO()).getName()); - partnerLineInfoAndBaseInfoVO.setDevelopmentDirectorMobile(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector(), new EnterpriseUserDO()).getMobile()); - if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getWantShopArea())) { - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea())); - partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ")); - } - //待提交或待审核，此时没有意向通过人信息 - if (partnerLineInfoAndBaseInfoVO.getWorkflowStage().equals(WorkflowStageEnum.INTENT.getCode()) - && (partnerLineInfoAndBaseInfoVO.getWorkflowStatus().equals(WorkflowStatusEnum.INTENT_0.getCode()) || partnerLineInfoAndBaseInfoVO.getWorkflowStatus().equals(WorkflowStatusEnum.INTENT_1.getCode()))) { - return partnerLineInfoAndBaseInfoVO; - } - //如果是会销面试的线索意向申请同意人和同意时间取发起会销面试的人和时间 - if (partnerLineInfoAndBaseInfoVO.getPassUserName() == null && partnerLineInfoAndBaseInfoVO.getPassTime() == null) { - ExhibitionInterviewInfoDTO exhibitionInterviewInfo = partnerExhibitionDAO.getStartInterviewInfo(partnerLineInfoAndBaseInfoVO.getId()); - if (exhibitionInterviewInfo == null) { - return partnerLineInfoAndBaseInfoVO; - } - partnerLineInfoAndBaseInfoVO.setPassUserId(exhibitionInterviewInfo.getUserId()); - partnerLineInfoAndBaseInfoVO.setPassUserName(exhibitionInterviewInfo.getExhibitionInterviewerName()); - partnerLineInfoAndBaseInfoVO.setPassUserMobile(exhibitionInterviewInfo.getExhibitionInterviewerMobile()); - partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(DateUtil.parseDateTime(exhibitionInterviewInfo.getExhibitionInterviewTime()), CoolDateUtils.DATE_FORMAT_SEC_2)); - } - return partnerLineInfoAndBaseInfoVO; - } - - @Override - public PageInfo lastMonthCloseLine(String userId, Integer pageSize, Integer pageNumber) { - PageHelper.startPage(pageNumber, pageSize); - String lastMonthTodayDate = DateUtil.format(CoolDateUtils.getDateBefore(new Date(), -30), CoolDateUtils.DATE_FORMAT_SEC); - PageInfo hyPartnerLineInfoDOPageInfo = new PageInfo(hyPartnerLineInfoDAO.lastMonthCloseLine(userId, lastMonthTodayDate)); - List list = hyPartnerLineInfoDOPageInfo.getList(); - List closeUserIds = list.stream().filter(o -> Objects.nonNull(o.getCloseUserId())).map(HyPartnerLineInfoDO::getCloseUserId).distinct().collect(Collectors.toList()); - Map userNamePhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIds); - List partnerIdList = list.stream().map(HyPartnerLineInfoDO::getPartnerId).collect(Collectors.toList()); - List hyPartnerList = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); - Map partnerMap = hyPartnerList.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data -> data)); - List resultList = PartnerLineInfoVO.convertList(list, userNamePhoneMap, partnerMap); - hyPartnerLineInfoDOPageInfo.setList(resultList); - return hyPartnerLineInfoDOPageInfo; - } - - @Override - @Transactional - public Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request, Boolean sendFlag) throws ApiException { - if (StringUtil.isBlank(request.getUserId()) || request.getLineId() == null) { - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getLineId()); - //如果招商经理是当前登录用户，则无需转让 - if (request.getUserId().equals(hyPartnerLineInfoDO.getInvestmentManager())) { - throw new ServiceException(ErrorCodeEnum.NO_TRANSFER_REQUIRED); - } - //校验 合格资格面试阶段 面试状态已开始 不允许转让 - if (WorkflowStageEnum.INTERVIEW.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.INTERVIEW_3.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_NOT_TRANSFER, WorkflowStatusEnum.INTERVIEW_3.getMessage()); - } - List userIdList = new ArrayList<>(); - userIdList.add(request.getUserId()); - if (StringUtils.isNotEmpty(hyPartnerLineInfoDO.getInvestmentManager())) { - userIdList.add(hyPartnerLineInfoDO.getInvestmentManager()); - } - List userList = enterpriseUserDAO.getUserInfoByUserIds(userIdList); - Map userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); - - //更新面试官（预约面试全阶段和合作资格面试待面试阶段都需要变更面试官） - //待预约状态及之前还未生成面试信息，因此不做变更面试官操作 - if ((WorkflowStageEnum.INTERVIEW.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.INTERVIEW_2.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) - || (WorkflowStageEnum.RESERVATION.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage())) && !WorkflowStatusEnum.RESERVATION_0.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) { - workFlowService.transferInvestmentManager(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), request); - } - //转让招商经理 - hyPartnerLineInfoDAO.updateInvestmentManager(request.getUserId(), Arrays.asList(request.getLineId())); - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - List userIds = Arrays.asList(request.getUserId()); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIds); - List feishuUserIds = new ArrayList<>(feishuUserIdsByUserIds.values()); - //发送飞书工作通知 - if (sendFlag) { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER, feishuUserIds, dateTime, hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile()); - } - //如果是面试预约待审批阶段还要发送面试预约申请通知 - if (WorkflowStageEnum.RESERVATION.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.RESERVATION_1.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) { - HyPartnerInterviewPlanDO interviewPlanByLine = hyPartnerInterviewPlanDAO.getInterviewPlanByLineId(request.getLineId()); - if (interviewPlanByLine != null && interviewPlanByLine.getStartTime() != null) { - String startTime = DateUtil.format(interviewPlanByLine.getStartTime(), CoolDateUtils.DATE_FORMAT_SEC_7); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, feishuUserIds, hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile(), startTime); - } - } - - //作废待完成&已逾期的任务 - hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId()); - - //添加日志 - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.TRANSFER_INVESTMENT_MANAGER, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - TransferInvestmentManagerLogDTO logDTO = TransferInvestmentManagerLogDTO.builder().operateUserId(user.getUserId()).operateUsername(user.getName()) - .beforeInvestmentManagerUsername(userDOMap.getOrDefault(hyPartnerLineInfoDO.getInvestmentManager(), new EnterpriseUserDO()).getName()) - .beforeInvestmentManagerMobile(userDOMap.getOrDefault(hyPartnerLineInfoDO.getInvestmentManager(), new EnterpriseUserDO()).getMobile()) - .afterInvestmentManagerMobile(userDOMap.getOrDefault(request.getUserId(), new EnterpriseUserDO()).getMobile()) - .afterInvestmentManagerUsername(userDOMap.getOrDefault(request.getUserId(), new EnterpriseUserDO()).getName()) - .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - return Boolean.TRUE; - } - - @Override - public List batchTransferInvestmentManager(LoginUserInfo user, BatchTransferInvestmentManagerRequest request) throws ApiException { - if (CollectionUtils.isEmpty(request.getLineIds()) || StringUtils.isEmpty(request.getUserId())) { - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - List result = new ArrayList<>(); - List hyPartnerLineInfoList = hyPartnerLineInfoDAO.getHyPartnerLineInfoList(request.getLineIds(), null); - Map partnerMap = hyPartnerLineInfoList.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getId, HyPartnerLineInfoDO::getPartnerId)); - List partnerIdList = hyPartnerLineInfoList.stream().filter(x -> StringUtils.isNotEmpty(x.getPartnerId())) - .map(HyPartnerLineInfoDO::getPartnerId).distinct().collect(Collectors.toList()); - List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); - Map partnerUserInfoDOMap = hyPartnerUserInfoDOS.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, x -> x)); - List successLineIds = new ArrayList<>(); - for (Long lineId : request.getLineIds()) { - TransferInvestmentManagerRequest transferInvestmentManagerRequest = new TransferInvestmentManagerRequest(); - transferInvestmentManagerRequest.setUserId(request.getUserId()); - transferInvestmentManagerRequest.setLineId(lineId); - try { - this.transferInvestmentManager(user, transferInvestmentManagerRequest, Boolean.FALSE); - successLineIds.add(lineId); - } catch (Exception e) { - log.info("transferInvestmentManager_success Transfer_interview_management_failed,lineId:{}，e:{}", lineId, e.getMessage()); - HyPartnerUserInfoDO hyPartnerUserInfoDO = partnerUserInfoDOMap.get(partnerMap.get(lineId)); - BatchTransferVO batchTransferVO = new BatchTransferVO(); - batchTransferVO.setErrorMessage(e.getMessage()); - if (e instanceof ServiceException) { - batchTransferVO.setErrorMessage(((ServiceException) e).getErrorMessage()); - } - batchTransferVO.setPartnerMobile(hyPartnerUserInfoDO.getMobile()); - batchTransferVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); - result.add(batchTransferVO); - } - } - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(Arrays.asList(request.getUserId())); - ArrayList feishuUserIds = new ArrayList<>(feishuUserIdsByUserIds.values()); - try { - if (successLineIds.size() > 1) { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.BATCH_TRANS_INVESTMENT_MANAGER, feishuUserIds, successLineIds.size(), DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7)); - } else if (successLineIds.size() == 1) { - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - HyPartnerUserInfoDO hyPartnerUserInfoDO = partnerUserInfoDOMap.get(partnerMap.get(successLineIds.get(0))); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER, feishuUserIds, dateTime, hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile()); - } - } catch (Exception e) { - log.info("batchTransferInvestmentManager_error:{}", e.getMessage()); - } - return result; - } - - @Override - public Boolean allocationInvestmentManager(LoginUserInfo operateUser, String userId, List lineIdList) { - if (StringUtils.isEmpty(userId) || CollectionUtils.isEmpty(lineIdList)) { - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(userId); - if (user == null) { - throw new ServiceException(ErrorCodeEnum.INVESTMENT_MANAGER_NOT_EXIST); - } - //加盟上线索集合 - List partnerLineInfoList = hyPartnerLineInfoDAO.getLineListByLineIds(lineIdList); - //过滤出已结束的线索 这块线索需要重新生成新的线索 - List closeLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() != null).collect(Collectors.toList()); - List closeLineIdList = closeLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); - - //已结束的线索 需要重新生成一条新的线索 - List list = new ArrayList<>(); - closeLineList.stream().forEach(x -> { - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setPartnerId(x.getPartnerId()); - hyPartnerLineInfoDO.setInvestmentManager(userId); - hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - hyPartnerLineInfoDO.setLineStatus(1); - hyPartnerLineInfoDO.setAllotTime(new Date()); - list.add(hyPartnerLineInfoDO); - }); - hyPartnerLineInfoDAO.batchInsert(list); - List hyPartnerBaseInfoDOS = new ArrayList<>(); - list.forEach(x -> { - HyPartnerBaseInfoDO newHyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); - newHyPartnerBaseInfoDO.setPartnerId(x.getPartnerId()); - newHyPartnerBaseInfoDO.setPartnerLineId(x.getId()); - hyPartnerBaseInfoDOS.add(newHyPartnerBaseInfoDO); - }); - hyPartnerBaseInfoDAO.batchInsert(hyPartnerBaseInfoDOS); - //将老的线索置为删除状态 - hyPartnerLineInfoDAO.batchDeleted(closeLineIdList); - //没有结束的线索直接分配招商经理 - List otherLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() == null).collect(Collectors.toList()); - List otherLineIdList = otherLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); - hyPartnerLineInfoDAO.updateInvestmentManager(userId, otherLineIdList); - //添加日志 - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(Arrays.asList(userId)); - for (HyPartnerLineInfoDO hyPartnerLineInfoDO : partnerLineInfoList) { - //给招商经理发送飞书工作通知 - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - try { - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER, Arrays.asList(feishuUserIdsByUserIds.get(userId)), dateTime, hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile()); - } catch (ApiException e) { - throw new RuntimeException(e); - } - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), operateUser.getUserId(), - operateUser.getName(), OperateTypeEnum.ALLOCATION_INVESTMENT_MANAGER, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - AllocationInvestmentManagerLogDTO logDTO = AllocationInvestmentManagerLogDTO.builder().allocationUserId(operateUser.getUserId()).allocationUsername(operateUser.getName()) - .mobile(operateUser.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - } - return Boolean.TRUE; - } - - @Override - public PageInfo getBlackList(LineRequest LineRequest) { - String intentAreaName = getIntentAreaName(LineRequest.getIntentArea()); - PageHelper.startPage(LineRequest.getPageNum(), LineRequest.getPageSize()); - PageInfo blackListDTOPageInfo = new PageInfo(hyPartnerLineInfoDAO.getBlackList(LineRequest.getUserNameKeyword(), LineRequest.getPhoneKeyword(), intentAreaName, LineRequest.getAcceptAdjustType())); - List list = blackListDTOPageInfo.getList(); - List closeUserIdList = list.stream().map(PartnerBlackListDTO::getCloseUserId).collect(Collectors.toList()); - Map userPhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIdList); - List result = new ArrayList<>(); - list.stream().forEach(x -> { - BlackListVO blackListVO = convertPartnerBlackListDTOToVo(x); - blackListVO.setCloseUserPhone(userPhoneMap.get(x.getCloseUserId())); - blackListVO.setCloseUserName(userPhoneMap.get(x.getCloseUserId())); - result.add(blackListVO); - }); - blackListDTOPageInfo.setList(result); - return blackListDTOPageInfo; - } - - @Override - public Boolean joinBlackList(LoginUserInfo user, Long lineId, Integer status, String joinReason) throws ApiException { - if (lineId == null) { - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyPartnerLineInfoDO line = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - Integer lineStatus = line.getLineStatus(); - //加入黑名单 阶段回到第一步待提交状态 - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(lineId); - hyPartnerLineInfoDO.setLineStatus(status); - hyPartnerLineInfoDO.setJoinBlackReason(joinReason); - hyPartnerLineInfoDO.setRejectRealReason(joinReason); - hyPartnerLineInfoDO.setCloseTime(new Date()); - hyPartnerLineInfoDO.setCloseUserId(user.getUserId()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - - hyFollowTaskDAO.cancelUndoFollowTask(lineId); - - //公海线索不需要处理子流程线索 - if (!LineStatusEnum.PUBLIC_SEAS.getCode().equals(lineStatus)) { - CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); - closeFollowRequest.setLineId(lineId); - closeFollowRequest.setRejectRealReason(joinReason); - closeFollowRequest.setWhetherBlackList(1); - workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()), closeFollowRequest); - } - - //添加日志 - LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.ADD_BLACKLIST, - WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()), - line.getWorkflowStatus(), ""); - BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(user.getUserId()).reason(joinReason).operateUsername(user.getName()) - .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - - return Boolean.TRUE; - } - - @Override - public Boolean removeBlackList(LoginUserInfo user, Long lineId, Integer status, String removeReason) { - //移除黑名单 黑名单线索置为删除状态 新增一条线索 - if (lineId == null) { - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyPartnerLineInfoDO hyPartnerLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(lineId); - hyPartnerLineInfoDO.setRemoveBlackReason(removeReason); - hyPartnerLineInfoDO.setDeleted(Boolean.TRUE); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - - - HyPartnerLineInfoDO newHyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - newHyPartnerLineInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId()); - newHyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - newHyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - newHyPartnerLineInfoDO.setLineStatus(status); - hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO); - - HyPartnerBaseInfoDO oldHyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(lineId); - - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); - hyPartnerBaseInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId()); - hyPartnerBaseInfoDO.setPartnerLineId(newHyPartnerLineInfoDO.getId()); - hyPartnerBaseInfoDO.setUserPortrait(oldHyPartnerBaseInfoDO.getUserPortrait()); - hyPartnerBaseInfoDAO.insertSelective(hyPartnerBaseInfoDO); - - //添加日志 - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfo.getPartnerId(), hyPartnerLineInfo.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.REMOVE_BLACKLIST, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfo.getWorkflowStage()), - hyPartnerLineInfo.getWorkflowStatus(), ""); - BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(user.getUserId()).reason(removeReason).operateUsername(user.getName()) - .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - return Boolean.TRUE; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean closeOrPassFollow(LoginUserInfo user, CloseFollowRequest closeFollowRequest) throws ApiException { - //该方法中user可能为空，注意处理空指针的情况 - if (user == null) { - user = new LoginUserInfo(); - } - - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(closeFollowRequest.getLineId()); - if (hyPartnerLineInfoDO == null) { - throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - if (hyPartnerLineInfoDO.getLineStatus() == 0) { - throw new ServiceException(ErrorCodeEnum.PUBLIC_LINE_NOT_OPERATE); - } - String oldWorkflowStage = hyPartnerLineInfoDO.getWorkflowStage(); - String oldWorkflowStatus = hyPartnerLineInfoDO.getWorkflowStatus(); - //通过 - if ("pass".equals(closeFollowRequest.getType())) { - hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.RESERVATION.getCode()); - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_0.getCode()); - hyPartnerLineInfoDO.setDeadline(CoolDateUtils.getDateFormatDay(new Date(), 2)); - hyPartnerLineInfoDO.setPassReason(closeFollowRequest.getPassReason()); - if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())) { - hyPartnerLineInfoDO.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile())); - } - HyPartnerBaseInfoDO hy = hyPartnerBaseInfoDAO.getByPartnerLineId(hyPartnerLineInfoDO.getId()); - hy.setPassReason(closeFollowRequest.getPassReason()); - hy.setPassTime(new Date()); - hy.setPassUserId(user.getUserId()); - if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())) { - hy.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile())); - } - hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hy); - eventCenterHttpRequest.sendSmsVariable(hy.getMobile(), SMSMsgEnum.INTENTION_APPLY_PASS, DateUtil.formatDateTime(hyPartnerLineInfoDO.getDeadline()), wechatMiniAppService.getMiniAppUrl()); - } - - //拒绝 - if ("reject".equals(closeFollowRequest.getType())) { - //当前节点 拒绝的子状态 - String workflowStatus = WorkflowStageEnum.getWorkflowStageMap().get(hyPartnerLineInfoDO.getWorkflowStage()); - hyPartnerLineInfoDO.setWorkflowStatus(workflowStatus); - //15天 冷静期 - String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, closeFollowRequest.getLineId()); - redisUtilPool.setString(coolingPeriodFirstLoginCacheKey, JSONObject.toJSONString(closeFollowRequest)); - hyPartnerLineInfoDO.setDeadline(CoolDateUtils.getDateBefore(new Date(), 15)); - hyPartnerLineInfoDO.setRejectPublicReason(closeFollowRequest.getRejectPublicReason()); - hyPartnerLineInfoDO.setRejectRealReason(closeFollowRequest.getRejectRealReason()); - if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())) { - hyPartnerLineInfoDO.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile())); - } - hyPartnerLineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); - hyPartnerLineInfoDO.setCloseTime(new Date()); - hyPartnerLineInfoDO.setCloseUserId(user.getUserId()); - //是否参加会销（这里做更新只是为了数据一致性，实际应该没必要） - hyPartnerLineInfoDO.setWhetherInExhibition(Boolean.FALSE); - //作废待完成&已逾期的任务 - hyFollowTaskDAO.cancelUndoFollowTask(closeFollowRequest.getLineId()); - //标记删除线索参加的会销信息 - partnerExhibitionDAO.deleteAllByLineId(closeFollowRequest.getLineId()); - //各阶段单独的逻辑 - closeFollowRequest.setWhetherBlackList(0); - workFlowService.endProcess(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), closeFollowRequest); - } - - //面试超时 - if ("overtime_interview".equals(closeFollowRequest.getType())) { - //面试超时未预约 - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_8.getCode()); - //15天 冷静期 - String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, closeFollowRequest.getLineId()); - redisUtilPool.setString(coolingPeriodFirstLoginCacheKey, JSONObject.toJSONString(closeFollowRequest)); - hyPartnerLineInfoDO.setDeadline(CoolDateUtils.getDateBefore(new Date(), 15)); - hyPartnerLineInfoDO.setRejectPublicReason(closeFollowRequest.getRejectPublicReason()); - hyPartnerLineInfoDO.setRejectRealReason(closeFollowRequest.getRejectRealReason()); - hyPartnerLineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); - hyPartnerLineInfoDO.setCloseTime(new Date()); - //作废待完成&已逾期的任务 - hyFollowTaskDAO.cancelUndoFollowTask(closeFollowRequest.getLineId()); - } - hyPartnerLineInfoDO.setUpdateTime(new Date()); - hyPartnerLineInfoDO.setUpdateUserId(user.getUserId()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - - - //通过 拒绝添加日志 - if (WorkflowStageEnum.INTENT.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && "reject".equals(closeFollowRequest.getType())) { - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.CLOSE_FOLLOW, - WorkflowStageEnum.getWorkflowStageByCode(oldWorkflowStage), - oldWorkflowStatus, ""); - CloseOrPassFollowLogDTO log = CloseOrPassFollowLogDTO.builder().operateUserId(user.getUserId()).passReason(closeFollowRequest.getPassReason()).rejectRealReason(closeFollowRequest.getRejectRealReason()) - .operateUsername(user.getName()).rejectPublicReason(closeFollowRequest.getRejectPublicReason()).certifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile())) - .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(log); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - } - return Boolean.TRUE; - } - - - @Override - public PageInfo publicSeaLineList(String userId, LineRequest lineRequest) { - //确认是招商经理还是部门负责人 -// EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); -// List userIds = new ArrayList<>(); -// if (userInfo.getIsLeader()){ -// if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){ -// List regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class); -// List enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true); -// userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); -// } -// }else { -// userIds = Arrays.asList(userId); -// } - String intentAreaName = getIntentAreaName(lineRequest.getIntentArea()); - PageHelper.startPage(lineRequest.getPageNum(), lineRequest.getPageSize()); - PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), - intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null, lineRequest.getCreateStartTime(), lineRequest.getCreateEndTime())); - - List list = publicSeaLineList.getList(); - if (CollectionUtils.isEmpty(list)) { - return new PageInfo<>(); - } - //上一次结束的线索 - List partnerIdList = list.stream().map(PublicSeaLineDTO::getPartnerId).collect(Collectors.toList()); - List partnerLastLine = hyPartnerLineInfoDAO.getPartnerLastLine(partnerIdList); - List investmentManagerIds = partnerLastLine.stream().map(HyPartnerLineInfoDO::getInvestmentManager).collect(Collectors.toList()); - List userInfoList = enterpriseUserDAO.getUserInfoByUserIds(investmentManagerIds); - Map nameMobileMap = userInfoList.stream().filter(x -> - StringUtil.isNotEmpty(x.getMobile())).collect(Collectors.toMap(EnterpriseUserDO::getUserId, v -> v.getName() + " " + v.getMobile())); - Map hyPartnerLineInfoDOMap = partnerLastLine.stream().collect(Collectors.toMap(HyPartnerLineInfoDO::getPartnerId, data -> data)); - - List followCountList = hyPartnerLineInfoDAO.getFollowCountList(partnerIdList); - Map countMap = followCountList.stream().collect(Collectors.toMap(LineCountDTO::getPartnerId, LineCountDTO::getFollowCount)); - - List wantShopAreaList = list.stream().map(PublicSeaLineDTO::getWantShopArea).filter(Objects::nonNull).map(Long::parseLong).distinct().collect(Collectors.toList()); - Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); - - List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PublicSeaLineDTO::getUserChannelId).collect(Collectors.toList()); - Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); - - List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait())).map(PublicSeaLineDTO::getUserPortrait).collect(Collectors.toList()); - Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - List result = new ArrayList<>(); - list.forEach(x -> { - PublicSeaLineListVo publicSeaLineListVo = new PublicSeaLineListVo(); - publicSeaLineListVo.setPartnerId(x.getPartnerId()); - publicSeaLineListVo.setCreateTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - publicSeaLineListVo.setPartnerUserName(x.getUserName()); - publicSeaLineListVo.setPartnerUserPhone(x.getMobile()); - String phoneAddress = x.getPhoneAddress(); - if (StringUtils.isEmpty(phoneAddress)) { - phoneAddress = hyPhoneLocationService.handleHyPhoneAddress(x.getMobile()); - } - publicSeaLineListVo.setPhoneAddress(phoneAddress); - publicSeaLineListVo.setWantShopArea(x.getWantShopArea()); - publicSeaLineListVo.setEcWantShopArea(x.getEcWantShopArea()); - publicSeaLineListVo.setUpdateTime(DateUtil.format(x.getUpdateTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - publicSeaLineListVo.setId(x.getLineId()); - publicSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); - publicSeaLineListVo.setFollowCount(countMap.getOrDefault(x.getPartnerId(), 0)); - HyPartnerLineInfoDO hy = hyPartnerLineInfoDOMap.getOrDefault(x.getPartnerId(), new HyPartnerLineInfoDO()); - publicSeaLineListVo.setRejectPublicReason(hy.getRejectPublicReason()); - publicSeaLineListVo.setRejectRealReason(hy.getRejectRealReason()); - publicSeaLineListVo.setWantShopAreaName(wantShopAreaNameMap.get(x.getWantShopArea())); - String closeTime = DateUtil.format(hy.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_2); - publicSeaLineListVo.setLastCloseDate(closeTime); - publicSeaLineListVo.setLastInvestmentManager(nameMobileMap.get(hy.getInvestmentManager())); - List userPortrait = labelService.getUserPortraitList(userPortraitMap, x.getUserPortrait()); - publicSeaLineListVo.setUserPortraitList(userPortrait); - publicSeaLineListVo.setUserChannelName(channelMap.get(x.getUserChannelId())); - result.add(publicSeaLineListVo); - }); - publicSeaLineList.setList(result); - return publicSeaLineList; - } - - - @Override - public PageInfo privateSeaLineList(String userId, PrivateSeaLineListRequest request,Boolean allPrivateSeaFlag) { - //allPrivateSeaFlag 为true的时候 查询全量私海 - // V1.5.2 修改allPrivateSeaFlag 为False 查询我的线索 为true时根据是否是超管或者主管查询数据 - UserPositionAndUserScopeDTO userIdsByScope = new UserPositionAndUserScopeDTO(); - //如果是查询团队线索 判断是否是超管 不是超管 判断是是否是主管 - if (allPrivateSeaFlag){ - //如果不是超管 查询个人数据或者主管数据 如果是超管 查询所有数据 - if (!isSuperAdmin(userId)){ - userIdsByScope = enterpriseUserService.getUserIdsByScope(userId); - } - }else { - //如果是查询我的线索 只需要查询招商经理或者开发经理是我的线索 - userIdsByScope.setDevelopmentUserIds(Arrays.asList(userId)); - userIdsByScope.setInvestmentUserIds(Arrays.asList(userId)); - } - String intentAreaName = getIntentAreaName(request.getIntentAreaId()); - PageHelper.startPage(request.getPageNum(),request.getPageSize()); - handleReq(request, intentAreaName,userIdsByScope); - PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request)); - List list = privateLineList.getList(); - if (CollectionUtils.isEmpty(list)){ - return privateLineList; - } - List lindIds = list.stream().map(PrivateSeaLineDTO::getLineId).collect(Collectors.toList()); - List exhibitionLineIds = list.stream().filter(PrivateSeaLineDTO::getWhetherInExhibition).map(PrivateSeaLineDTO::getLineId).collect(Collectors.toList()); - //查询处在会销面试中的线索 - List partnerExhibitions = new ArrayList<>(); - if (CollUtil.isNotEmpty(exhibitionLineIds)) { - partnerExhibitions = partnerExhibitionDAO.queryListByLineIds(exhibitionLineIds, ExhibitionPartnerStatus.INTERVIEWING.getCode()); - } - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanDAO.getHyPartnerInterviewPlanByLineIds(lindIds); - Map hyPartnerInterviewPlanDOMap = hyPartnerInterviewPlanDOS.stream().collect(Collectors.toMap(HyPartnerInterviewPlanDO::getPartnerLineId, data -> data)); - - Map devManagerMap = new HashMap<>(); - List devManagerIdList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getDevelopmentManager())).map(PrivateSeaLineDTO::getDevelopmentManager).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(devManagerIdList)) { - List devManagerList = enterpriseUserDAO.getUserInfoByUserIds(devManagerIdList); - devManagerMap = devManagerList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName)); - } - List wantShopAreaList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getWantShopArea())).map(PrivateSeaLineDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList()); - Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); - - List userChannelIds = list.stream().filter(x -> x.getUserChannelId() != null).map(PrivateSeaLineDTO::getUserChannelId).collect(Collectors.toList()); - Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(userChannelIds); - - List userPortraitList = list.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait())).map(PrivateSeaLineDTO::getUserPortrait).collect(Collectors.toList()); - Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); - - List result = PrivateSeaLineListVo.convertList(list, devManagerMap, wantShopAreaNameMap, hyPartnerInterviewPlanDOMap, channelMap, userPortraitMap, partnerExhibitions); - privateLineList.setList(result); - return privateLineList; - } - - private Boolean isSuperAdmin(String userId){ - SuperAdminConfigDO superAdmin = superAdminConfigDAO.isSuperAdmin(userId); - if (superAdmin!=null){ - return Boolean.TRUE; - } - return Boolean.FALSE; - } - - - @Override - public PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId) { - PartnerLineBaseInfoVO lineBaseInfoVO = new PartnerLineBaseInfoVO(); - // todo wxp 需要加条件 - HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId); - BeanUtil.copyProperties(lineInfoDO, lineBaseInfoVO); - String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, lineInfoDO.getId()); - String value = redisUtilPool.getString(coolingPeriodFirstLoginCacheKey); - lineBaseInfoVO.setCoolDownFirstLoginFlag(StringUtils.isNotBlank(value)); - lineBaseInfoVO.setPartnerLineId(lineInfoDO.getId()); - lineBaseInfoVO.setCause(lineInfoDO.getRejectPublicReason()); - - return lineBaseInfoVO; - } - - @Override - public List getLineFollowHistory(String partnerId) { - List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); - if (CollectionUtils.isEmpty(lineFollowHistoryList)) { - return new ArrayList<>(); - } - List result = new ArrayList<>(); - lineFollowHistoryList.forEach(x -> { - LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO(); - lineFollowHistoryVO.setCloseCause(x.getRejectRealReason()); - lineFollowHistoryVO.setCloseTime(DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - result.add(lineFollowHistoryVO); - }); - return result; - } - - @Override - public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType, Boolean flag) { - log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}", partnerId, wantShopArea, acceptAdjustType); - - if (!flag) { - return Boolean.FALSE; - } - List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); - //如果跟进次数大于1 直接使用上一次的招商经理 - if (CollectionUtils.isNotEmpty(lineFollowHistoryList)) { - return Boolean.TRUE; - } - //当前加盟商线索 - HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId); - //如果意向区域没有绑定战区 不分配招商经理 - HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "intent"); - if (hyIntendDevelopementMappingDO == null) { - log.info("如果意向区域没有绑定战区 不分配招商经理"); - return Boolean.FALSE; - } - List result = new ArrayList<>(); - if (hyIntendDevelopementMappingDO != null) { - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(hyIntendDevelopementMappingDO.getMappingId()); - if (hyIntendDevZoneInfoDO != null && StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())) { - List list = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class); - result.addAll(list); - } - } - List userListByRegionIds = enterpriseUserDAO.getUserListByRegionIds(result); - if (CollectionUtils.isEmpty(userListByRegionIds)) { - log.info("意向区域绑定战区 但是战区绑定的组织机构下没人 不分配"); - return Boolean.FALSE; - } - - //如果是私海线索 不需要重新分配招商经理 - if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus() == 1)) { - log.info("如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1 lineStatus:{}", HyPartnerLineInfo.getLineStatus()); - return Boolean.FALSE; - } - - if (HyPartnerLineInfo == null) { - Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType); - return lineStatus; - } - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType()); - log.info("lineStatus:{}", lineStatus); - return lineStatus; - } - - /** - * 线索状态 - * - * @param wantShopAreaId - * @param acceptAdjustType - * @return - */ - @Override - public Boolean getLineStatus(Long wantShopAreaId, Integer acceptAdjustType) { - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(wantShopAreaId); - - if (AreaStatusEnum.OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.KEY_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())) { - return Boolean.TRUE; - } - if (AreaStatusEnum.NOT_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.SATURATED.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())) { - if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(acceptAdjustType)) { - return Boolean.FALSE; - } - //全国调剂 默认分配呗 有啥好说的 - if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(acceptAdjustType)) { - return Boolean.TRUE; - } - //省内调剂 有重点或者开放的 分配 - if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(acceptAdjustType)) { - List hyOpenAreaInfoDOList = new ArrayList<>(); - if (hyOpenAreaInfoDO != null) { - String areaPath = hyOpenAreaInfoDO.getAreaPath(); - String province = areaPath.substring(0, areaPath.indexOf("/", areaPath.indexOf("/") + 1)); - hyOpenAreaInfoDOList = hyOpenAreaInfoDAO.queryByKeyword(province, true, null, true); - //过滤一级目录 - hyOpenAreaInfoDOList = hyOpenAreaInfoDOList.stream().filter(x -> x.getParentId() != null).collect(Collectors.toList()); - } - if (hyOpenAreaInfoDOList.size() > CommonConstants.ZERO) { - return Boolean.TRUE; - } - return Boolean.FALSE; - } - //市内调剂 不分配 - if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(acceptAdjustType)) { - return Boolean.FALSE; - } - } - return Boolean.FALSE; - } - - - @Override - public String getAssignFollowUser(String partnerId, String type) { - //查询意向区域 - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - List lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); - //如果跟进次数大于1 直接使用上一次的招商经理 - if (CollectionUtils.isNotEmpty(lineFollowHistoryList)) { - return lineFollowHistoryList.get(0).getInvestmentManager(); - } - //意向区域 - String wantShopArea = hyPartnerUserInfoDO.getWantShopArea(); - //查询意向区域绑定的组织架构 没有绑定战区 分配空 - HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), type); - List result = new ArrayList<>(); - if (hyIntendDevelopementMappingDO != null) { - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(hyIntendDevelopementMappingDO.getMappingId()); - if (hyIntendDevZoneInfoDO != null && StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())) { - List list = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class); - result.addAll(list); - } - } - String userId = ""; - List userListByRegionIds = enterpriseUserDAO.getUserListByRegionIds(result); - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(hyIntendDevelopementMappingDO.getMappingId()); - if (CollectionUtils.isNotEmpty(userListByRegionIds)) { - List userIdList = userListByRegionIds.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); - int i = userIdList.indexOf(hyIntendDevZoneInfoDO.getLastAllotUserId()); - if (i == (userListByRegionIds.size() - 1)) { - i = -1; - } - userId = userIdList.get(++i); - } - //上次分配的招商经理 记录 - if ("intent".equals(type)) { - hyIntendDevZoneInfoDO.setLastAllotUserId(userId); - hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO); - } - return userId; - } - - @Override - public InterviewVO getInterviewInfo(Long lineId, Boolean needDevelopmentDirector) throws ApiException { - Long interviewId = hyPartnerInterviewPlanDAO.selectInterviewIdByLineId(lineId); - QueryByInterviewPlanIdReq queryByInterviewPlanIdReq = new QueryByInterviewPlanIdReq(); - if (interviewId != null) { - queryByInterviewPlanIdReq.setInterviewPlanId(String.valueOf(interviewId)); - queryByInterviewPlanIdReq.setNeedDevelopmentDirector(needDevelopmentDirector); - return interviewService.getInterviewInfo(queryByInterviewPlanIdReq); - } - return null; - } - - @Override - public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType, Boolean assignFlag, String investmentManagerId) throws ApiException { - // 生成一条线索 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId); - //短信拼接了招商经理 直接使用 不需要走自动分配的逻辑 其他方式 走自动分配 - String investmentManager = null; - Boolean flag = Boolean.FALSE; - if (StringUtils.isNotEmpty(investmentManagerId)) { - investmentManager = investmentManagerId; - flag = Boolean.TRUE; - } else { - flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType, assignFlag); - if (flag) { - investmentManager = getAssignFollowUser(partnerId, "intent"); - } - } - if (hyPartnerLineInfoDO == null) { - hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setPartnerId(partnerId); - hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); - hyPartnerLineInfoDO.setInvestmentManager(investmentManager); - hyPartnerLineInfoDO.setAllotTime(new Date()); - hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); - } else { - if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())) { - hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); - hyPartnerLineInfoDO.setInvestmentManager(investmentManager); - hyPartnerLineInfoDO.setAllotTime(new Date()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - } - } - //发送飞书工作通知 - if (flag) { - List userIdList = new ArrayList<>(); - userIdList.add(investmentManager); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIdList); - ArrayList feishuUserIds = new ArrayList<>(feishuUserIdsByUserIds.values()); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER, feishuUserIds, dateTime, hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile()); - } - return hyPartnerLineInfoDO; - } - - @Override - public Long checkGenerateNewLineId(Long lineId) throws ApiException { - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - // 15天之后可以继续填写意向信息，把之前的线索删除 - if (hyPartnerLineInfoDO != null && hyPartnerLineInfoDO.getDeadline() != null && - DateUtil.offsetSecond(hyPartnerLineInfoDO.getDeadline(), -2).before(new Date())) { - //将老的线索置为删除状态 - hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId())); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - // 生成一条新线索 生成新线索的时候不需要公海到私海 - HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(), Boolean.FALSE, null); - // 生成一条意向基本信息 - HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId); - hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait()); - return newLineInfoDO.getId(); - } - return hyPartnerLineInfoDO.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer editBaseInfo(EditBaseInfoRequest request) { - HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId()); - if (Objects.isNull(lineInfo)) { - throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - HyPartnerUserInfoDO partnerUserInfo = hyPartnerUserInfoDAO.selectByMobile(request.getMobile()); - if (Objects.nonNull(partnerUserInfo) && !lineInfo.getPartnerId().equals(partnerUserInfo.getPartnerId())) { - throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_EXIST_0); - } - HyPartnerUserInfoDO update = new HyPartnerUserInfoDO(); - update.setPartnerId(lineInfo.getPartnerId()); - update.setUsername(request.getUsername()); - update.setMobile(request.getMobile()); - update.setWantShopArea(request.getWantShopArea()); - update.setAcceptAdjustType(request.getAcceptAdjustType()); - hyPartnerUserInfoDAO.updateByPartnerId(update); - hyPartnerBaseInfoDAO.updateByPartnerId(request.getUsername(), request.getMobile(), lineInfo.getPartnerId()); - HyPartnerIntentInfoDO updateIntentInfo = new HyPartnerIntentInfoDO(); - updateIntentInfo.setPartnerLineId(request.getPartnerLineId()); - updateIntentInfo.setAcceptAdjustType(request.getAcceptAdjustType()); - updateIntentInfo.setWantShopArea(request.getWantShopArea()); - hyPartnerIntentInfoDAO.updateByPartnerLineId(updateIntentInfo); - return null; - } - - @Override - public PartnerSimpleBaseInfoVO queryBaseInfo(Long partnerLineId) { - HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(partnerLineId); - if (Objects.isNull(lineInfo)) { - return null; - } - HyPartnerUserInfoDO partnerUserInfo = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); - HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoDAO.getByPartnerLineId(partnerLineId); - PartnerSimpleBaseInfoVO result = PartnerSimpleBaseInfoVO.convertVO(partnerLineId, partnerUserInfo); - String userPortrait = Optional.ofNullable(partnerBaseInfo).map(o -> o.getUserPortrait()).orElse(null); - Long partnerBaseInfoId = Optional.ofNullable(partnerBaseInfo).map(o -> o.getId()).orElse(null); - result.setPartnerBaseInfoId(partnerBaseInfoId); - if (StringUtils.isNotEmpty(userPortrait) && Objects.nonNull(result)) { - Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait)); - List userPortraitList = userPortraitMap.entrySet().stream() - .map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue())) - .collect(Collectors.toList()); - result.setUserPortrait(userPortraitList); - } - return result; - } - - @Override - public LinePageInfoVo privateSeaPageDetailNext(String userId, PrivateSeaLineListRequest request, Boolean allPrivateSeaFlag) { - request.setPageNum((int) Math.ceil((double) request.getPageNum() / request.getPageSize())); - //allPrivateSeaFlag 为true的时候 查询全量私海 - // V1.5.2 修改allPrivateSeaFlag 为False 查询我的线索 为true时根据是否是超管或者主管查询数据 - UserPositionAndUserScopeDTO userIdsByScope = new UserPositionAndUserScopeDTO(); - //如果是查询团队线索 判断是否是超管 不是超管 判断是是否是主管 - if (allPrivateSeaFlag){ - //如果不是超管 查询个人数据或者主管数据 如果是超管 查询所有数据 - if (!isSuperAdmin(userId)){ - userIdsByScope = enterpriseUserService.getUserIdsByScope(userId); - } - }else { - //如果是查询我的线索 只需要查询招商经理或者开发经理是我的线索 - userIdsByScope.setDevelopmentUserIds(Arrays.asList(userId)); - userIdsByScope.setInvestmentUserIds(Arrays.asList(userId)); - } - String intentAreaName = getIntentAreaName(request.getIntentAreaId()); - Integer pageNum = request.getPageNum(); - Integer pageSize = request.getPageSize(); - handleReq(request, intentAreaName,userIdsByScope); - int limit1 = (pageNum - 1) * pageSize == 0 ? 0 : (pageNum - 1) * pageSize - 1; - request.setLimit1(limit1); - request.setLimit2(pageSize + 2); - List linePageInfoVo = hyPartnerLineInfoDAO.getPrivateSeaPageInfoNext(request); - Optional first = Stream.iterate(0, i -> i + 1).limit(linePageInfoVo.size()).filter(item -> request.getLineId().equals(linePageInfoVo.get(item).getLineId())).findFirst(); - if (!first.isPresent()) { - return null; - } - if (PageTurnTypeEnum.NEXT.getText().equals(request.getPageTurn())) { - //下一页 - return first.get() +1>=linePageInfoVo.size()?null:linePageInfoVo.get(first.get() +1); - } - if (PageTurnTypeEnum.PREVIOUS.getText().equals(request.getPageTurn())) { - //上一页 - return first.get() - 1<0?null:linePageInfoVo.get(first.get() - 1); - } - return null; - } - - /** - * 处理请求参数 - * @param request - * @param intentAreaName - * @param userIdsByScope - */ - private void handleReq(PrivateSeaLineListRequest request,String intentAreaName,UserPositionAndUserScopeDTO userIdsByScope){ - request.setIntentAreaName(intentAreaName); - request.setDevelopmentManagerList(userIdsByScope.getDevelopmentUserIds()); - request.setUserIdList(userIdsByScope.getInvestmentUserIds()); - } - - @Override - public LinePageInfoVo publicSeaPageDetailNext(String userId, LineRequest lineRequest) { - lineRequest.setPageNum((int) Math.ceil((double) lineRequest.getPageNum() / lineRequest.getPageSize())); - String intentAreaName = getIntentAreaName(lineRequest.getIntentArea()); - Integer pageNum = lineRequest.getPageNum(); - Integer pageSize = lineRequest.getPageSize(); - List linePageInfoVoList = hyPartnerLineInfoDAO.getPublicSeaPageInfoNext(lineRequest.getLineId(), lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), - intentAreaName, lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null, lineRequest.getCreateStartTime(), lineRequest.getCreateEndTime(),lineRequest.getPageTurn() - , (pageNum - 1) * pageSize == 0 ? 0 : (pageNum - 1) * pageSize - 1, pageSize + 2); - Optional first = Stream.iterate(0, i -> i + 1).limit(linePageInfoVoList.size()).filter(item -> lineRequest.getLineId().equals(linePageInfoVoList.get(item).getLineId())).findFirst(); - if (!first.isPresent()) { - return null; - } - if (PageTurnTypeEnum.NEXT.getText().equals(lineRequest.getPageTurn())) { - //下一页 - return first.get() +1>=linePageInfoVoList.size()?null:linePageInfoVoList.get(first.get() +1); - } - if (PageTurnTypeEnum.PREVIOUS.getText().equals(lineRequest.getPageTurn())) { - //上一页 - return first.get() - 1<0?null:linePageInfoVoList.get(first.get() - 1); - } - return null; - } - - - /** - * convertPartnerBlackListDTOToVo - * - * @param partnerBlackListDTO - * @return - */ - public BlackListVO convertPartnerBlackListDTOToVo(PartnerBlackListDTO partnerBlackListDTO) { - BlackListVO blackListVO = new BlackListVO(); - blackListVO.setId(partnerBlackListDTO.getLineId()); - blackListVO.setPartnerId(partnerBlackListDTO.getPartnerId()); - blackListVO.setPartnerUserName(partnerBlackListDTO.getPartnerUserName()); - blackListVO.setPartnerUserPhone(partnerBlackListDTO.getMobile()); - String createTime = DateUtil.format(partnerBlackListDTO.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_2); - String closeTime = DateUtil.format(partnerBlackListDTO.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_2); - blackListVO.setCreateTime(createTime); - blackListVO.setCloseTime(closeTime); - blackListVO.setJoinBlackReason(partnerBlackListDTO.getJoinBlackReason()); - blackListVO.setCloseUserId(partnerBlackListDTO.getCloseUserId()); - String phoneAddress = partnerBlackListDTO.getPhoneAddress(); - if (StringUtils.isEmpty(phoneAddress)) { - phoneAddress = hyPhoneLocationService.handleHyPhoneAddress(partnerBlackListDTO.getMobile()); - } - blackListVO.setPhoneAddress(phoneAddress); - blackListVO.setPhoneAddress(partnerBlackListDTO.getPhoneAddress()); - blackListVO.setCloseUserPhone(partnerBlackListDTO.getCloseUserId()); - return blackListVO; - } - - - /** - * convertPartnerLineInfoAndBaseInfoDTOToVo - * - * @param partnerLineInfoAndBaseInfoDTO - * @return - */ - private PartnerLineInfoAndBaseInfoVO convertPartnerLineInfoAndBaseInfoDTOToVo(PartnerLineInfoAndBaseInfoDTO partnerLineInfoAndBaseInfoDTO) { - PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = new PartnerLineInfoAndBaseInfoVO(); - partnerLineInfoAndBaseInfoVO.setId(partnerLineInfoAndBaseInfoDTO.getId()); - partnerLineInfoAndBaseInfoVO.setPartnerUserId(partnerLineInfoAndBaseInfoDTO.getPartnerId()); - partnerLineInfoAndBaseInfoVO.setInvestmentManager(partnerLineInfoAndBaseInfoDTO.getInvestmentManager()); - partnerLineInfoAndBaseInfoVO.setPartnerBaseInfoId(partnerLineInfoAndBaseInfoDTO.getPartnerBaseInfoId()); - partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage()); - partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus()); - partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause()); - String phoneAddress = partnerLineInfoAndBaseInfoDTO.getPhoneAddress(); - if (StringUtils.isEmpty(phoneAddress)) { - phoneAddress = hyPhoneLocationService.handleHyPhoneAddress(partnerLineInfoAndBaseInfoDTO.getPartnerUserPhone()); - } - partnerLineInfoAndBaseInfoVO.setPhoneAddress(phoneAddress); - partnerLineInfoAndBaseInfoVO.setLineStatus(partnerLineInfoAndBaseInfoDTO.getLineStatus()); - partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(partnerLineInfoAndBaseInfoDTO.getInvestmentManagerPhone()); - partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(partnerLineInfoAndBaseInfoDTO.getPartnerUserPhone()); - partnerLineInfoAndBaseInfoVO.setPartnerUserName(partnerLineInfoAndBaseInfoDTO.getPartnerUserName()); - partnerLineInfoAndBaseInfoVO.setAcceptAdjustType(partnerLineInfoAndBaseInfoDTO.getAcceptAdjustType()); - partnerLineInfoAndBaseInfoVO.setWantShopArea(partnerLineInfoAndBaseInfoDTO.getWantShopArea()); - partnerLineInfoAndBaseInfoVO.setEcWantShopAreaName(partnerLineInfoAndBaseInfoDTO.getEcWantShopArea()); - partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea()); - partnerLineInfoAndBaseInfoVO.setDetailedAddress(partnerLineInfoAndBaseInfoDTO.getDetailedAddress()); - partnerLineInfoAndBaseInfoVO.setEmail(partnerLineInfoAndBaseInfoDTO.getEmail()); - partnerLineInfoAndBaseInfoVO.setIdCard(partnerLineInfoAndBaseInfoDTO.getIdCard()); - partnerLineInfoAndBaseInfoVO.setChannelName(partnerLineInfoAndBaseInfoDTO.getChannelName()); - partnerLineInfoAndBaseInfoVO.setDevelopmentDirector(partnerLineInfoAndBaseInfoDTO.getDevelopmentDirector()); - if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getCertifyFile())) { - partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getCertifyFile(), String.class)); - } - partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId()); - partnerLineInfoAndBaseInfoVO.setEducation(partnerLineInfoAndBaseInfoDTO.getEducation()); - partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(partnerLineInfoAndBaseInfoDTO.getPassTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - return partnerLineInfoAndBaseInfoVO; - } - - - /** - * stageCountDTOToVo - * - * @param stageCountDTO - * @return - */ - private StageCountVO stageCountDTOToVo(StageCountDTO stageCountDTO) { - StageCountVO stageCountVO = new StageCountVO(); - stageCountVO.setQualifiedInterviewCount(stageCountDTO.getQualifiedInterviewCount()); - stageCountVO.setIntentApplyApproveCount(stageCountDTO.getIntentApplyApproveCount()); - stageCountVO.setReservationInterviewCount(stageCountDTO.getReservationInterviewCount()); - return stageCountVO; - } - - /** - * getIntentAreaName - * - * @param intentArea - * @return - */ - private String getIntentAreaName(String intentArea) { - String intentAreaName = null; - if (StringUtils.isNotEmpty(intentArea)) { - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(intentArea)); - intentAreaName = hyOpenAreaInfoDO.getAreaName(); - } - return intentAreaName; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java deleted file mode 100644 index fbf9d4e60..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerUserChannelServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dto.partner.UserChannelDTO; -import com.cool.store.entity.HyPartnerUserChannelDO; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.service.HyPartnerUserChannelService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/8/10 11:14 - * @Version 1.0 - */ -@Service -public class HyPartnerUserChannelServiceImpl implements HyPartnerUserChannelService { - - @Resource - HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - - @Override - public List queryAllUserChannelList() { - List allUserChannel = hyPartnerUserChannelMapper.getAllUserChannel(); - List result = new ArrayList<>(); - allUserChannel.forEach(x->{ - UserChannelDTO userChannelDTO = new UserChannelDTO(); - userChannelDTO.setUserChannelId(x.getChannelId()); - userChannelDTO.setUserChannelName(x.getChannelName()); - result.add(userChannelDTO); - }); - return result; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPhoneLocationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPhoneLocationServiceImpl.java deleted file mode 100644 index 9705c4888..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPhoneLocationServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dao.HyPhoneLocationDAO; -import com.cool.store.dto.partner.DescribePhoneNumberDTO; -import com.cool.store.dto.wx.PhoneInfoDTO; -import com.cool.store.entity.HyPhoneLocationDO; -import com.cool.store.mapper.HyPhoneLocationMapper; -import com.cool.store.service.AliyunService; -import com.cool.store.service.HyPhoneLocationService; -import com.cool.store.utils.RedisConstantUtil; -import com.cool.store.utils.RedisUtilPool; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/30 15:04 - * @Version 1.0 - */ -@Service -@Slf4j -public class HyPhoneLocationServiceImpl implements HyPhoneLocationService { - @Resource - HyPhoneLocationDAO hyPhoneLocationDAO; - @Resource - AliyunService aliyunService; - @Resource - RedisUtilPool redisUtilPool; - @Resource - RedisConstantUtil redisConstantUtil; - - @Override - public String handleHyPhoneAddress(String phoneNumber) { - if (StringUtils.isEmpty(phoneNumber)){ - return ""; - } - String phone = redisUtilPool.getString(redisConstantUtil.getPhoneNumber(phoneNumber)); - if (StringUtils.isNotEmpty(phone)){ - DescribePhoneNumberDTO describePhoneNumberDTO = JSONObject.parseObject(phone, DescribePhoneNumberDTO.class); - return String.format("%s %s", describePhoneNumberDTO.getProvince(), describePhoneNumberDTO.getCity()); - } - HyPhoneLocationDO hyPhoneLocationDO = hyPhoneLocationDAO.selectByPhoneNumber(phoneNumber); - if (hyPhoneLocationDO==null){ - try { - DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(phoneNumber); - HyPhoneLocationDO hy = new HyPhoneLocationDO(); - hy.setPhoneNumber(phoneNumber); - hy.setPhoneAddress(String.format("%s %s", phoneNumberAttribute.getProvince(), phoneNumberAttribute.getCity())); - hyPhoneLocationDAO.insertSelective(hy); - //redis一周时间 - redisUtilPool.setString(redisConstantUtil.getPhoneNumber(phoneNumber),JSONObject.toJSONString(phoneNumberAttribute),7*24*60*60); - return hy.getPhoneAddress(); - }catch (Exception e){ - return "未知"; - } - } - return hyPhoneLocationDO.getPhoneAddress(); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java deleted file mode 100644 index 93251aa0a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InspectionSettingServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyInspectionSettingDAO; -import com.cool.store.dao.HyInspectionSettingMappingDAO; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dto.inspection.setting.AddInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.CheckInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.UpdateInspectionSettingDTO; -import com.cool.store.entity.HyInspectionSettingDO; -import com.cool.store.entity.HyInspectionSettingMappingDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.service.InspectionSettingService; -import com.cool.store.vo.inspection.setting.InspectionSettingCheckVO; -import com.cool.store.vo.inspection.setting.InspectionSettingDetailVO; -import com.cool.store.vo.inspection.setting.InspectionSettingPageVO; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageInfo; -import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.ListUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingServiceImpl - * @Description: - * @date 2023-07-18 16:06 - */ -@Service -public class InspectionSettingServiceImpl implements InspectionSettingService { - - @Resource - private HyInspectionSettingDAO hyInspectionSettingDAO; - @Resource - private HyInspectionSettingMappingDAO hyInspectionSettingMappingDAO; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - - @Override - public PageInfo getInspectionSettingPage(Integer pageNum, Integer pageSize) { - Page inspectionSettingPage = hyInspectionSettingDAO.getInspectionSettingPage(pageNum, pageSize); - Map userNameMap = new HashMap<>(); - if(CollectionUtils.isNotEmpty(inspectionSettingPage)){ - List userIds = inspectionSettingPage.stream().map(HyInspectionSettingDO::getInspectionUserId).distinct().collect(Collectors.toList()); - List updateUserIds = inspectionSettingPage.stream().map(HyInspectionSettingDO::getUpdateUserId).distinct().collect(Collectors.toList()); - userIds.addAll(updateUserIds); - userNameMap = enterpriseUserDAO.getUserNameMap(userIds); - } - List resultList = InspectionSettingPageVO.convert(inspectionSettingPage, userNameMap); - PageInfo resultPage = new PageInfo(inspectionSettingPage); - resultPage.setList(resultList); - return resultPage; - } - - @Override - public InspectionSettingDetailVO getInspectionSettingDetail(Long inspectionSettingId) { - HyInspectionSettingDO inspectionSetting = hyInspectionSettingDAO.getInspectionSettingDetail(inspectionSettingId); - if(Objects.isNull(inspectionSetting)){ - return null; - } - List openAreaMappingIds = hyInspectionSettingMappingDAO.getOpenAreaMappingIds(inspectionSettingId); - String inspectionUsername = enterpriseUserDAO.getUserName(inspectionSetting.getInspectionUserId()); - return InspectionSettingDetailVO.convertVO(inspectionSetting, inspectionUsername, openAreaMappingIds); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Long addInspectionSetting(String userId, AddInspectionSettingDTO param) { - List inspectionUserSetting = hyInspectionSettingDAO.getHyInspectionSettingByUserId(param.getInspectionUserId(), null); - if(CollectionUtils.isNotEmpty(inspectionUserSetting)){ - throw new ServiceException(ErrorCodeEnum.INSPECTION_USER_OCCUPY); - } - List openAreaMappingIds = hyOpenAreaInfoDAO.filterLeafNode(param.getOpenAreaMappingIds()); - if(CollectionUtils.isEmpty(openAreaMappingIds)){ - throw new ServiceException(ErrorCodeEnum.OPEN_AREA_NULL); - } - HyInspectionSettingDO inspectionSetting = new HyInspectionSettingDO(); - inspectionSetting.setInspectionUserId(param.getInspectionUserId()); - inspectionSetting.setZoneName(param.getZoneName()); - inspectionSetting.setCreateUserId(userId); - inspectionSetting.setCreateTime(new Date()); - inspectionSetting.setUpdateUserId(userId); - inspectionSetting.setUpdateTime(new Date()); - Long inspectionSettingId = hyInspectionSettingDAO.addInspectionSetting(inspectionSetting); - hyInspectionSettingMappingDAO.addInspectionSettingMapping(inspectionSettingId, openAreaMappingIds); - return inspectionSettingId; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer updateInspectionSetting(String userId, UpdateInspectionSettingDTO param) { - List inspectionUserSetting = hyInspectionSettingDAO.getHyInspectionSettingByUserId(param.getInspectionUserId(), param.getInspectionSettingId()); - if(CollectionUtils.isNotEmpty(inspectionUserSetting)){ - throw new ServiceException(ErrorCodeEnum.INSPECTION_USER_OCCUPY); - } - List openAreaMappingIds = hyOpenAreaInfoDAO.filterLeafNode(param.getOpenAreaMappingIds()); - if(CollectionUtils.isEmpty(openAreaMappingIds)){ - throw new ServiceException(ErrorCodeEnum.OPEN_AREA_NULL); - } - HyInspectionSettingDO inspectionSetting = new HyInspectionSettingDO(); - inspectionSetting.setId(param.getInspectionSettingId()); - inspectionSetting.setInspectionUserId(param.getInspectionUserId()); - inspectionSetting.setZoneName(param.getZoneName()); - inspectionSetting.setUpdateUserId(userId); - inspectionSetting.setUpdateTime(new Date()); - hyInspectionSettingDAO.updateInspectionSetting(inspectionSetting); - return hyInspectionSettingMappingDAO.updateInspectionSettingMapping(param.getInspectionSettingId(), openAreaMappingIds); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer deleteInspectionSetting(String userId, Long inspectionSettingId) { - HyInspectionSettingDO inspectionSetting = new HyInspectionSettingDO(); - inspectionSetting.setId(inspectionSettingId); - inspectionSetting.setUpdateUserId(userId); - inspectionSetting.setUpdateTime(new Date()); - inspectionSetting.setDeleted(Boolean.TRUE); - hyInspectionSettingDAO.updateInspectionSetting(inspectionSetting); - hyInspectionSettingMappingDAO.deleteInspectionSettingMapping(inspectionSettingId); - return hyInspectionSettingDAO.updateInspectionSetting(inspectionSetting); - } - - @Override - public List checkInspectionSetting(CheckInspectionSettingDTO param) { - if(CollectionUtils.isEmpty(param.getOpenAreaMappingIds())){ - return Lists.newArrayList(); - } - List conflictInspectionSetting = hyInspectionSettingMappingDAO.getConflictInspectionSetting(param.getInspectionSettingId(), param.getOpenAreaMappingIds()); - List inspectionSettingIds = ListUtils.emptyIfNull(conflictInspectionSetting).stream().map(HyInspectionSettingMappingDO::getInspectionSettingId).distinct().collect(Collectors.toList()); - List inspectionSettingList = hyInspectionSettingDAO.getHyInspectionSettingByIds(inspectionSettingIds); - List inspectionUserIds = ListUtils.emptyIfNull(inspectionSettingList).stream().map(HyInspectionSettingDO::getInspectionUserId).distinct().collect(Collectors.toList()); - List openAreaMappingIds = ListUtils.emptyIfNull(conflictInspectionSetting).stream().map(HyInspectionSettingMappingDO::getOpenAreaMappingId).distinct().collect(Collectors.toList()); - Map areaNameMap = hyOpenAreaInfoDAO.getNameMapByIds(openAreaMappingIds); - Map userNameMap = enterpriseUserDAO.getUserNameMap(inspectionUserIds); - return InspectionSettingCheckVO.convertVO(conflictInspectionSetting, inspectionSettingList, userNameMap, areaNameMap); - } - - @Override - public List getBingUser() { - return hyInspectionSettingDAO.getInspectionUserIds(); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java deleted file mode 100644 index ce1556c5c..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dto.inspection.interview.InspectionRevocationDTO; -import com.cool.store.dto.inspection.interview.InspectionSubmissionDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.InspectionOperationTypeEnum; -import com.cool.store.enums.InspectionStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyInspectionMapper; -import com.cool.store.request.GetInterviewInspectionListReq; -import com.cool.store.request.GetInterviewInspectionResultListReq; -import com.cool.store.mapper.HyInterviewInspectionLogMapper; -import com.cool.store.service.InterviewInspectionService; -import com.cool.store.service.MDMAreaService; -import com.cool.store.service.OpenAreaService; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.interview.InterviewInspectionHistoryInfo; -import com.cool.store.vo.interview.InterviewInspectionInfo; -import com.cool.store.vo.interview.InterviewInspectionResultVO; -import com.cool.store.vo.interview.InterviewInspectionVO; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - - -import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author Fun Li - * @version 1.0 - * @date 2023/7/19 16:50 - */ -@Service -public class InterviewInspectionServiceImpl implements InterviewInspectionService { - - @Autowired - private HyInspectionMapper inspectionMapper; - - @Autowired - private HyInterviewInspectionLogMapper interviewInspectionLogMapper; - - - @Resource - private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - - @Override - public void submit(InspectionSubmissionDTO dto) throws ApiException { - HyInspectionDO rawInspection = inspectionMapper.selectByPrimaryKey(dto.getInspectionId()); - if (Objects.isNull(rawInspection)) { - throw new ApiException(ErrorCodeEnum.INSPECTION_INFO_NOT_EXIST); - } - HyInspectionDO hyInspectionDO = new HyInspectionDO(); - //稽核结果和说明及文件等 - hyInspectionDO.setId(dto.getInspectionId()); - if (dto.getWhetherPass().equals(0)) { - hyInspectionDO.setStatus(InspectionStatusEnum.NOT_PASS.getCode()); - } else if (dto.getWhetherPass().equals(1)) { - hyInspectionDO.setStatus(InspectionStatusEnum.PASS.getCode()); - } - hyInspectionDO.setDescription(dto.getDescription()); - String filesStr = spliceFiles(dto.getFiles()); - hyInspectionDO.setFiles(filesStr); - //稽核人，稽核时间，创建人 - hyInspectionDO.setOperatorUserId(CurrentUserHolder.getUserId()); - hyInspectionDO.setUpdator(CurrentUserHolder.getUserId()); - hyInspectionDO.setInspectionTime(DateUtil.now()); - hyInspectionDO.setCreator(rawInspection.getCreator() == null ? CurrentUserHolder.getUserId() : rawInspection.getCreator()); - inspectionMapper.updateByPrimaryKeySelective(hyInspectionDO); - } - - @Override - @Transactional - public void revoke(InspectionRevocationDTO dto) throws ApiException { - //2.1 查询之前的一次操作 - HyInspectionDO hyInspectionDO = inspectionMapper.selectByPrimaryKey(dto.getInspectionId()); - if (Objects.isNull(hyInspectionDO)) { - throw new ApiException(ErrorCodeEnum.INSPECTION_INFO_NOT_EXIST); - } - //1. 撤销操作记录写入数据库面试稽核操作记录表 - HyInterviewInspectionLogDO inspectionLog = new HyInterviewInspectionLogDO(); - inspectionLog.setOperatorUserId(CurrentUserHolder.getUserId()); - inspectionLog.setInspectionId(dto.getInspectionId()); - inspectionLog.setOperationType(InspectionOperationTypeEnum.REVOCATION.getCode()); - inspectionLog.setDescription(dto.getDescription()); - String filesStr = spliceFiles(dto.getFiles()); - inspectionLog.setOperationTime(DateUtil.now()); - inspectionLog.setFiles(filesStr); - interviewInspectionLogMapper.insertSelective(inspectionLog); - //2. 撤销操作之前的一次操作写入面试稽核操作记录表 - inspectionLog.setOperatorUserId(hyInspectionDO.getOperatorUserId()); - inspectionLog.setInspectionId(hyInspectionDO.getId()); - if (hyInspectionDO.getStatus().equals(1)) { - inspectionLog.setOperationType(InspectionOperationTypeEnum.PASS.getCode()); - } else if (hyInspectionDO.getStatus().equals(2)) { - inspectionLog.setOperationType(InspectionOperationTypeEnum.NOT_PASS.getCode()); - } - inspectionLog.setDescription(hyInspectionDO.getDescription()); - inspectionLog.setFiles(hyInspectionDO.getFiles()); - inspectionLog.setOperationTime(hyInspectionDO.getInspectionTime()); - interviewInspectionLogMapper.insertSelective(inspectionLog); - //3. 撤销操作之前的一次操作稽核信息状态修改为未稽核，并且将数据状态（其他字段）也恢复到未稽核时的状态 - hyInspectionDO.setOperatorUserId(null); - hyInspectionDO.setStatus(InspectionStatusEnum.NOT_INSPECT.getCode()); - hyInspectionDO.setFiles(null); - hyInspectionDO.setDescription(null); - hyInspectionDO.setInspectionTime(null); - hyInspectionDO.setUpdator(null); - inspectionMapper.updateByPrimaryKey(hyInspectionDO); - } - - @Override - public InterviewInspectionInfo interviewInspectionGetDetail(Long id) { - InterviewInspectionInfo interviewInspectionInfo = inspectionMapper.interviewInspectionGetDetail(id); - if (ObjectUtil.isNotNull(interviewInspectionInfo) && ObjectUtil.isNotNull(interviewInspectionInfo.getFilesStr())) { - List list = Arrays.asList(interviewInspectionInfo.getFilesStr().split(",")); - interviewInspectionInfo.setFiles(list); - } - return interviewInspectionInfo; - } - - @Override - public List interviewInspectionGetHistoryDetail(Long id) { - List interviewInspectionHistoryInfos = interviewInspectionLogMapper.interviewInspectionGetHistoryDetail(id); - for (InterviewInspectionHistoryInfo interviewInspectionHistoryInfo : interviewInspectionHistoryInfos) { - if (ObjectUtil.isNotNull(interviewInspectionHistoryInfo) && ObjectUtil.isNotNull(interviewInspectionHistoryInfo.getFilesStr())) { - List list = Arrays.asList(interviewInspectionHistoryInfo.getFilesStr().split(",")); - interviewInspectionHistoryInfo.setFiles(list); - } - } - return interviewInspectionHistoryInfos; - } - - @Override - public List interviewInspectionResultGetList(GetInterviewInspectionResultListReq request) { - //给个默认时间 - if (StringUtil.isEmpty(request.getStartTime()) && StringUtil.isEmpty(request.getEndTime())) { - request.setStartTime(getHourDayDate(0, -6, true)).setEndTime(getHourDayDate(0, 0, false)); - } - //意向开店区域 不为空 - if (StringUtil.isNotEmpty(request.getWantShopArea())) { - HyOpenAreaInfoDO hyOpenAreaInfoDO =hyOpenAreaInfoDAO.selectById(Convert.toLong(request.getWantShopArea())); - if (ObjectUtil.isNull(hyOpenAreaInfoDO.getParentId())) { - //是省 - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return inspectionMapper.interviewInspectionResultGetProvinceList(request.setUserId(CurrentUserHolder.getUserId())); - } else { - //并非省 - List codeList = hyOpenAreaInfoDAO.getAllAreaCode(request.getWantShopArea()).stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toList()); - request.setCodeList(codeList); - } - } - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return inspectionMapper.interviewInspectionResultGetList(request.setUserId(CurrentUserHolder.getUserId())); - } - - private String spliceFiles(List files) { - if (files == null || files.size() == 0) { - return null; - } - return files.stream().map(String::valueOf).collect(Collectors.joining(",")); - } - - @Override - public List interviewInspectionGetList(GetInterviewInspectionListReq request) { - //给个默认时间 - if (StringUtil.isEmpty(request.getStartTime()) && StringUtil.isEmpty(request.getEndTime())) { - request.setStartTime(getHourDayDate(0, -6, true)).setEndTime(getHourDayDate(0, 0, false)); - } - //意向开店区域 不为空 - if (StringUtil.isNotEmpty(request.getWantShopArea())) { - HyOpenAreaInfoDO hyOpenAreaInfoDO =hyOpenAreaInfoDAO.selectById(Convert.toLong(request.getWantShopArea())); - if (ObjectUtil.isNull(hyOpenAreaInfoDO.getParentId())) { - //是省 - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return inspectionMapper.interviewInspectionGetProvinceList(request.setUserId(CurrentUserHolder.getUserId())); - } else { - //并非省 - List codeList = hyOpenAreaInfoDAO.getAllAreaCode(request.getWantShopArea()).stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toList()); - request.setCodeList(codeList); - } - } - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - return inspectionMapper.interviewInspectionGetList(request.setUserId(CurrentUserHolder.getUserId())); - } - - - private String getHourDayDate(int hour, int day, boolean pan) { - Date today = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(today); - calendar.add(Calendar.HOUR, hour); - calendar.add(Calendar.DAY_OF_MONTH, day); - Date twoDay = calendar.getTime(); - String partner = pan ? "yyyy-MM-dd 00:00:00" : "yyyy-MM-dd 24:00:00"; - return new SimpleDateFormat(partner).format(twoDay); - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java deleted file mode 100644 index ebf27bbfe..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ /dev/null @@ -1,846 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyIntendDevMappingDAO; -import com.cool.store.dao.HyInterviewDAO; -import com.cool.store.dao.HyPartnerExhibitionDAO; -import com.cool.store.dto.log.*; -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerBaseInfoMapper; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.*; -import com.cool.store.service.EnterpriseUserService; -import com.cool.store.service.InterviewService; -import com.cool.store.service.LogService; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.StringUtil; -import com.cool.store.utils.TRTCUtils; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.EnterpriseUserBaseInfoVO; -import com.cool.store.vo.interview.*; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * @Author: young.yu - * @Date: 2023-06-06 15:19 - * @Description: - */ -@Slf4j -@Service -public class InterviewServiceImpl implements InterviewService { - - @Value("${trtc.sdkAppId:null}") - private Long sdkAppId; - - @Value("${trtc.secretKey:null}") - private String key; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private HyPartnerBaseInfoMapper hyPartnerBaseInfoMapper; - - @Autowired - private HyInterviewDAO hyInterviewDAO; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - @Autowired - private EnterpriseUserService enterpriseUserService; - - @Autowired - private HyInterviewDAO interviewDAO; - - @Autowired - private LogService logService; - - @Autowired - private EnterpriseUserDAO enterpriseUserDAO; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - - @Override - public List getInterviewList(GetInterviewListReq request) { - List interviewList = hyPartnerInterviewPlanMapper.getInterviewList(request); - return interviewList; - } - - @Resource - HyIntendDevMappingDAO hyIntendDevMappingDAO; - - @Override - public InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException { - String interviewPlanId = request.getInterviewPlanId(); - InterviewVO vo = hyPartnerInterviewPlanMapper.getInterviewInfo(interviewPlanId); - //如果面试信息为空，抛出异常 - if (vo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - //将 processInfo 解析为 List - if (!StringUtils.isEmpty(vo.getProcessInfo())) { - List split = Arrays.asList(vo.getProcessInfo().split(",")); - vo.setVideoList(split); - vo.setProcessInfo(""); - } - //1. 查询面试官和记录人信息（面试官必须有） - EnterpriseUserBaseInfoVO interviewerInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getInterviewerId()); - vo.setInterviewerName(interviewerInfo.getName()); - vo.setInterviewerMobile(interviewerInfo.getMobile()); - if (!ObjectUtil.isEmpty(vo.getRecorderId())) { - EnterpriseUserBaseInfoVO recorderInfo = hyPartnerInterviewPlanMapper.getEnterpriseUserBaseInfo(vo.getRecorderId()); - if (recorderInfo != null) { - vo.setRecorderName(recorderInfo.getName()); - vo.setRecorderMobile(recorderInfo.getMobile()); - } - } - - //2. 查询开发主管信息 - if (request.getNeedDevelopmentDirector() != null && request.getNeedDevelopmentDirector()) { - //查询所属战区 - String wantShopArea = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId); - HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "dev"); - if (hyIntendDevelopementMappingDO != null) { - //查询开发主管 - EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(hyIntendDevelopementMappingDO.getMappingId()); - vo.setDevelopmentDirector(development); - } - } - - //3. 查询线索参加会销面试情况 - //只有在面试开始阶段以后才有该信息 - if (//线索在面试阶段且已开始面试 - (vo.getWorkflowStage().equals(Long.parseLong(WorkflowStageEnum.INTERVIEW.getCode())) && vo.getStatus().compareTo(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())) >= 0) - //线索在面试阶段后 - || vo.getWorkflowStage().compareTo(Long.parseLong(WorkflowStageEnum.INTERVIEW.getCode())) >= 0) { - HyPartnerExhibitionDO partnerExhibitionDO = new HyPartnerExhibitionDO(); - partnerExhibitionDO.setInterviewPlanId(Long.parseLong(vo.getInterviewPlanId())); - partnerExhibitionDO.setDeleted(Boolean.FALSE); - partnerExhibitionDO.setPartnerLineId(vo.getPartnerLineId()); - HyPartnerExhibitionInterviewDO partnerExhibitionInterview = partnerExhibitionDAO.queryPartnerExhibitionInterviewInfo(Long.parseLong(vo.getInterviewPlanId()), vo.getPartnerLineId()); - if (partnerExhibitionInterview != null) { - vo.setWhetherExhibitionInterview(Boolean.TRUE); - vo.setExhibitionName(partnerExhibitionInterview.getExhibitionName()); - vo.setExhibitionDate(partnerExhibitionInterview.getExhibitionDate()); - vo.setExhibitionCreatorName(partnerExhibitionInterview.getExhibitionCreatorName()); - vo.setExhibitionCreatorMobile(partnerExhibitionInterview.getExhibitionCreatorMobile()); - } - } - - //4. 查询该时段预约情况 - //如果还未提交预约申请就没有预约情况，面试完成以后也必要查询了 - if (!vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode())) - && !vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())) - && !vo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.RESERVATION_1.getCode()))) { - return vo; - } - List bookSituations = hyPartnerInterviewPlanMapper.getInterviewBookSituation(vo.getInterviewerId(), vo.getStartTime(), vo.getEndTime()); - if (CollectionUtils.isNotEmpty(bookSituations)) { - HyPartnerInterviewBookSituation bookSituation = bookSituations.get(0); - vo.setBooked(bookSituation.getBooked()); - vo.setSelfBooked(Boolean.TRUE); - vo.setAppointmentCount(bookSituation.getBookingCount()); - } - - return vo; - } - - @Override - @Transactional - public void entrustOthers(EntrustOthersReq request) throws ApiException { - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - HyPartnerLineInfoDO lineInfo = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(request.getPartnerLineId()); - //如果面试信息为空，抛出异常 - if (interviewInfo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - //只有预约面试阶段和合作资格面试待面试阶段才能变更面试官 - if ( !WorkflowStatusEnum.INTERVIEW_2.getCode().equals(lineInfo.getWorkflowStatus()) - && !WorkflowStageEnum.RESERVATION.getCode().equals(lineInfo.getWorkflowStage())) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); - } -// //1.新面试官日程新增 -// CreateCalendarEventDTO createCalendarEventDTO = new CreateCalendarEventDTO(); -// createCalendarEventDTO.setStartTime(DateUtil.parse(interviewInfo.getStartTime()).getTime()); -// createCalendarEventDTO.setEndTime(DateUtil.parse(interviewInfo.getEndTime()).getTime()); -// createCalendarEventDTO.setUserId(request.getNewInterviewerId()); -// createCalendarEventDTO.setJoinUserIds(Arrays.asList(request.getNewInterviewerId())); -// createCalendarEventDTO.setSummary(generateInterviewTitle(request.getPartnerLineId())); -// UserCalendarsEventDTO userCalendarEvent = isvHttpRequest.createUserCalendarEvent(createCalendarEventDTO); -// if(userCalendarEvent == null ){ -// throw new ApiException(ErrorCodeEnum.CREATE_CALENDAR_EVENT_FAIL); -// } -// //2.原面试官日程删除 -// DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); -// deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); -// deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); -// deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); -// UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); -// if(userCalendarsEventDTO == null ){ -// throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); -// } - - //1.5.2 后不再使用飞书日程 - //有可能还未同意面试预约，这时候没有建立日程，只需要修改面试官 - //1.4 优化多次转让，线索转让次数 >= 1 无需添加日程，只转让线索的招商经理及面试官 -// Integer transferTimes = hyPartnerLineInfoMapper.getTransferTimes(request.getPartnerLineId()); -// if (interviewInfo.getFeishuCalendarId() != null && interviewInfo.getFeishuScheduleId() != null -// && transferTimes < 1) { -// //V1.3 需求变更为将新面试官拉入原面试官日程，而非删除和新增日程 -// //1. 原面试官面试日程信息 -// String oldInterviewerId = CurrentUserHolder.getUserId(); -// UpdateCalendarEventDTO updateCalendarEventDTO = new UpdateCalendarEventDTO(); -// updateCalendarEventDTO.setUserId(oldInterviewerId); -// updateCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); -// updateCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); -// updateCalendarEventDTO.setStartTime(DateUtil.parse(interviewInfo.getStartTime()).getTime()); -// updateCalendarEventDTO.setEndTime(DateUtil.parse(interviewInfo.getEndTime()).getTime()); -// updateCalendarEventDTO.setSummary(generateInterviewTitle(request.getPartnerLineId())); -// -// //2. 邀请新面试官加入日程 -// List list = new ArrayList(); -// list.add(request.getNewInterviewerId()); -// //当前招商经理不是面试官，但是日程在招商经理这里 -// if (!oldInterviewerId.equals(list.get(0))) { -// list.add(oldInterviewerId); -// } -// updateCalendarEventDTO.setJoinUserIds(list); -// UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.updateUserCalendarEvent(updateCalendarEventDTO); -// if(userCalendarsEventDTO == null ){ -// throw new ApiException(ErrorCodeEnum.FEISHU_UPDATE_SCHEDULE_ERROR); -// } -// } - - // 3.面试信息计划变更 - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - record.setId(Long.valueOf(request.getInterviewPlanId())); - record.setInterviewer(request.getNewInterviewerId()); - record.setUpdateTime(new Date()); -// record.setFeishuCalendarId(userCalendarEvent.getCalendarId()); -// record.setFeishuScheduleId(userCalendarEvent.getEventId()); - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); - - //更新面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.valueOf(request.getInterviewPlanId())); - hyPartnerInterviewDO.setInterviewer(request.getNewInterviewerId()); - hyPartnerInterviewDO.setUpdateTime(new Date()); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - - //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(request.getNewInterviewerId()); - EntrustOthersDTO log = EntrustOthersDTO.builder().operateUserId(operator.getUserId()).operateUsername(operator.getName()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .beforeInterviwerMobile(interviewInfo.getInterviewerMobile()) - .beforeInterviwerName(interviewInfo.getInterviewerName()) - .afterInterviwerMobile(enterpriseUserDO.getMobile()) - .afterInterviwerName(enterpriseUserDO.getName()).build(); - logService.recordBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.ENTRUST_OTHERS,log); - } - - /** - * PC端修改面试时间，和小程序端逻辑不一致，PC端修改需要修改日程信息 - * @param request - * @throws ApiException - */ - @Override - public void modifyInterviewTime(ModifyInterviewTimeReq request) throws ApiException { - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - //如果面试信息为空，抛出异常 - if (interviewInfo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - if(RoomStatus.WAIT_FOR_OPEN.getCode() != Integer.parseInt(interviewInfo.getRoomStatus())){ - throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); - } - - //是否需要直接开始面试 - //需要在同意预约操作以后，面试变为待开始后修改面试时间才需要直接打开面试 - Date now = new Date(); - boolean whetherBeginInterview = false; - DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(request.getNewStartBookingTime()), -5); - if (interviewStartTime.isBeforeOrEquals(now) && interviewInfo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()))) { - whetherBeginInterview = true; - } - - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - //1.5.2 后不再使用飞书日程 -// //被委托或者因转让导致的面试官变更的线索不操作日程 -// Integer transferTimes = hyPartnerLineInfoMapper.getTransferTimes(interviewInfo.getPartnerLineId()); -// if(transferTimes==0&&StringUtils.isNotEmpty(interviewInfo.getFeishuCalendarId())&&StringUtils.isNotEmpty(interviewInfo.getFeishuScheduleId())) { -// //1.原面试官日程删除 -// DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); -// deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); -// deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); -// deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); -// UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); -// if (userCalendarsEventDTO == null) { -// throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); -// } -// //2.新面试官日程新增 -// CreateCalendarEventDTO createCalendarEventDTO = new CreateCalendarEventDTO(); -// createCalendarEventDTO.setStartTime(DateUtil.parse(request.getNewStartBookingTime()).getTime()); -// createCalendarEventDTO.setEndTime(DateUtil.parse(request.getNewEndBookingTime()).getTime()); -// createCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); -// List list = Arrays.asList(interviewInfo.getInterviewerId()); -// //可能当前招商经理不是面试官，但是日程在招商经理这里 -// String userId = CurrentUserHolder.getUserId(); -// if (!userId.equals(list.get(0))) { -// list.add(userId); -// } -// createCalendarEventDTO.setJoinUserIds(list); -// createCalendarEventDTO.setSummary(generateInterviewTitle(interviewInfo.getPartnerLineId())); -// UserCalendarsEventDTO userCalendarEvent = isvHttpRequest.createUserCalendarEvent(createCalendarEventDTO); -// if (userCalendarEvent == null) { -// throw new ApiException(ErrorCodeEnum.CREATE_CALENDAR_EVENT_FAIL); -// } -// record.setFeishuCalendarId(userCalendarEvent.getCalendarId()); -// record.setFeishuScheduleId(userCalendarEvent.getEventId()); -// } - - record.setId(Long.valueOf(request.getInterviewPlanId())); - record.setStartTime(Convert.toDate(request.getNewStartBookingTime())); - record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime())); - record.setEndTime(Convert.toDate(request.getNewEndBookingTime())); - record.setUpdateTime(now); - //是否要将面试修改为已开始阶段 - if (whetherBeginInterview) { - record.setRoomStatus(RoomStatus.OPEN.getCode()); - } - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); - - //更新面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.valueOf(request.getInterviewPlanId())); - hyPartnerInterviewDO.setInterviewer(interviewInfo.getInterviewerId()); - hyPartnerInterviewDO.setUpdateTime(now); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - //是否要将线索子流程状态修改为面试已开始阶段 - if (whetherBeginInterview) { - hyInterviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); - } - - //如果是待面试阶段修改面试时间需要发短信通知 - if (interviewInfo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()))) { - HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoMapper.getByPartnerLineId(interviewInfo.getPartnerLineId()); - //异步发送短信给加盟商 - eventCenterHttpRequest.sendSmsVariable(partnerBaseInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS,DateUtil.format(record.getStartTime(), DatePattern.NORM_DATETIME_MINUTE_PATTERN),wechatMiniAppService.getMiniAppUrl()); - } - - //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - ModifyInterviewTimeDTO log = ModifyInterviewTimeDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()) - .operateTime(DateUtil.format(now, CoolDateUtils.DATE_FORMAT_SEC)) - .beforeInterviewTime(interviewInfo.getStartTime()).afterInterviewTime(request.getNewStartBookingTime()).build(); - logService.recordBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.MODIFY_INTERVIEW_TIME,log); - } - - @Override - public void finishInterview(FinishInterviewReq request) throws ApiException { - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - //如果面试信息为空，抛出异常 - if (interviewInfo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - Date now = new Date(); - //更新面试计划信息 - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - record.setId(Long.valueOf(request.getInterviewPlanId())); - record.setRoomStatus(RoomStatus.CLOSED.getCode()); - record.setUpdateTime(now); - record.setActualEndTime(now); - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); - - //更新面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.valueOf(interviewInfo.getInterviewPlanId())); - interviewDAO.updateInterviewWorkflowStatus(interviewInfo.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_4); -// hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode())); - hyPartnerInterviewDO.setUpdateTime(now); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - - //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - LogBasicDTO log = LogBasicDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).build(); - logService.recordBizLog(operator,interviewInfo.getPartnerLineId(),OperateTypeEnum.FINISH_INTERVIEW,log); - } - - /** - * 进入面试间的方法 - * 修改一些面试状态 - * 最后返回 userSign 用于进入腾讯云音视频房间 - * - * @return userSign 进入视频所需签名 - */ - @Override - @Transactional - public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException { - try { - //房间状态 - Integer roomStatus = hyPartnerInterviewPlanMapper.getRoomStatus(dto.getInterviewPlanId()); - //已关闭就禁止进入房间了 - if (roomStatus.equals(RoomStatus.CLOSED.getCode())) { - throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); - } - //面试流程状态 - String status = hyPartnerInterviewMapper.getStatus(dto.getInterviewPlanId()); - //如果面试间状态是 0 待开放或者面试流程状态是 2 待面试，再判断时间是否是正确的时间（定时任务代偿） - if (roomStatus.equals(RoomStatus.WAIT_FOR_OPEN.getCode()) || WorkflowStatusEnum.INTERVIEW_2.getCode().equals(status)) { - HyPartnerInterviewPlanDO interviewPlan = hyPartnerInterviewPlanMapper.getInterviewPlanById(dto.getInterviewPlanId()); - //面试预期开始时间 - DateTime exceptTime = DateUtil.offsetMinute(interviewPlan.getStartTime(), -5); - //面试结束时间 - //DateTime endTime = DateUtil.parseDateTime(DateUtil.formatDateTime(interviewPlan.getEndTime())); - DateTime now = DateUtil.date(); - //如果当前时间在预期开始时间和结束时间之间 - //修改面试状态和房间状态（修改房间状态在后面 hyPartnerInterviewPlanDO 中一并修改） - if (exceptTime.isBefore(now)) { - //1. 将面试状态改为 --> 2 已开始 - interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); - //hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); - } else { - throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); - } - } - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.parseLong(dto.getInterviewPlanId())); - //2. 修改加盟商或面试官进入面试时间 - //加盟商 - if (dto.getUserType().equals(2)) { - hyPartnerInterviewDO.setPartnerEnterTime(DateUtil.date()); - } else if (dto.getUserType().equals(1)) { - hyPartnerInterviewDO.setInterviewerEnterTime(DateUtil.date()); - } - //更新 - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); - //修改面试房间状态 - hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.OPEN.getCode()); - //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 - hyPartnerInterviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now()); - //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 - if (dto.getUserType().equals(2)) { - hyPartnerInterviewPlanDO.setIsPartnerInterview(1); - } - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); - //5. 查询对应的面试官id、姓名及加盟商姓名 - EnterInterviewVO vo = hyPartnerInterviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); - //6. 生成 userSign - String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); - vo.setUserSign(userSig); - return vo; - } catch (ApiException apiException) { - throw apiException; - } catch (Exception e) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL); - } - } - - @Override - @Transactional - public void approveAppointment(ApproveAppointmentReq request) throws ApiException { - //查询面试计划信息 - InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - //如果面试计划不存在，抛出异常 - if (interviewVO == null||StringUtil.isEmpty(interviewVO.getInterviewPlanId())) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoMapper.getByPartnerLineId(interviewVO.getPartnerLineId()); - if(partnerBaseInfo == null){ - throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); - } - - //更新面试计划信息 - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - record.setId(Long.valueOf(request.getInterviewPlanId())); - record.setApplicationApproved(1); - //如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 - DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(interviewVO.getStartTime()), -5); - Date now = new Date(); - if (interviewStartTime.isBeforeOrEquals(now)) { - record.setRoomStatus(RoomStatus.OPEN.getCode()); - record.setActualStartTime(new Date()); - } - record.setUpdateTime(new Date()); - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); - - //更新面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setId(Long.valueOf(interviewVO.getInterviewId())); - //更新面试状态和线索子流程状态 - if (interviewStartTime.isBeforeOrEquals(now)) { - interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); - } else { - interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_2); - } - hyPartnerInterviewDO.setUpdateTime(new Date()); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - - //更新线索状态 - HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); - hyPartnerLineDO.setId(request.getPartnerLineId()); - hyPartnerLineDO.setWorkflowStage(WorkflowStageEnum.INTERVIEW.getCode()); - hyPartnerLineDO.setUpdateTime(new Date()); - hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); - //异步发送短信给加盟商 - eventCenterHttpRequest.sendSmsVariable(partnerBaseInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS,DateUtil.format(DateUtil.parse(interviewVO.getStartTime()), DatePattern.NORM_DATETIME_MINUTE_PATTERN),wechatMiniAppService.getMiniAppUrl()); - - //记录日志 - LoginUserInfo user = CurrentUserHolder.getUser(); - ApproveAppointmentDTO appointmentLog = ApproveAppointmentDTO.builder() - .interviewPlanId(request.getInterviewPlanId()) - .rawInterviewDateTime(DateUtil.format(DateUtil.parse(interviewVO.getStartTime()), DatePattern.NORM_DATETIME_MINUTE_PATTERN)) - .operateTime(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN)) - .operateUsername(user.getName()) - .operateUserId(user.getUserId()) - .mobile(user.getMobile()) - .build(); - logService.recordBizLog(user, interviewVO.getPartnerLineId(), OperateTypeEnum.INTERVIEW_APPOINTMENT_AGREEMENT, appointmentLog); - } - - @Override - @Transactional - public void reInterview(ReInterviewReq request) throws ApiException { - //查询面试计划信息 - InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - //如果面试计划不存在，抛出异常 - if (interviewVO == null||StringUtil.isEmpty(interviewVO.getInterviewPlanId())) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - rejectInterviewAndSuspendLine(Long.parseLong(interviewVO.getInterviewId()),Long.parseLong(request.getInterviewPlanId()),request.getCertifyFile()); - //更新线索状态 - HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); - hyPartnerLineDO.setId(interviewVO.getPartnerLineId()); - hyPartnerLineDO.setWorkflowStage(WorkflowStageEnum.RESERVATION.getCode()); - hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_0.getCode()); - hyPartnerLineDO.setUpdateTime(new Date()); - hyPartnerLineDO.setDeadline(CoolDateUtils.getDateFormatDay(new Date(),2)); - hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); - //记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - ReInterviewDTO log = ReInterviewDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .rejectRealReason(request.getReason()).certifyFile(request.getCertifyFile()).build(); - logService.recordBizLog(operator,interviewVO.getPartnerLineId(),OperateTypeEnum.REINTERVIEW,log); - } - -// @Override -// @Transactional -// public void rejectInterview(RejectInterviewReq request) throws ApiException { - //查询面试计划信息 -// InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); -// //如果面试计划不存在，抛出异常 -// if (interviewVO == null||StringUtil.isEmpty(interviewVO.getInterviewPlanId())) { -// throw new ServiceException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); -// } -// -// rejectInterviewAndSuspendLine(Long.parseLong(request.getInterviewId()),Long.parseLong(request.getInterviewPlanId()),request.getCertifyFile()) -// //更新线索状态 -// CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); -// closeFollowRequest.setRejectPublicReason(request.getRejectPublicReason()); -// closeFollowRequest.setRejectRealReason(request.getRejectRealReason()); -// closeFollowRequest.setLineId(Long.valueOf(request.getLineId())); -// closeFollowRequest.setType("reject"); -// if(StringUtils.isNotEmpty(request.getCertifyFile())){ -// closeFollowRequest.setCertifyFile(Arrays.asList(request.getCertifyFile().split(","))); -// } -// hyPartnerLineInfoService.closeOrPassFollow(request.getOperatorId(),closeFollowRequest); -// } - - @Override - public String generateFeiShuInterviewMsg(String partnerName, String partnerMobile, String interviewTime){ - //"您有一个【面试预约申请】待处理，预约人【姓名】手机号【13xxxxxxxxx】，预约面试时间【YYYY年MM月DD日 hh:mm】，请及时处理】" - StringBuffer sb = new StringBuffer(); - sb.append("您有一个【面试预约申请】待处理，预约人 ") - .append(partnerName) - .append(" 手机号 ") - .append(partnerMobile) - .append("，预约面试时间") - .append(DateUtil.format(DateUtil.parse(interviewTime), CoolDateUtils.DATE_FORMAT_SEC_7)); - return sb.toString(); - } - @Override - public String getInterviewerByPartner(String partnerId,String lineId){ - String interviewerId = null; - if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { - //根据加盟商用户ID查询面试官ID - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setPartnerId(partnerId); - hyPartnerInterviewPlanDO.setPartnerLineId(Long.valueOf(lineId)); - hyPartnerInterviewPlanDO.setDeleted(false); - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - //如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准 - if (CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) { - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(lineId)); - interviewerId = hyPartnerLineInfoDO.getInvestmentManager(); - }else { - interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer(); - } - } - return interviewerId; - } - - - public String generateInterviewTitle(Long partnerLineId){ - HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoMapper.getByPartnerLineId(partnerLineId); - return "意向 "+partnerBaseInfo.getUsername()+" 线上面试"; - } - - //拒绝面试更新相关信息 - - @Override - public void rejectInterviewAndSuspendLine(Long iterviewId,Long interviewPlanId,String certifyFile){ - //更新面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setId(iterviewId); - hyPartnerInterviewDO.setDeleted(true); - hyPartnerInterviewDO.setUpdateTime(new Date()); - hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_7.getCode())); - hyPartnerInterviewDO.setCertifyFile(certifyFile); - hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - //更新面试计划信息 - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setId(interviewPlanId); - hyPartnerInterviewPlanDO.setDeleted(true); - hyPartnerInterviewPlanDO.setUpdateTime(new Date()); - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); - } - - @Override - public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) { - //1. 处理数据 - //1.1 传参整理 - GetFreeBusyListVO freeBusyListVO = new GetFreeBusyListVO(); - String startDate = request.getStartDate();//开始日期 - String endDate = request.getEndDate();//结束日期 - String partnerId = request.getPartnerId();//加盟商用户ID - String interviewerId = null;//面试官ID - String lineId = request.getLineId();//线索id - //如果加盟商用户ID为空且面试官ID为空，返回错误信息 - if (!(StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) && StringUtils.isEmpty(interviewerId)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_AND_PARTNER_ID_IS_NULL); - } - //如果加盟商用户ID不为空且面试官ID为空 - if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { - interviewerId = getInterviewerByPartner(partnerId, lineId); - } - //1.2 时间转换 - DateTime startDateTime = null; - DateTime endDateTime = null; - if (!StringUtils.isEmpty(startDate)&&!StringUtils.isEmpty(endDate)) { - startDateTime = DateUtil.beginOfDay(DateUtil.parse(startDate)); - endDateTime = DateUtil.endOfDay(DateUtil.parse(endDate)); - } - //1.3 校验时间 - if (startDateTime.isAfter(endDateTime)) { - throw new ServiceException(ErrorCodeEnum.DATE_PARAMS_IS_ERROR); - } - - //2. 查询招商经理各个已被预约时间段（成功或未成功）的预约情况 - //2.1 PC 端和小程序查询的开始和结束时间不同 - String startTimeSuffix = " 10:00:00"; - String endTimeSuffix = " 17:00:00"; - if (Boolean.TRUE.equals(request.getWhetherPC())) { - startTimeSuffix = " 00:00:00"; - endTimeSuffix = " 23:59:59"; - } - String startTimeStr = DateUtil.format(startDateTime, "yyyy-MM-dd") + startTimeSuffix; - String endTimeStr = DateUtil.format(endDateTime, "yyyy-MM-dd") + endTimeSuffix; - List bookSituations = hyPartnerInterviewPlanMapper.getInterviewBookSituation(interviewerId, startTimeStr, endTimeStr); - //2.2 查询该线索已有的面试预约开始时间 - HyPartnerInterviewPlanDO interviewPlanDO = new HyPartnerInterviewPlanDO(); - interviewPlanDO.setPartnerId(request.getPartnerId()); - interviewPlanDO.setDeleted(false); - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(interviewPlanDO); - String partnerAppointStartTime = ""; - if (CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - interviewPlanDO = hyPartnerInterviewPlanDOS.get(0); - partnerAppointStartTime = dateFormat.format(interviewPlanDO.getStartTime()); - } - - //3. 把数据装到各个时间槽里 - //3.1 创建时间槽 - // PC 端创建 8:00-24:00 的时间槽 - // 小程序端创建 10:00-17:00 的时间槽并且不包含中午 12:00-13:00 - List daySlots; - if (request.getWhetherPC().equals(Boolean.TRUE)) { - daySlots = TimeSlotGenerator.generateDaySlotsForPc(startTimeStr, endTimeStr); - } else { - daySlots = TimeSlotGenerator.generateDaySlots(startTimeStr, endTimeStr); - } - freeBusyListVO.setCalendarList(daySlots); - - //3.2 如果查询结果为空，则直接返回全部时间段都是空闲的 - if (org.springframework.util.CollectionUtils.isEmpty(bookSituations)) { - return freeBusyListVO; - } - - //3.3 装到槽里并返回 - //3.3.1 外层循环每一天 - for (CalendarInfo daySlot : daySlots) { - //3.3.2 内层循环每一天的每个时间段 - List freeBusyList = daySlot.getFreeBusyList(); - for (FreeBusyInfo freeBusyInfo : freeBusyList) { - //把日期和时间拼接成yyyy-MM-dd HH:mm格式 - String startStr = daySlot.getDateStr() + " " + freeBusyInfo.getStartTime() + ":00"; - String endStr = daySlot.getDateStr() + " " + freeBusyInfo.getEndTime() + ":00"; - for (HyPartnerInterviewBookSituation bookSituation : bookSituations) { - //比较两个时间段是否有重叠，重叠的就 set 数据进去 - if (startStr.compareTo(bookSituation.getStartTime()) >= 0 && endStr.compareTo(bookSituation.getEndTime()) <= 0) { - freeBusyInfo.setBooked(bookSituation.getBooked()); - freeBusyInfo.setSelfBooked(partnerAppointStartTime.equals(bookSituation.getStartTime())); - freeBusyInfo.setFree(!bookSituation.getBooked()); - freeBusyInfo.setAppointmentCount(bookSituation.getBookingCount()); - bookSituations.remove(bookSituation); - break; - } - } - } - } - return freeBusyListVO; - } - - @Transactional - @Override - public CreateAppointmentVO bookInterview(CreateAppointmentReq request) throws ApiException { - if(request.getPartnerLineId() == null || request.getPartnerLineId()<=0){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL); - } - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId()); - hyPartnerInterviewPlanDO.setDeleted(false); - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)&&hyPartnerInterviewPlanDOS.get(0).getId()!=null){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); - } - String interviewerId = request.getInterviewerId(); - if(StringUtils.isEmpty(interviewerId)){ - interviewerId = getInterviewerByPartner(request.getPartnerId(),String.valueOf(request.getPartnerLineId())); - } - //主动预约时是否是当前时间段的面试 - boolean whetherBeginInterview = false; - DateTime interviewStartTime = DateUtil.offsetMinute(DateUtil.parseDateTime(request.getStartBookingTime()), -5); - if (interviewStartTime.isBeforeOrEquals(new Date())) { - whetherBeginInterview = true; - } - HyPartnerInterviewPlanDO interviewPlanDO = (HyPartnerInterviewPlanDO) agreeInterviewWithoutBook(request, whetherBeginInterview, interviewerId, Boolean.TRUE).get("interviewPlan"); - return new CreateAppointmentVO(interviewPlanDO.getId().toString()); - } - - @Transactional - public Map agreeInterviewWithoutBook(CreateAppointmentReq request, Boolean whetherBeginInterview, String interviewerId, Boolean needSendSms) throws ApiException { - //1.创建面试计划 - HyPartnerInterviewPlanDO interviewPlanDO = new HyPartnerInterviewPlanDO(); - Date now = new Date(); - String startBookingTime = request.getStartBookingTime(); - String startDate = startBookingTime.substring(0, 10); - interviewPlanDO.setInterviewDate(Convert.toDate(startDate)); - interviewPlanDO.setCreateTime(now); - interviewPlanDO.setUpdateTime(now); - interviewPlanDO.setStartTime(Convert.toDate(request.getStartBookingTime())); - interviewPlanDO.setEndTime(Convert.toDate(request.getEndBookingTime())); - interviewPlanDO.setPartnerId(request.getPartnerId()); - interviewPlanDO.setPartnerLineId(request.getPartnerLineId()); - interviewPlanDO.setInterviewer(interviewerId); - interviewPlanDO.setIsPartnerInterview(0); - interviewPlanDO.setApplicationApproved(1); - //1.2 生成房间号 - interviewPlanDO.setRoomId(StringUtil.generateRoomId(startBookingTime)); - //1.3 如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 - if (whetherBeginInterview) { - interviewPlanDO.setRoomStatus(RoomStatus.OPEN.getCode()); - } else { - interviewPlanDO.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); - } - hyPartnerInterviewPlanMapper.insertSelective(interviewPlanDO); - - //2.创建面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(interviewPlanDO.getId()); - //2.1 如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 - if (whetherBeginInterview) { - hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); - } else { - hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode())); - } - hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); - hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); - hyPartnerInterviewDO.setInterviewer(interviewerId); - hyPartnerInterviewDO.setCreateTime(now); - hyPartnerInterviewDO.setUpdateTime(now); - hyPartnerInterviewDO.setDeleted(false); - HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); - hyPartnerInterviewDO.setUpdateTime(now); - hyPartnerInterviewMapper.insertSelective(hyPartnerInterviewDO); - - //3. 修改线索流程状态 - hyPartnerLineDO.setId(request.getPartnerLineId()); - hyPartnerLineDO.setUpdateTime(now); - hyPartnerLineDO.setWorkflowStage(WorkflowStageEnum.INTERVIEW.getCode()); - //3.1 如果同意的时候已经超过预约的时间前 5 分钟，直接进入面试已开始阶段 - if (whetherBeginInterview) { - hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.INTERVIEW_3.getCode()); - } else { - hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.INTERVIEW_2.getCode()); - } - hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); - - //4. 异步发送短信给加盟商 - if (Boolean.TRUE.equals(needSendSms)) { - HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoMapper.getByPartnerLineId(request.getPartnerLineId()); - if(partnerBaseInfo == null){ - throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); - } - eventCenterHttpRequest.sendSmsVariable(partnerBaseInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS, DateUtil.format(DateUtil.parseDateTime(request.getStartBookingTime()), DatePattern.NORM_DATETIME_MINUTE_PATTERN), wechatMiniAppService.getMiniAppUrl()); - } - - //5. 记录日志 - LoginUserInfo operator = CurrentUserHolder.getUser(); - LogBasicDTO log = LogBasicDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)).mobile(operator.getMobile()).build(); - logService.recordBizLog(operator, request.getPartnerLineId(), OperateTypeEnum.INTERVIEWER_BOOK_INTERVIEW,log); - - HashMap res = new HashMap<>(); - res.put("interview", hyPartnerInterviewDO); - res.put("interviewPlan", interviewPlanDO); - return res; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java deleted file mode 100644 index 42f334876..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.label.LabelGroupAddDTO; -import com.cool.store.dto.label.LabelGroupDeleteDTO; -import com.cool.store.dto.label.LabelGroupListDTO; -import com.cool.store.dto.label.LabelGroupUpdateDTO; -import com.cool.store.entity.HyPartnerLabelGroupDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyPartnerLabelGroupMapper; -import com.cool.store.mapper.HyPartnerLabelMapper; -import com.cool.store.service.LabelGroupService; -import com.cool.store.vo.LabelGroupListVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author Fun Li 2023/8/10 13:35 - * @version 1.0 - */ -@Service -public class LabelGroupServiceImpl implements LabelGroupService { - - @Autowired - private HyPartnerLabelGroupMapper labelGroupMapper; - - @Autowired - private HyPartnerLabelMapper labelMapper; - - - @Value("${ec.sync.createUserId:null}") - private String createUserId; - - /** - * 查询标签组信息列表 - * @param dto 查询条件 - */ - @Override - public List getLabelGroupList(LabelGroupListDTO dto) { - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - labelGroupDO.setLabelGroupName(dto.getLabelGroupName()); - return labelGroupMapper.getLabelGroupList(labelGroupDO); - } - - /** - * 添加标签组 - * @param dto 新增标签组信息 - */ - @Override - public void addLabelGroup(LabelGroupAddDTO dto) throws ApiException { - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - labelGroupDO.setLabelGroupName(dto.getLabelGroupName()); - if (whetherGroupDuplicated(labelGroupDO)) { - throw new ApiException(ErrorCodeEnum.LABEL_GROUP_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - labelGroupDO.setEditUserId(userId); - labelGroupDO.setEditDate(new Date()); - labelGroupDO.setCreateUserId(userId); - labelGroupDO.setUpdateUserId(userId); - labelGroupMapper.insertSelective(labelGroupDO); - } - - /** - * 修改标签组信息 - * @param dto 修改内容 - */ - @Override - public void updateLabelGroup(LabelGroupUpdateDTO dto) throws ApiException { - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - labelGroupDO.setLabelGroupName(dto.getLabelGroupName()); - labelGroupDO.setId(dto.getId()); - if (whetherGroupDuplicated(labelGroupDO)) { - throw new ApiException(ErrorCodeEnum.LABEL_GROUP_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - labelGroupDO.setId(dto.getId()); - labelGroupDO.setLabelGroupName(dto.getLabelGroupName()); - labelGroupDO.setEditUserId(userId); - labelGroupDO.setEditDate(new Date()); - labelGroupDO.setUpdateUserId(userId); - labelGroupMapper.updateByPrimaryKeySelective(labelGroupDO); - } - - /** - * 删除标签组 - * @param dto 待删除标签组信息 - */ - @Override - public void deleteLabelGroup(LabelGroupDeleteDTO dto) throws ApiException { - if (whetherGroupInUse(dto.getId())) { - throw new ApiException(ErrorCodeEnum.LABEL_GROUP_IN_USE); - } - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - String userId = CurrentUserHolder.getUserId(); - labelGroupDO.setId(dto.getId()); - labelGroupDO.setDeleted(Boolean.TRUE); - labelGroupDO.setUpdateUserId(userId); - labelGroupMapper.updateByPrimaryKeySelective(labelGroupDO); - } - - /** - * 获取所有标签组 - */ - @Override - public List getAllLabelGroupList() { - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - return labelGroupMapper.getLabelGroupList(labelGroupDO); - } - - @Override - public HyPartnerLabelGroupDO selectByPrimaryKey(Long id){ - return labelGroupMapper.selectByPrimaryKey(id); - } - - @Override - public void addEcLabelGroup(HyPartnerLabelGroupDO hyPartnerLabelGroupDO) { - hyPartnerLabelGroupDO.setCreateTime(new Date()).setCreateUserId(createUserId).setEditDate(new Date()) - .setEditUserId(createUserId); - labelGroupMapper.insertSelective(hyPartnerLabelGroupDO); - } - - /** - * 查询标签组信息列表正序 - */ - @Override - public List getLabelGroupListOrder() { - HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO(); - return labelGroupMapper.getLabelGroupListOrder(labelGroupDO); - } - - /** - * 某个标签组内是否有未删除的标签 - * @param id 标签组 id - */ - private Boolean whetherGroupInUse(Long id) { - return labelMapper.whetherGroupInUse(id); - } - - private Boolean whetherGroupDuplicated(HyPartnerLabelGroupDO labelGroupDO) { - Long id = labelGroupDO.getId(); - labelGroupDO.setId(null); - List hyPartnerLabelGroupDOS = labelGroupMapper.selectSelective(labelGroupDO); - labelGroupDO.setId(id); - //如果修改后的标签组名与原标签组名一致也不算重复，但是要记录更新人 - if (hyPartnerLabelGroupDOS != null && hyPartnerLabelGroupDOS.size() > 0) { - //更新操作还要检查是否与原标签组信息相同，相同的话也不算重复 - if (hyPartnerLabelGroupDOS.get(0).getId().equals(id)) { - return Boolean.FALSE; - } - return Boolean.TRUE; - } - return Boolean.FALSE; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java deleted file mode 100644 index 85904f824..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.label.LabelAddDTO; -import com.cool.store.dto.label.LabelDeleteDTO; -import com.cool.store.dto.label.LabelListDTO; -import com.cool.store.dto.label.LabelUpdateDTO; -import com.cool.store.entity.HyPartnerLabelDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyPartnerLabelMapper; -import com.cool.store.service.LabelService; -import com.cool.store.vo.LabelGroupVO; -import com.cool.store.vo.LabelListVo; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author Fun Li 2023/8/10 14:24 - * @version 1.0 - */ -@Service -@Slf4j -public class LabelServiceImpl implements LabelService { - - @Autowired - private HyPartnerLabelMapper labelMapper; - - - - @Value("${ec.sync.createUserId:null}") - private String createUserId; - - /** - * 获取数组列表 - * - * @param dto 查询条件 - */ - @Override - public List getLabelList(LabelListDTO dto) { - return labelMapper.getLabelList(dto); - } - - /** - * 添加标签组 - * @param dto 新增标签组信息 - */ - @Override - public void addLabel(LabelAddDTO dto) throws ApiException { - HyPartnerLabelDO labelDO = new HyPartnerLabelDO(); - labelDO.setLabelName(dto.getLabelName()); - if (whetherLabelRepeat(labelDO)) { - throw new ApiException(ErrorCodeEnum.LABEL_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - labelDO.setLabelGroupId(dto.getLabelGroupId()); - labelDO.setEditUserId(userId); - labelDO.setEditDate(new Date()); - labelDO.setCreateUserId(userId); - labelDO.setUpdateUserId(userId); - labelMapper.insertSelective(labelDO); - } - - /** - * 修改标签信息 - * @param dto 新标签信息 - */ - @Override - public void updateLabel(LabelUpdateDTO dto) throws ApiException { - HyPartnerLabelDO labelDO = new HyPartnerLabelDO(); - labelDO.setId(dto.getId()); - labelDO.setLabelName(dto.getLabelName()); - if (whetherLabelRepeat(labelDO)) { - throw new ApiException(ErrorCodeEnum.LABEL_EXIST); - } - String userId = CurrentUserHolder.getUserId(); - labelDO.setLabelGroupId(dto.getLabelGroupId()); - labelDO.setEditUserId(userId); - labelDO.setEditDate(new Date()); - labelDO.setUpdateUserId(userId); - labelMapper.updateByPrimaryKeySelective(labelDO); - } - - /** - * 删除标签 - * @param dto - */ - @Override - public void deleteLabel(LabelDeleteDTO dto) { - HyPartnerLabelDO labelDO = new HyPartnerLabelDO(); - String userId = CurrentUserHolder.getUserId(); - labelDO.setId(dto.getId()); - labelDO.setEditUserId(userId); - labelDO.setEditDate(new Date()); - labelDO.setUpdateUserId(userId); - labelDO.setDeleted(Boolean.TRUE); - labelMapper.updateByPrimaryKeySelective(labelDO); - } - - @Override - public HyPartnerLabelDO selectByPrimaryKey(Long classId) { - return labelMapper.selectByPrimaryKey(classId); - } - - @Override - public void addEcLabel(HyPartnerLabelDO hyPartnerLabelDO) { - hyPartnerLabelDO.setEditDate(new Date()).setCreateTime(new Date()).setEditUserId(createUserId).setCreateUserId(createUserId) - .setUpdateUserId(createUserId); - labelMapper.insertSelective(hyPartnerLabelDO); - } - - @Override - public List getAllGroupAndLabelList() { - List labelList = labelMapper.getLabelList(new LabelListDTO()); - if (CollectionUtils.isEmpty(labelList)) { - log.info("标签列表为空"); - return Lists.newArrayList(new LabelGroupVO()); - } - Map> idForVo = labelList.stream().collect(Collectors.groupingBy(LabelListVo::getLabelGroupId)); - List result = idForVo.entrySet().stream().map(entry -> { - LabelGroupVO vo = new LabelGroupVO(); - vo.setId(entry.getKey()); - vo.setLabelGroupName(entry.getValue().get(0).getLabelGroupName()); - vo.setGroupCreateTime(entry.getValue().get(0).getGroupCreateTime()); - List labelList1 = entry.getValue().stream().map(label -> { - LabelGroupVO.LabelVO labelVO = new LabelGroupVO.LabelVO(); - labelVO.setId(label.getId()); - labelVO.setLabelName(label.getLabelName()); - labelVO.setLabelCreateTime(label.getLabelCreateTime()); - return labelVO; - }).sorted(Comparator.comparing(LabelGroupVO.LabelVO::getLabelCreateTime)) - .collect(Collectors.toList()); - vo.setLabelList(labelList1); - return vo; - }).sorted(Comparator.comparing(LabelGroupVO::getGroupCreateTime).thenComparing(LabelGroupVO::getId)).collect(Collectors.toList()); - return result; - } - - private Boolean whetherLabelRepeat(HyPartnerLabelDO label) throws ApiException { - Long id = label.getId(); - label.setId(null); - List hyPartnerLabelDOS = labelMapper.selectSelective(label); - label.setId(id); - //如果修改后的标签名与原标签名一致也不算重复，但是要记录更新人 - if (hyPartnerLabelDOS != null && hyPartnerLabelDOS.size() > 0) { - //更新操作还要检查是否与原标签信息相同，相同的话也不算重复 - if (hyPartnerLabelDOS.get(0).getId().equals(id)) { - return Boolean.FALSE; - } - return Boolean.TRUE; - } - return Boolean.FALSE; - } - - @Override - public Map getUserPortraitMap(List userPortraitStrList){ - Set userPortraitIdList = new HashSet<>(); - for (String userPortrait:userPortraitStrList) { - String[] parts = userPortrait.split(","); - for (String part : parts) { - String trimmedPart = part.trim(); - if (!trimmedPart.isEmpty()) { - try { - Long value = Long.parseLong(trimmedPart); - userPortraitIdList.add(value); - } catch (NumberFormatException e) { - log.info("Invalid format: {}" , trimmedPart); - } - } - } - } - List labelListByIds = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(userPortraitIdList)){ - labelListByIds = labelMapper.getLabelListByIds(new ArrayList<>(userPortraitIdList)); - } - return labelListByIds.stream().collect(Collectors.toMap(HyPartnerLabelDO::getId,HyPartnerLabelDO::getLabelName)); - } - - @Override - public List getUserPortraitList(Map userPortraitMap, String userPortraitStr) { - List userPortraitList= new ArrayList<>(); - if(StringUtils.isNotEmpty(userPortraitStr)){ - String[] parts = userPortraitStr.split(","); - for (String part : parts) { - String trimmedPart = part.trim(); - if (!trimmedPart.isEmpty()) { - try { - if (userPortraitMap.get(Long.valueOf(part)) != null){ - userPortraitList.add(userPortraitMap.get(Long.valueOf(part))); - } - } catch (NumberFormatException e) { - log.info("Invalid format: {}" , trimmedPart); - } - } - } - } - return userPortraitList; - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java deleted file mode 100644 index 16585a11b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java +++ /dev/null @@ -1,324 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.cool.store.constants.ExcelErrorConstants; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.*; -import com.cool.store.dto.log.BlackListLogDTO; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.dto.partner.MobileCheckDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ServiceException; -import com.cool.store.oss.OSSServer; -import com.cool.store.request.AddLineRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.response.error.ErrorExcelResponse; -import com.cool.store.service.HyPartnerLineInfoService; -import com.cool.store.service.LineHighSeasService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.StringUtil; -import com.cool.store.utils.UUIDUtils; -import com.cool.store.utils.poi.ExcelUtil; -import com.cool.store.utils.poi.constant.Constants; -import lombok.SneakyThrows; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.text.MessageFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -@Service -public class LineHighSeasServiceImpl implements LineHighSeasService { - - - @Value("${oss.excelFile.dir:null}") - private String dir; - - @Value("${manual.channel.id:null}") - private Integer manual; - - - @Resource - HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - - @Resource - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - - @Resource - private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - - @Resource - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Resource - private HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - - @Resource - private OSSServer ossServer; - - private final int excelMaxSize = 500; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean addLine(AddLineRequest request) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(request.getMobile()); - if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) { - throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_EXIST); - } - return add(request, "add"); - } - - - /** - * 新增线索 - * - * @param request - */ - public boolean add(AddLineRequest request, String type) { - Boolean flag = false; - String partnerId = UUIDUtils.get32UUID(); - HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); - resultUser.setUsername(request.getPartnerName()).setMobile(request.getMobile()).setPartnerId(partnerId).setCreateTime(new Date()).setAcceptAdjustType(request.getAcceptAdjustType()) - .setLiveArea(request.getLiveArea()).setWantShopArea(request.getWantShopArea()).setUserChannelId(manual); - hyPartnerUserInfoDAO.insertSelective(resultUser); - - HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); - resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode()) - .setCreateUserId(CurrentUserHolder.getUserId()).setCreateUserMobile(CurrentUserHolder.getUser().getMobile()) - .setOperatorType(type); - - //判断招商经理是否为空 - if (StringUtil.isNotEmpty(request.getInvestmentManager())) { - resultLine.setInvestmentManager(request.getInvestmentManager()).setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()); - resultLine.setAllotTime(new Date()); - flag = true; - } else { - //是否分配跟进人 - flag = hyPartnerLineInfoService.assignFollowUser(partnerId, request.getWantShopArea(), request.getAcceptAdjustType(), Boolean.TRUE); - if (flag) { - //查询跟进人 - String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(partnerId, "intent"); - resultLine.setInvestmentManager(investmentManager).setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()); - resultLine.setAllotTime(new Date()); - } else { - //直接放公海 - resultLine.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); - } - } - hyPartnerLineInfoDAO.insertSelective(resultLine); - - HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO(); - resultBase.setPartnerId(partnerId).setPartnerLineId(resultLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). - setCreateTime(new Date()).setUsername(request.getPartnerName()).setMobile(request.getMobile()); - hyPartnerBaseInfoDAO.insertSelective(resultBase); - - LoginUserInfo user = CurrentUserHolder.getUser(); - //添加日志 - LineLogInfo lineLogInfo = new LineLogInfo(resultLine.getPartnerId(), resultLine.getId(), user.getUserId(), - user.getName(), OperateTypeEnum.ADD_LINE, - WorkflowStageEnum.getWorkflowStageByCode(resultLine.getWorkflowStage()), - WorkflowStatusEnum.INTENT_0.getCode(), ""); - BlackListLogDTO logDTO = BlackListLogDTO.builder().operateUserId(user.getUserId()).operateUsername(user.getName()) - .mobile(resultBase.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); - lineLogInfo.setData(logDTO); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - return flag; - } - - @SneakyThrows - @Override - @Transactional(rollbackFor = Exception.class) - public ResponseResult importLine(MultipartFile file) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ExcelUtil util = new ExcelUtil(HyPartnerLineDO.class); - List lineDOList = util.importExcel(file.getInputStream()); - Map>> styleCells = new HashMap<>(4); - if (lineDOList.size() > excelMaxSize) { - //超出五百条的excel都标红 - for (int i = excelMaxSize; i < lineDOList.size(); i++) { - lineDOList.get(i).setErrorInfo(ExcelErrorConstants.COUNT_MORE); - styleCells.put(i, new HashMap<>(4)); - } - ExcelUtil.setRowStyle(styleCells, ExcelUtil.FONT_RED, 7); - util.exportExcel(outputStream, lineDOList, "", styleCells); - InputStream stream = new ByteArrayInputStream(outputStream.toByteArray()); - String fileStr = ossServer.uploadFileServer(stream, dir + getExcelName()); - return new ResponseResult(500, "共上传" + lineDOList.size() + "条线索，其中" + styleCells.size() + "条存在异常", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr)); - } - //获取重复手机号集合 - List uniqueList = lineDOList.stream().filter(item -> StringUtil.isNotEmpty(item.getMobile())).collect(Collectors.groupingBy(HyPartnerLineDO::getMobile, Collectors.counting())) - .entrySet().stream().filter(e -> e.getValue() > 1) - .map(Map.Entry::getKey).collect(Collectors.toList()); - for (int i = 0; i < lineDOList.size(); i++) { - HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i); - String partnerName = hyPartnerLineDO.getPartnerName(); - if (StringUtil.isEmpty(partnerName)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.NAME_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.NAME_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 0, new String[]{ExcelUtil.FONT_RED}); - } else { - if (partnerName.length() > 10) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.NAME_OVER_LENGTH : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.NAME_OVER_LENGTH)); - ExcelUtil.setStyleMap(styleCells, i, 0, new String[]{ExcelUtil.FONT_RED}); - } - } - String mobile = hyPartnerLineDO.getMobile().trim(); - //手机号为空 - if (StringUtil.isEmpty(mobile)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.MOBILE_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.MOBILE_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 1, new String[]{ExcelUtil.FONT_RED}); - } else { - //手机号格式判断 - if (!isPhone(mobile)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.MOBILE_ERROR : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.MOBILE_ERROR)); - ExcelUtil.setStyleMap(styleCells, i, 1, new String[]{ExcelUtil.FONT_RED}); - } - //手机号是否已存在 - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); - if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.MOBILE_EXIST : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.MOBILE_EXIST)); - ExcelUtil.setStyleMap(styleCells, i, 1, new String[]{ExcelUtil.FONT_RED}); - } - //手机号重复 - if (uniqueList.contains(mobile)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.MOBILE_REPEAT : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.MOBILE_REPEAT)); - ExcelUtil.setStyleMap(styleCells, i, 1, new String[]{ExcelUtil.FONT_RED}); - } - } - //常驻区域为空 - String liveArea = hyPartnerLineDO.getLiveAreaReplace().trim(); - if (StringUtil.isEmpty(liveArea)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.LIVE_AREA_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.LIVE_AREA_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 2, new String[]{ExcelUtil.FONT_RED}); - } else { - //判断格式是否为错 - if (ObjectUtil.isNull(hyOpenAreaInfoDAO.selectByAreaPath(liveArea))) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.LIVE_AREA_FORMAT_ERROR : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.LIVE_AREA_FORMAT_ERROR)); - ExcelUtil.setStyleMap(styleCells, i, 2, new String[]{ExcelUtil.FONT_RED}); - } else { - hyPartnerLineDO.setLiveArea(liveArea.replace(Constants.FORWARD_SLASH, Constants.SPACE)); - } - } - //意向区域 - String wantShopArea = hyPartnerLineDO.getWantShopAreaReplace().trim(); - if (StringUtil.isEmpty(wantShopArea)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.WANT_SHOP_AREA_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.WANT_SHOP_AREA_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 3, new String[]{ExcelUtil.FONT_RED}); - } else { - //判断格式是否为错 - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectByAreaPath(wantShopArea); - if (ObjectUtil.isNull(hyOpenAreaInfoDO)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.WANT_SHOP_AREA_FORMAT_ERROR : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.WANT_SHOP_AREA_FORMAT_ERROR)); - ExcelUtil.setStyleMap(styleCells, i, 3, new String[]{ExcelUtil.FONT_RED}); - } else { - hyPartnerLineDO.setWantShopArea(hyOpenAreaInfoDO.getId()); - } - } - //是否接受调剂 - String acceptAdjustType = hyPartnerLineDO.getAcceptAdjustTypeReplace().trim(); - if (StringUtil.isEmpty(acceptAdjustType)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.ACCEPT_ADJUST_TYPE_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.ACCEPT_ADJUST_TYPE_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 4, new String[]{ExcelUtil.FONT_RED}); - } else { - Integer enumByName = AcceptAdjustTypeEnum.findEnumByName(acceptAdjustType); - if (ObjectUtil.isNull(enumByName)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.ACCEPT_ADJUST_TYPE_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.ACCEPT_ADJUST_TYPE_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 4, new String[]{ExcelUtil.FONT_RED}); - } else { - hyPartnerLineDO.setAcceptAdjustType(enumByName); - } - } - //分配招商经理 - String investmentManager = hyPartnerLineDO.getInvestmentManagerReplace().trim(); - if (StringUtil.isNotEmpty(investmentManager)) { - //判断是否能够查询的到 - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByInvestmentManager(investmentManager); - if (ObjectUtil.isNull(enterpriseUserDO)) { - hyPartnerLineDO.setErrorInfo(StringUtil.isEmpty(hyPartnerLineDO.getErrorInfo()) ? ExcelErrorConstants.INVESTMENT_MANAGER_LOSE : hyPartnerLineDO.getErrorInfo().concat(Constants.SEMICOLON).concat(ExcelErrorConstants.INVESTMENT_MANAGER_LOSE)); - ExcelUtil.setStyleMap(styleCells, i, 5, new String[]{ExcelUtil.FONT_RED}); - } else { - hyPartnerLineDO.setInvestmentManager(enterpriseUserDO.getUserId()); - } - } - } - util.exportExcel(outputStream, lineDOList, "", styleCells); - InputStream stream = new ByteArrayInputStream(outputStream.toByteArray()); - String fileStr = ossServer.uploadFileServer(stream, dir + getExcelName()); - if (styleCells.size() != 0) { - return new ResponseResult(500, "共上传" + lineDOList.size() + "条线索，其中" + styleCells.size() + "条存在异常", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr)); - } - for (HyPartnerLineDO hyPartnerLineDO : lineDOList) { - AddLineRequest addLineRequest = new AddLineRequest(); - BeanUtil.copyProperties(hyPartnerLineDO, addLineRequest); - addLineRequest.setWantShopArea(hyPartnerLineDO.getWantShopArea().toString()); - add(addLineRequest, "import"); - } - return new ResponseResult(ResponseCodeEnum.SUCCESS.getCode(), "共上传" + lineDOList.size() + "条线索", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr)); - } - - @Override - public ResponseResult addCheckout(String mobile) { - if (!isPhone(mobile)) { - throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_INCORRECT); - } - MobileCheckDTO mobileCheckDTO = hyPartnerUserInfoDAO.selectByCheckMobile(mobile); - if (ObjectUtil.isNotNull(mobileCheckDTO)) { - if (mobileCheckDTO.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())) { - throw new ServiceException(ErrorCodeEnum.PUBLIC_LINE_NOT_FOLLOW); - } else { - String message = MessageFormat.format(ErrorCodeEnum.LINE_EXIST_FOLLOW.getMessage(), mobileCheckDTO.getInvestmentManagerName(), mobileCheckDTO.getInvestmentManagerMobile()); - return new ResponseResult(ErrorCodeEnum.LINE_EXIST_FOLLOW.getCode(),message); - } - } - return ResponseResult.success() ; - } - - /** - * @param phone 字符串类型的手机号 - * 传入手机号,判断后返回 - * true为手机号,false相反 - */ - public static boolean isPhone(String phone) { - String regex = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$"; - if (phone.length() != 11) { - return false; - } else { - Pattern p = Pattern.compile(regex); - Matcher m = p.matcher(phone); - return m.matches(); - } - } - - /** - * 获取excel名称 - * - * @return - */ - private String getExcelName() { - String format = DateUtil.format(new Date(), "yyyyMMdd").concat(Constants.D_LINE).concat(IdUtil.simpleUUID().substring(0, 10)); - return format.concat(Constants.POMINT).concat(Constants.EXCEL_XLSX); - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java deleted file mode 100644 index 00cdd40f5..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LogServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.HyPartnerTaskInfoLogDAO; -import com.cool.store.dto.log.LineLogInfo; -import com.cool.store.dto.log.LogBasicDTO; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.service.LogService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.Md5Utils; -import com.cool.store.vo.PartnerUserInfoVO; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-28 00:10 - * @Description: - */ -@Service -public class LogServiceImpl implements LogService { - private static final Logger LOG = LoggerFactory.getLogger(Md5Utils.class); - - @Autowired - private HyPartnerLineInfoMapper partnerLineInfoMapper; - @Autowired - private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - - @Override - @Async - public void recordBizLog(LoginUserInfo operator,Long lineId,OperateTypeEnum operateTypeEnum,Object logData){ - try { - List lineInfos = partnerLineInfoMapper.getHyPartnerLineInfoListByIds(Arrays.asList(lineId)); - if (lineInfos == null || lineInfos.size() == 0) { - return; - } - HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfos.get(0); - LineLogInfo lineLogInfo = null; - if(operator!= null){ - lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getUserId(), - operator.getName(), operateTypeEnum, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - }else { - lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, null, - null, operateTypeEnum, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - } - lineLogInfo.setData(logData); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - }catch (Exception e){ - LOG.error("recordBizLog error",e); - e.printStackTrace(); - } - } - - @Override - @Async - public void recordPartnerBizLog(PartnerUserInfoVO operator, Long lineId, OperateTypeEnum operateTypeEnum, Object logData){ - try { - List lineInfos = partnerLineInfoMapper.getHyPartnerLineInfoListByIds(Arrays.asList(lineId)); - if (lineInfos == null || lineInfos.size() == 0) { - return; - } - HyPartnerLineInfoDO hyPartnerLineInfoDO = lineInfos.get(0); - LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), lineId, operator.getPartnerId(), - operator.getUsername(), operateTypeEnum, - WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()), - hyPartnerLineInfoDO.getWorkflowStatus(), ""); - lineLogInfo.setData(logData); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); - }catch (Exception e){ - LOG.error("recordBizLog error",e); - e.printStackTrace(); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java deleted file mode 100644 index cc381dad7..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSON; -import com.cool.store.constants.CommonConstants; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.context.DataSourceContext; -import com.cool.store.dao.*; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.SysRoleDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.UserStatusEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.service.LoginService; -import com.cool.store.utils.RedisUtilPool; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.crypto.RandomNumberGenerator; -import org.apache.shiro.crypto.SecureRandomNumberGenerator; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; - -/** - * @author zhangchenbiao - * @FileName: LoginServiceImpl - * @Description: - * @date 2023-05-23 9:57 - */ -@Service -@Slf4j -public class LoginServiceImpl implements LoginService { - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private SysRoleDAO sysRoleDAO; - @Resource - private RedisUtilPool redisUtilPool; - @Resource - private EnterpriseUserRoleDAO enterpriseUserRoleDAO; - - @Override - public Object feiShuLogin(String userId, Boolean needRefreshToken, String avatar) { - log.info("isvLogin, userId={}", userId); - DataSourceContext.clearDataSourceType(); - if (StringUtils.isEmpty(userId)) { - throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST); - } - LoginUserInfo currentUser = new LoginUserInfo(); - // 查企业用户 - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId); - if(enterpriseUser == null){ - throw new ServiceException(ErrorCodeEnum.NOT_AUTH); - } - SysRoleDO sysRole = sysRoleDAO.getHighestPriorityRoleByUserId(userId); - if(UserStatusEnum.FREEZE.getCode().equals(enterpriseUser.getUserStatus())){ - throw new ServiceException(ErrorCodeEnum.USER_FREEZE); - } - if(UserStatusEnum.WAIT_AUDIT.getCode().equals(enterpriseUser.getUserStatus())){ - throw new ServiceException(ErrorCodeEnum.USER_WAIT_AUDIT); - } - //用户是否已有头像 - Boolean hasAvatar = StringUtils.isNotEmpty(enterpriseUser.getAvatar()) && !enterpriseUser.getAvatar().contains(CommonConstants.DEFAULT_AVATAR); - String finalAvatar = hasAvatar ? enterpriseUser.getAvatar() : avatar; - enterpriseUser.setAvatar(finalAvatar); - enterpriseUser.setFaceUrl(finalAvatar); - currentUser.setUserId(enterpriseUser.getUserId()); - currentUser.setIsAdmin(enterpriseUser.getIsAdmin()); - currentUser.setMobile(enterpriseUser.getMobile()); - currentUser.setSysRole(sysRole); - currentUser.setOnlineStatus(enterpriseUser.getOnlineStatus()); - currentUser.setAvatar(enterpriseUser.getAvatar()); - //生成令牌 - RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator(); - String token = randomNumberGenerator.nextBytes().toHex(); - currentUser.setName(enterpriseUser.getName()); - currentUser.setAccessToken(token); - redisUtilPool.setString(MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, token), JSON.toJSONString(currentUser), CommonConstants.THREE_DAY_SECONDS); - redisUtilPool.setString(currentUser.getUserId(), token); - log.info("[" + enterpriseUser.getName() + "; action_token："+ token + "; userId：" + currentUser.getUserId() +"]登入系统成功"); - return currentUser; - } - - @Override - public Boolean saveUserOnlineStatus(String userId, Integer onlineStatus) { - enterpriseUserDAO.updateOnlineStatusByUserId(userId, onlineStatus); - return Boolean.TRUE; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java deleted file mode 100644 index dcc1589c9..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dto.response.MDMResultDTO; -import com.cool.store.entity.MDMAreaDO; -import com.cool.store.exception.ApiException; -import com.cool.store.http.MDMHttpRequest; -import com.cool.store.mapper.MdmAreaMapper; -import com.cool.store.response.mdm.BelongRegion; -import com.cool.store.response.mdm.BusinessRegion; -import com.cool.store.service.MDMAreaService; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.StringUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class MDMAreaServiceImpl implements MDMAreaService { - - @Autowired - private RedisUtilPool redisUtilPool; - - @Autowired - private MdmAreaMapper mdmAreaMapper; - - @Autowired - private MDMHttpRequest mdmHttpRequest; - - /** - * 获取省级数据 - */ - @Override - public List getProvince() { -// String provincesJson = redisUtilPool.getString(RedisConstant.MDM_AREA_PROVINCE); -// if (StringUtils.isNotEmpty(provincesJson)) { -// return (List) JSONObject.parseObject(provincesJson, List.class); -// } - List areaDOList = mdmAreaMapper.getProvince(); - //过期时间三小时 -// redisUtilPool.setString(RedisConstant.MDM_AREA_PROVINCE, JSONObject.toJSONString(areaDOList), 3 * 60 * 60); - return areaDOList; - } - - /** - * 获取子级地区 - * @param code 父级 code - */ - @Override - public List getSonArea(String code) { -// String provincesJson = redisUtilPool.getString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code)); -// if (StringUtils.isNotEmpty(provincesJson)) { -// return (List) JSONObject.parseObject(provincesJson, List.class); -// } - List areaDOList = mdmAreaMapper.getSonArea(code); - //数据库也没有该数据就缓存空值，但是只缓存一分钟 -// if (areaDOList == null || areaDOList.size() == 0) { -// redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), "", 60); -// } - //过期时间三小时 -// redisUtilPool.setString(MessageFormat.format(RedisConstant.MDM_AREA_OTHERS, code), JSONObject.toJSONString(areaDOList), 3 * 60 * 60); - return areaDOList; - } - - @Override - public List getAllAreaCode(String code) { - if (StringUtil.isEmpty(code)) { - return null; - } - //获取省下所有数据 - List provinceCodeList= mdmAreaMapper.getProvinceAllCode(code); - if(CollectionUtils.isEmpty(provinceCodeList)){ - //获取市区下所有数据 - List cityCodeList= mdmAreaMapper.getSonArea(code); - if(CollectionUtils.isEmpty(cityCodeList)){ - //获取区数据 - return mdmAreaMapper.getArea(code); - }else { - return cityCodeList; - } - }else { - return provinceCodeList; - } - } - - /** - * 省为true - * 非省为false - * @param code - * @return - */ - @Override - public boolean getAreaProvinceType(String code) { - if (StringUtil.isEmpty(code)) { - return false; - } - //获取省下所有数据 - List provinceCodeList= mdmAreaMapper.getProvinceAllCode(code); - return CollectionUtils.isEmpty(provinceCodeList)?false:true; - } - - /** - * 获取所有所属大区 - * @return 所属大区 - */ - @Override - public List getBelongRegion() throws ApiException { -// String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BELONG_REGION); -// if (StringUtil.isNotEmpty(belongRegionsString)) { -// return (List) JSONObject.parseObject(belongRegionsString, List.class); -// } - Map headers = new HashMap<>(); - headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); - ResponseEntity belongRegionResp = mdmHttpRequest.getBelongRegion(headers); - List belongRegions = (List) belongRegionResp.getBody().getData(); - //缓存，半个小时过期 -// redisUtilPool.setString(RedisConstant.MDM_BELONG_REGION, JSON.toJSONString(belongRegions), 30 * 60); - return belongRegions; - } - - /** - * 获取所有业务区域 - * @return 业务区域 - */ - @Override - public List getBusinessRegion() throws ApiException { -// String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BUSINESS_REGION); -// if (StringUtil.isNotEmpty(belongRegionsString)) { -// return (List) JSONObject.parseObject(belongRegionsString, List.class); -// } - Map headers = new HashMap<>(); - headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); - ResponseEntity belongRegionResp = mdmHttpRequest.getBusinessRegion(headers); - List businessRegions = (List) belongRegionResp.getBody().getData(); - //缓存，半个小时过期 -// redisUtilPool.setString(RedisConstant.MDM_BUSINESS_REGION, JSON.toJSONString(businessRegions), 30 * 60); - return businessRegions; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java deleted file mode 100644 index 32538c299..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.SysMenuDAO; -import com.cool.store.dao.SysRoleMenuDAO; -import com.cool.store.dto.menu.AddMenuDTO; -import com.cool.store.entity.SysMenuDO; -import com.cool.store.entity.SysRoleMenuDO; -import com.cool.store.enums.MenuTypeEnum; -import com.cool.store.enums.PlatFormTypeEnum; -import com.cool.store.service.MenuService; -import com.cool.store.utils.CommonNodeUtils; -import com.cool.store.vo.menu.MenuAuthTreeVO; -import com.cool.store.vo.menu.MenuTreeVO; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @author zhangchenbiao - * @FileName: MenuServiceImpl - * @Description: - * @date 2023-06-08 16:43 - */ -@Service -public class MenuServiceImpl implements MenuService { - - @Resource - private SysMenuDAO sysMenuDAO; - @Resource - private SysRoleMenuDAO sysRoleMenuDAO; - - @Override - public List getUserMenus(String userId, String roleId) { - List menuList= sysMenuDAO.selectMenuAll(null); - List roleMenuList = sysRoleMenuDAO.getRoleMenuByRoleId(roleId); - /*List anthMenuIdList = menuList.stream().filter(o -> MenuTypeEnum.AUTH.getCode().equals(o.getMenuType())).map(SysMenuDO::getId).collect(Collectors.toList()); - List roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).filter(anthMenuIdList::contains).collect(Collectors.toList());*/ - List roleMenuIdList = roleMenuList.stream().map(SysRoleMenuDO::getMenuId).collect(Collectors.toList()); - Set authMenuSet = new HashSet<>(); - //1倒推菜单列表 2.转换成树` - if (CollectionUtils.isEmpty(roleMenuIdList)) { - return new ArrayList<>(); - } - authMenuSet.addAll(roleMenuIdList); - Map idMap = menuList.stream().filter(a -> a.getId() != null && a.getParentId() != null).collect(Collectors.toMap(SysMenuDO::getId, SysMenuDO::getParentId)); - for (Long menuId : roleMenuIdList) { - getParentNode(menuId, idMap, authMenuSet); - } - menuList = menuList.stream().filter(data -> authMenuSet.contains(data.getId())).collect(Collectors.toList()); - //根据角色获取菜单 - return MenuTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList); - } - - @Override - public List getAllMenus() { - List menuList= sysMenuDAO.selectMenuAll(null); - return MenuAuthTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList); - } - - @Override - public Long addMenu(AddMenuDTO param, MenuTypeEnum menuType) { - return sysMenuDAO.addMenu(AddMenuDTO.convertDO(param, menuType)); - } - - @Override - public Long deleteMenuAuth(Long id) { - List menuList = sysMenuDAO.selectMenuAll(null); - List idList = menuList.stream().map(SysMenuDO::getId).collect(Collectors.toList()); - Map> parentGroupMap = menuList.stream().collect(Collectors.groupingBy(SysMenuDO::getParentId, Collectors.mapping(SysMenuDO::getId, Collectors.toList()))); - List allChildList = CommonNodeUtils.getAllChildListContainSelf(0L,id, idList, parentGroupMap); - sysMenuDAO.batchDeleteMenu(allChildList); - return null; - } - - @Override - public Integer sortMenu(List ids) { - List list = new LinkedList<>(); - for (int i = 1; i <= ids.size(); i++) { - SysMenuDO sysMenuDO = new SysMenuDO(); - sysMenuDO.setSort(i); - sysMenuDO.setId(ids.get(i - 1)); - list.add(sysMenuDO); - } - return sysMenuDAO.batchUpdateMenu(list); - } - - private void getParentNode(Long menuId, Map idMap, Set authMenuList) { - Long parentId = idMap.get(menuId); - authMenuList.add(parentId); - if (parentId!=null&&parentId != 0) { - getParentNode(parentId, idMap, authMenuList); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java deleted file mode 100644 index 22cd5339b..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dto.message.SendCardMessageDTO; -import com.cool.store.enums.FeiShuNoticeMsgEnum; -import com.cool.store.http.ISVHttpRequest; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.text.MessageFormat; -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-07-19 17:06 - * @Description: - */ -@Slf4j -@Service -public class NoticeService { - - @Value("${feishu.notice.link.url}") - private String linkUrl; - @Autowired - private ISVHttpRequest isvHttpRequest; - - /** - * @deprecated 替换为 {@link com.cool.store.http.EventCenterHttpRequest#sendFeiShuNotice(FeiShuNoticeMsgEnum, List, Object...)} - */ - @Deprecated - public void sendFeiShuNotice(FeiShuNoticeMsgEnum feiShuNoticeMsgEnum, List userIds, Object... objects) { - try{ - if (CollectionUtils.isEmpty(userIds)){ - log.info("sendFeiShuNotice_feiShuNoticeMsgEnum:{} userIds:{},objects:{}",feiShuNoticeMsgEnum.getTitle(), JSONObject.toJSONString(userIds),JSONObject.toJSONString(objects)); - return; - } - SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); - sendCardMessageDTO.setUserIds(userIds); - sendCardMessageDTO.setMessageType(feiShuNoticeMsgEnum); - sendCardMessageDTO.setMessageUrl(linkUrl); - sendCardMessageDTO.setTitle(feiShuNoticeMsgEnum.getTitle()); - sendCardMessageDTO.setContent(MessageFormat.format(feiShuNoticeMsgEnum.getContent(),objects)); - isvHttpRequest.sendFeiShuCardMessage(sendCardMessageDTO); - }catch (Exception e){ - log.info("发送飞书通知失败"); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java deleted file mode 100644 index 3c4799195..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ /dev/null @@ -1,287 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dto.partner.ApplyReservationProvinceDTO; -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.mapper.HyOpenAreaInfoMapper; -import com.cool.store.request.OpenAreaRequest; -import com.cool.store.service.OpenAreaService; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.OpenAreaTreeVO; -import com.cool.store.vo.OpenAreaVO; -import com.cool.store.vo.OpenProvinceVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/13 22:11 - * @Version 1.0 - */ -@Slf4j -@Service -public class OpenAreaServiceImpl implements OpenAreaService { - - @Resource - private HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - @Resource - private HyOpenAreaInfoMapper hyOpenAreaInfoMapper; - @Resource - private RedisUtilPool redisUtilPool; - - - @Override - public List queryByKeyword(String keyword,String areaStatus,Boolean flag) { - //先查出所有的一级菜单 - List openArea = hyOpenAreaInfoDAO.queryFirstLevel(); - Map longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); - - //查询关键字下所有的数据 原始的数据 - List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,null,areaStatus,flag); - Set longSet = hyOpenAreaInfoDOS.stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toSet()); - - List result = new ArrayList<>(); - result.addAll(hyOpenAreaInfoDOS); - hyOpenAreaInfoDOS.stream().forEach(x->{ - Long parentId = x.getParentId(); - - if (parentId!=null&&!longSet.contains(parentId)){ - //添加到集合中 - longSet.add(x.getParentId()); - HyOpenAreaInfoDO hyOpenAreaInfoDO = longHyOpenAreaInfoDOMap.get(parentId); - result.add(hyOpenAreaInfoDO); - } - }); - - JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(result)), "id", "parentId","childNode" ); - List openAreaTreeVOS = JSONObject.parseArray(objects.toJSONString(), OpenAreaTreeVO.class); - return openAreaTreeVOS; - } - - @Override - public List queryAllOpenAreaByKeyword(String keyword,Boolean applyFlag, Boolean flag) { - long startTime = System.currentTimeMillis(); - //先查出所有的一级菜单 - List openArea = hyOpenAreaInfoDAO.queryFirstLevel(); - log.info("11耗时：{}", System.currentTimeMillis() - startTime); - Map longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); - - //查询关键字下所有的数据 原始的数据 - List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,applyFlag,null,flag); - log.info("22耗时：{}", System.currentTimeMillis() - startTime); - Map hyMap = hyOpenAreaInfoDOS.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); - - Set list = new HashSet(); - hyOpenAreaInfoDOS.stream().forEach(x->{ - Long parentId = x.getParentId(); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(parentId); - if (hyOpenAreaInfoDO==null&&parentId!=null){ - //添加到集合中 - list.add(x.getParentId()); - } - }); - log.info("33耗时：{}", System.currentTimeMillis() - startTime); - if (CollectionUtils.isNotEmpty(list)){ - //二级采单 - List hyOpenAreaInfoDOList = hyOpenAreaInfoDAO.queryByIdsExcludeFirstLevel(new ArrayList<>(list)); - hyOpenAreaInfoDOS.addAll(hyOpenAreaInfoDOList); - //如果二级采单是空 说明list全部是一级采单 - if (CollectionUtils.isEmpty(hyOpenAreaInfoDOList)){ - list.stream().forEach(x->{ - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(x); - if (hyOpenAreaInfoDO==null){ - hyOpenAreaInfoDOS.add(longHyOpenAreaInfoDOMap.get(x)); - } - }); - } - hyOpenAreaInfoDOList.stream().forEach(x->{ - Long parentId = x.getParentId(); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyMap.get(parentId); - if (hyOpenAreaInfoDO==null){ - HyOpenAreaInfoDO infoDO = longHyOpenAreaInfoDOMap.get(parentId); - hyOpenAreaInfoDOS.add(infoDO); - } - }); - } - log.info("44耗时：{}", System.currentTimeMillis() - startTime); - JSONArray objects = buildTree(JSONArray.parseArray(JSONObject.toJSONString(hyOpenAreaInfoDOS)), "id", "parentId","childNode" ); - List openAreaTreeVOS = JSONObject.parseArray(objects.toJSONString(), OpenAreaTreeVO.class); - log.info("55耗时：{}", System.currentTimeMillis() - startTime); - return openAreaTreeVOS; - } - - @Override - public List searchOpenArea(String keyword,Boolean applyFlag, Boolean flag) { - long startTime = System.currentTimeMillis(); - List allAreaList = hyOpenAreaInfoDAO.getAllOpenArea(); - log.info("11耗时：{}", System.currentTimeMillis() - startTime); - return OpenAreaTreeVO.convertTree(allAreaList, keyword, applyFlag); - } - - @Override - public List getChildrenList(String type, Long parentId) { - List childrenList = hyOpenAreaInfoDAO.getChildrenList(type, parentId); - List result = new ArrayList<>(); - childrenList.stream().forEach(x->{ - OpenAreaVO openAreaVO = convertDoToVo(x); - result.add(openAreaVO); - }); - return result; - } - - @Override - public Boolean batchUpdate(String userId, OpenAreaRequest request) { - //修改选择的区域 - hyOpenAreaInfoDAO.batchUpdateById(request.getBackgroundBanner(),request.getDetailBanner(),request.getStatus(),userId,request.getIdList()); - //修改选择区域的子区域 - hyOpenAreaInfoDAO.batchUpdateByParentId(request.getBackgroundBanner(),request.getDetailBanner(),request.getStatus(),userId,request.getIdList()); - - return Boolean.TRUE; - } - - @Override - public PageInfo queryKeyOpenAreaList(Integer pageSize, Integer pageNumber) { - PageHelper.startPage(pageNumber,pageSize); - List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryKeyOpenArea(); - PageInfo hyOpenAreaInfoDOPageInfo = new PageInfo<>(hyOpenAreaInfoDOS); - if (hyOpenAreaInfoDOPageInfo==null){ - return new PageInfo<>(); - } - List list = new ArrayList<>(); - List hyOpenAreaInfoDOList = hyOpenAreaInfoDOPageInfo.getList(); - hyOpenAreaInfoDOList.stream().forEach(x->{ - list.add(convertDoToVo(x)); - }); - hyOpenAreaInfoDOPageInfo.setList(list); - return hyOpenAreaInfoDOPageInfo; - } - - @Override - public OpenProvinceVO getOpenProvince() { - //先查出所有的一级菜单 - List openArea = hyOpenAreaInfoDAO.queryFirstLevel(); - List applyReservationProvinceCount = hyOpenAreaInfoDAO.getApplyReservationProvinceCount(); - Map applyMap = applyReservationProvinceCount.stream().collect(Collectors.toMap(ApplyReservationProvinceDTO::getAreaName, ApplyReservationProvinceDTO::getApplyCount)); - Map reservationMap = applyReservationProvinceCount.stream().collect(Collectors.toMap(ApplyReservationProvinceDTO::getAreaName, ApplyReservationProvinceDTO::getReservationCount)); - List applyProvinceList = new ArrayList<>(); - List reservationProvinceList = new ArrayList<>(); - - openArea.stream().forEach(x->{ - String areaName = x.getAreaName(); - if (applyMap.getOrDefault(areaName,0)>0){ - applyProvinceList.add(convertDoToVo(x)); - } - if (reservationMap.getOrDefault(areaName,0)>0){ - reservationProvinceList.add(convertDoToVo(x)); - } - }); - OpenProvinceVO openProvinceVO = new OpenProvinceVO(); - openProvinceVO.setApplyProvinceList(applyProvinceList); - openProvinceVO.setReservationProvinceList(reservationProvinceList); - return openProvinceVO; - } - - @Override - public Boolean addOpenArea() { - //查询出所有的市 - List openArea = hyOpenAreaInfoDAO.selectAllCity(); - if (CollectionUtils.isNotEmpty(openArea)){ - //在每个市下面添加名称为不限的区 - openArea.forEach(x->{ - Long id = x.getId(); - HyOpenAreaInfoDO hyOpenAreaInfoDO = new HyOpenAreaInfoDO(); - hyOpenAreaInfoDO.setAreaStatus("open"); - hyOpenAreaInfoDO.setAreaName("不限"); - hyOpenAreaInfoDO.setParentId(id); - hyOpenAreaInfoDO.setAreaPath(x.getAreaPath()+"不限/"); - hyOpenAreaInfoMapper.insertSelective(hyOpenAreaInfoDO); - }); - } - return true; - } - - private OpenAreaVO convertDoToVo(HyOpenAreaInfoDO hyOpenAreaInfoDO){ - OpenAreaVO openAreaVO = new OpenAreaVO(); - openAreaVO.setId(hyOpenAreaInfoDO.getId()); - openAreaVO.setAreaName(hyOpenAreaInfoDO.getAreaName()); - openAreaVO.setParentId(hyOpenAreaInfoDO.getParentId()); - openAreaVO.setAreaPath(hyOpenAreaInfoDO.getAreaPath()); - openAreaVO.setAreaStatus(hyOpenAreaInfoDO.getAreaStatus()); - openAreaVO.setBackgroundBanner(hyOpenAreaInfoDO.getBackgroundBanner()); - openAreaVO.setDetailBanner(hyOpenAreaInfoDO.getDetailBanner()); - return openAreaVO; - } - - - /** - * 构建树 - * @param arr - * @param id - * @param pid - * @param child - * @return - */ - public static JSONArray buildTree(JSONArray arr, String id, String pid, String child) { - //新建一个JSONArray来接收组装成树形结构的返回值 - JSONArray jsonArray = new JSONArray(); - //新建一个JSONObject对象 - JSONObject hash = new JSONObject(); - //将数组转换为object格式 - for (int i = 0; i < arr.size(); i++) { - //获取当前的JSON对象 - JSONObject json = (JSONObject) arr.get(i); - //把当前id作为键，当前JSON对象作为值 put回hash这个Object对象中 - //这里的put方法类似于map的put方法 - hash.put(json.getString(id), json); - } - //遍历结果集 - for (int j = 0; j < arr.size(); j++) { - //单条记录 - JSONObject aVal = (JSONObject) arr.get(j); - //在hash中取出key为单条记录中pid的值 - String pidStr = ""; - //如果父级id不等于null - if (aVal.get(pid) != null) { - pidStr = aVal.get(pid).toString(); - } - //从hash这个对象中获取父级对象 parent - JSONObject hashParent = (JSONObject) hash.get(pidStr); - //如果记录的pid存在，则说明它有父节点，将她添加到孩子节点的集合中 - if (hashParent != null) { - //检查是否有child属性 - if (hashParent.get(child) != null) { - //有子节点 则先将子节点取出 - JSONArray children = (JSONArray) hashParent.get(child); - //然后把当前这个对象放进子节点之中 - children.add(aVal); - //最后把子节点在放回父节点之中 - hashParent.put(child, children); - } else { - //无子节点 则新建一个子节点 - JSONArray children = new JSONArray(); - //然后再把当前对象放进去 - children.add(aVal); - //最后在放回父节点之中 - hashParent.put(child, children); - } - } else { - jsonArray.add(aVal); - } - } - return jsonArray; - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java deleted file mode 100644 index bc57701b3..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ /dev/null @@ -1,378 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyExhibitionDAO; -import com.cool.store.dao.HyInterviewDAO; -import com.cool.store.dao.HyPartnerExhibitionDAO; -import com.cool.store.dto.log.LogBasicDTO; -import com.cool.store.dto.log.ModifyInterviewTimeDTO; -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.dto.partner.LineQueryInterviewDto; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.CreateAppointmentReq; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.request.ModifyInterviewTimeReq; -import com.cool.store.service.InterviewService; -import com.cool.store.service.LogService; -import com.cool.store.service.PartnerInterviewService; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.StringUtil; -import com.cool.store.utils.TRTCUtils; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.cool.store.vo.PartnerPassLetterDetailVO; -import com.cool.store.vo.PartnerUserInfoVO; -import com.cool.store.vo.interview.CreateAppointmentVO; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import com.cool.store.vo.interview.InterviewVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationManager; - -import java.text.MessageFormat; -import java.util.*; - -import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_DAY; -import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_SEC; - -@Service -@Slf4j -public class PartnerInterviewServiceImpl implements PartnerInterviewService { - - @Autowired - private HyPartnerInterviewMapper interviewMapper; - - @Autowired - private HyPartnerInterviewPlanMapper interviewPlanMapper; - - @Autowired - private HyInterviewDAO interviewDAO; - - @Autowired - private InterviewService interviewService; - - @Autowired - private HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - - @Autowired - private LogService logService; - - @Autowired - private EnterpriseUserDAO enterpriseUserDAO; - - @Autowired - private RedisUtilPool redisUtilPool; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - @Autowired - private HyExhibitionDAO exhibitionDAO; - - @Value("${trtc.sdkAppId}") - private Long sdkAppId; - - @Value("${trtc.secretKey}") - private String key; - - /** - * 加盟商查询面试信息 - * - * @param partnerId - * @return - */ - @Override - public PartnerInterviewInfoVO queryByPartnerId(String partnerId) { - return interviewMapper.queryByPartnerId(partnerId); - } - - @Override - public PartnerInterviewInfoVO queryByPartnerLineId(LineQueryInterviewDto request) throws ApiException { - PartnerInterviewInfoVO partnerInterviewInfo = interviewMapper.queryByPartnerLineId(request.getPartnerLineId()); - if (partnerInterviewInfo == null) { - return null; - } - //是否是会销面试 - HyPartnerExhibitionDO partnerExhibitionQuery = new HyPartnerExhibitionDO(); - partnerExhibitionQuery.setInterviewPlanId(partnerInterviewInfo.getInterviewPlanId()); - partnerExhibitionQuery.setPartnerLineId(Long.parseLong(request.getPartnerLineId())); - partnerExhibitionQuery.setDeleted(Boolean.FALSE); - HyPartnerExhibitionDO partnerExhibitionRes = partnerExhibitionDAO.querySelective(partnerExhibitionQuery); - //会销日期 - if (partnerExhibitionRes != null && partnerExhibitionRes.getInterviewPlanId() != null) { - partnerInterviewInfo.setWhetherExhibitionInterview(Boolean.TRUE); - HyExhibitionDO exhibitionQuery = new HyExhibitionDO(); - exhibitionQuery.setId(partnerExhibitionRes.getExhibitionId()); - List exhibitionDOS = exhibitionDAO.querySelective(exhibitionQuery); - partnerInterviewInfo.setExhibitionDate(DateUtil.format(exhibitionDOS.get(0).getStartDate(), DATE_FORMAT_DAY)); - } - return partnerInterviewInfo; - } - - /** - * 进入面试间的方法 - * 修改一些面试状态 - * 最后返回 userSign 用于进入腾讯云音视频房间 - * - * @return userSign 进入视频所需签名 - */ - @Override - @Transactional - public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException { - try { - //房间状态 - Integer roomStatus = interviewPlanMapper.getRoomStatus(dto.getInterviewPlanId()); - //面试流程状态 - String status = interviewMapper.getStatus(dto.getInterviewPlanId()); - //如果面试间状态是 0 待开放或者面试流程状态是 2 待面试，就不让进 - //再判断时间是否是正确的时间 - if (roomStatus.equals(RoomStatus.WAIT_FOR_OPEN.getCode()) || WorkflowStatusEnum.INTERVIEW_2.getCode().equals(status)) { - HyPartnerInterviewPlanDO interviewPlan = interviewPlanMapper.getInterviewPlanById(dto.getInterviewPlanId()); - //面试预期开始时间 - DateTime exceptTime = DateUtil.offsetMinute(interviewPlan.getStartTime(), -5); - //面试结束时间 - DateTime endTime = DateUtil.parseDateTime(DateUtil.formatDateTime(interviewPlan.getEndTime())); - DateTime now = DateUtil.date(); - //如果当前时间在预期开始时间和结束时间之间 - //修改面试状态和房间状态（修改房间状态在后面 hyPartnerInterviewPlanDO 中一并修改） - if (exceptTime.isBefore(now) && now.isBefore(endTime)) { - //1. 将面试状态改为 --> 2 已开始 - interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3); - //hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); - } else { - throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); - } - } - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(Long.parseLong(dto.getInterviewPlanId())); - //2. 修改加盟商或面试官进入面试时间 - //加盟商 - if (dto.getUserType().equals(2)) { - hyPartnerInterviewDO.setPartnerEnterTime(DateUtil.date()); - } else if (dto.getUserType().equals(1)) { - hyPartnerInterviewDO.setInterviewerEnterTime(DateUtil.date()); - } - //更新 - interviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); - //修改面试房间状态 - hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.OPEN.getCode()); - //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 - interviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now()); - //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 - if (dto.getUserType().equals(2)) { - hyPartnerInterviewPlanDO.setIsPartnerInterview(1); - } - interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); - //5. 查询对应的面试官id、姓名及加盟商姓名 - EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); - //6. 生成 userSign - String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); - vo.setUserSign(userSig); - return vo; - } catch (ApiException apiException) { - throw apiException; - } catch (Exception e) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL); - } - } - - /** - * 获取通知函详情 - */ - @Override - public PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId) throws ApiException { - PartnerPassLetterDetailVO vo = interviewMapper.getPassLetterDetail(interviewPlanId); - //如果面试信息为空，抛出异常 - if (vo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - //解析意向开店区域为市级行政区 - String verifyCity = vo.getVerifyCity(); - String[] split = verifyCity.split("/"); - //根据长度来取市级行政区域 - if (split.length == 2) { - vo.setVerifyCity(split[1]); - } else if (split.length == 3) { - vo.setVerifyCity(split[1]); - } else if (split.length == 4) { - vo.setVerifyCity(split[2]); - } else { - throw new ServiceException(ErrorCodeEnum.INTENT_INFO_NOT_EXIST); - } - vo.setVerifyCity((verifyCity)); - return vo; - } - - @Override - public void modifyInterviewTime(ModifyInterviewTimeReq request) throws ApiException { - InterviewVO interviewInfo = interviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); - //如果面试信息为空，抛出异常 - if (interviewInfo == null) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - //如果面试状态不是面试时间待审核，抛出异常 - if (interviewInfo.getStatus() != Integer.parseInt(WorkflowStatusEnum.RESERVATION_1.getCode())) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); - } - if(RoomStatus.WAIT_FOR_OPEN.getCode() != Integer.parseInt(interviewInfo.getRoomStatus())){ - throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR); - } - //如果开始时间小于当前时间需要报错 - if(DateUtil.date().isAfter(DateUtil.parse(request.getNewStartBookingTime()))){ - throw new ApiException(ErrorCodeEnum.CREATE_APPOINTMENT_TIME_ERROR); - } - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - record.setId(Long.valueOf(request.getInterviewPlanId())); - record.setStartTime(Convert.toDate(request.getNewStartBookingTime())); - record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime())); - record.setEndTime(Convert.toDate(request.getNewEndBookingTime())); - record.setUpdateTime(new Date()); - interviewPlanMapper.updateByPrimaryKeySelective(record); - - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - ModifyInterviewTimeDTO log = ModifyInterviewTimeDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), DATE_FORMAT_SEC)) - .beforeInterviewTime(interviewInfo.getStartTime()).afterInterviewTime(request.getNewStartBookingTime()).build(); - logService.recordPartnerBizLog(operator,interviewInfo.getPartnerLineId(), OperateTypeEnum.MODIFY_INTERVIEW_TIME,log); - } - - @Override - public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) { - return interviewService.getFreeBusyList(request); - } - - @Override - @Transactional - public CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException { - if(request.getPartnerLineId() == null || request.getPartnerLineId()<=0){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL); - } - //如果开始时间小于当前时间需要报错 -// if(DateUtil.date().isAfter(DateUtil.parse(request.getStartBookingTime()))){ -// throw new ApiException(ErrorCodeEnum.CREATE_APPOINTMENT_TIME_ERROR); -// } - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId()); - hyPartnerInterviewPlanDO.setDeleted(false); - List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)&&hyPartnerInterviewPlanDOS.get(0).getId()!=null){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); - } - String interviewrId = request.getInterviewerId(); - if(StringUtils.isEmpty(interviewrId)){ - interviewrId = interviewService.getInterviewerByPartner(request.getPartnerId(),String.valueOf(request.getPartnerLineId())); - } - CreateAppointmentVO vo = new CreateAppointmentVO(); - String lockName = MessageFormat.format(RedisConstant.PARTNER_APPOINTMENT_LOCK, request.getPartnerLineId()); - if (Boolean.FALSE.equals(redisUtilPool.lock(lockName, request.getPartnerLineId().toString(), 10))) { - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); - } - //注册事务回调方法 - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - redisUtilPool.unlock(lockName, request.getPartnerLineId().toString()); - } - }); - - //1.创建面试计划 - HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); - String startBookingTime = request.getStartBookingTime(); - String startDate = startBookingTime.substring(0, 10); - record.setInterviewDate(Convert.toDate(startDate)); - record.setCreateTime(new Date()); - record.setUpdateTime(new Date()); - record.setStartTime(Convert.toDate(request.getStartBookingTime())); - record.setEndTime(Convert.toDate(request.getEndBookingTime())); - record.setPartnerId(request.getPartnerId()); - record.setPartnerLineId(request.getPartnerLineId()); - record.setInterviewer(interviewrId); - record.setIsPartnerInterview(0); - //生成房间号 - record.setRoomId(StringUtil.generateRoomId(startBookingTime)); - record.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); - record.setDeleted(false); - record.setApplicationApproved(0); - hyPartnerInterviewPlanMapper.insertSelective(record); - - List interviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - if(CollectionUtils.isEmpty(interviewPlanDOS)){ - throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST); - } - Long interviewPlanId = interviewPlanDOS.get(0).getId(); - vo.setInterviewPlanId(String.valueOf(interviewPlanId)); - - //2.创建面试信息 - HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); - hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); - hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); - hyPartnerInterviewDO.setInterviewer(interviewrId); - hyPartnerInterviewDO.setCreateTime(new Date()); - hyPartnerInterviewDO.setUpdateTime(new Date()); - hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.RESERVATION_1.getCode())); - hyPartnerInterviewDO.setDeleted(false); - hyPartnerInterviewMapper.insertSelective(hyPartnerInterviewDO); - - //修改线索状态 - HyPartnerLineInfoDO hyPartnerLineDO = new HyPartnerLineInfoDO(); - hyPartnerLineDO.setId(request.getPartnerLineId()); - hyPartnerLineDO.setWorkflowStatus(WorkflowStatusEnum.RESERVATION_1.getCode()); - hyPartnerLineDO.setUpdateTime(new Date()); - hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineDO); - - //异步发送飞书信息给面试官 - InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewPlanId)); - List userIds = new ArrayList<>(); - userIds.add(interviewrId); - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(userIds); -// SendCardMessageDTO sendCardMessageDTO = new SendCardMessageDTO(); -// sendCardMessageDTO.setUserIds(userIds); -// sendCardMessageDTO.setMessageType(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT); -// sendCardMessageDTO.setMessageUrl(linkUrl); -// sendCardMessageDTO.setTitle("面试预约申请"); -// sendCardMessageDTO.setContent(generateFeiShuInterviewMsg(interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime())); - //替换为通过事件中心发送消息 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, - Arrays.asList(feishuUserIdsByUserIds.get(interviewrId)), - interviewVO.getPartnerName(), interviewVO.getPartnerMobile(), interviewVO.getStartTime()); - - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - LogBasicDTO log = LogBasicDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()).operateTime(DateUtil.format(new Date(), DATE_FORMAT_SEC)).mobile(operator.getMobile()).build(); - logService.recordPartnerBizLog(operator,interviewVO.getPartnerLineId(),OperateTypeEnum.INTERVIEW_APPOINTMENT,log); - - return vo; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java deleted file mode 100644 index e8655c3bb..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dao.*; -import com.cool.store.dto.exhibition.ExhibitionDTO; -import com.cool.store.dto.log.UserInfoUpdateDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.request.PartnerIntentInfoRequest; -import com.cool.store.request.PartnerUserInfoRequest; -import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.ApplyBaseInfoVO; -import com.cool.store.vo.InviteCodeDetailVO; -import com.cool.store.vo.PartnerUserInfoVO; -import com.cool.store.vo.partner.PartnerUserBaseVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Slf4j -public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { - - @Autowired - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - - @Resource - private HyPartnerBaseInfoService hyPartnerBaseInfoService; - - @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - @Resource - private RedisUtilPool redisUtilPool; - @Autowired - private LogService logService; - @Resource - HyPhoneLocationService hyPhoneLocationService; - - @Resource - HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - HyExhibitionDAO hyExhibitionDAO; - @Resource - HyExhibitionGroupDAO hyExhibitionGroupDAO; - - @Override - public HyPartnerUserInfoDO selectByPartnerId(String partnerId) { - return hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - } - - @Override - public Boolean queryJoinNotice(String partnerId) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - if (hyPartnerUserInfoDO==null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - return hyPartnerUserInfoDO.getIsWritePartnerKnow() == 1; - } - - @Override - public Boolean completeJoinNotice(String partnerId) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - if (hyPartnerUserInfoDO == null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - hyPartnerUserInfoDAO.updateJoinKnowById(CommonConstants.ONE, hyPartnerUserInfoDO.getId()); - return true; - } - - @Override - public InviteCodeDetailVO selectInviteCodeDetail(String partnerId) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId); - if (hyPartnerUserInfoDO==null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - InviteCodeDetailVO inviteCodeDetailVO = new InviteCodeDetailVO(); - inviteCodeDetailVO.setInviteCode(hyPartnerUserInfoDO.getInviteCode()); - inviteCodeDetailVO.setStoreName(hyPartnerUserInfoDO.getShopName()); - inviteCodeDetailVO.setStoreCode(hyPartnerUserInfoDO.getShopCode()); - inviteCodeDetailVO.setPartnerPhone(hyPartnerUserInfoDO.getRecommendPartnerMobile()); - inviteCodeDetailVO.setPartnerName(hyPartnerUserInfoDO.getRecommendPartnerName()); - return inviteCodeDetailVO; - } - - @Override - public ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException { - log.info("PartnerUserInfoServiceImpl#updatePartnerUserInfo partnerUserInfoRequest:{}", JSONObject.toJSONString(partnerUserInfoRequest)); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(partnerUserInfoRequest.getPartnerId())); - if (hyPartnerUserInfoDO == null){ - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - UserInfoUpdateDTO.UserInfoUpdate beforeUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getLiveArea(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType()); - UserInfoUpdateDTO.UserInfoUpdate afterUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(partnerUserInfoRequest.getUsername(), partnerUserInfoRequest.getMobile(), partnerUserInfoRequest.getLiveArea(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType()); - - //如果手机号不相同 校验手机号 - if (StringUtils.isNotEmpty(hyPartnerUserInfoDO.getMobile()) && !hyPartnerUserInfoDO.getMobile().equals(partnerUserInfoRequest.getMobile())){ - HyPartnerUserInfoDO userInfo = hyPartnerUserInfoDAO.selectByMobile(partnerUserInfoRequest.getMobile()); - if (userInfo != null){ - throw new ServiceException(ErrorCodeEnum.MOBILE_EXIST); - } - } - ApplyBaseInfoVO applyBaseInfoVO = new ApplyBaseInfoVO(); - fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - // 生成一条线索 - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE,partnerUserInfoRequest.getInvestmentManager()); - // 生成一条意向基本信息 - hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea())); - List hyOpenAreaInfoDOS = null; - if(hyOpenAreaInfoDO != null){ - applyBaseInfoVO.setSelectAreaStatus(hyOpenAreaInfoDO.getAreaStatus()); - String areaPath = hyOpenAreaInfoDO.getAreaPath(); - String province = areaPath.substring(0, areaPath.indexOf("/", areaPath.indexOf("/") + 1)); - hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(province, true, null, true); - } - applyBaseInfoVO.setProvinceHasOpenArea(false); - if (CollectionUtils.isNotEmpty(hyOpenAreaInfoDOS)) { - applyBaseInfoVO.setProvinceHasOpenArea(true); - } - applyBaseInfoVO.setPartnerLineId(hyPartnerLineInfoDO.getId()); - applyBaseInfoVO.setLineStatus(hyPartnerLineInfoDO.getLineStatus()); - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, partnerUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); - if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerIntentInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoRequest.class); - if(!partnerUserInfoRequest.getWantShopArea().equals(request.getWantShopArea()) - || !partnerUserInfoRequest.getAcceptAdjustType().equals(request.getAcceptAdjustType())){ - request.setWantShopArea(partnerUserInfoRequest.getWantShopArea()); - request.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType()); - redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS); - } - } - //记录日志 - PartnerUserInfoVO operator = PartnerUserHolder.getUser(); - UserInfoUpdateDTO log = UserInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername()) - .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .beforeUserinfoUpdate(beforeUserinfoUpdate).afterUserinfoUpdate(afterUserinfoUpdate).build(); - logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.USERINFO_UPDATE,log); - return applyBaseInfoVO; - } - - - @Override - public PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId,Integer groupId) { - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); - HyPartnerLineInfoDO hyPartnerLineInfoDO = null; - if (hyPartnerUserInfoDO != null){ - hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - } - if (hyPartnerUserInfoDO == null||hyPartnerLineInfoDO== null){ - return null; - } - PartnerUserBaseVO partnerUserBaseVO = new PartnerUserBaseVO(hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getWantShopArea()); - - //黑名单 - if (LineStatusEnum.BLACKLIST.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ - partnerUserBaseVO.setSignUpStatus(Boolean.FALSE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.TWO); - partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_4)); - return partnerUserBaseVO; - } - //私海 - //能报名的列表 - Map> map = WorkflowStageEnum.getExhibitionSignUpMap(); - if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ - List list = map.get(hyPartnerLineInfoDO.getWorkflowStage()); - if (!list.contains(hyPartnerLineInfoDO.getWorkflowStatus())){ - HashMap> workflowStatusMap = WorkflowStageEnum.getWorkflowStatusMap(); - List workflowStatusEnums = workflowStatusMap.get(hyPartnerLineInfoDO.getWorkflowStage()); - Map statusMap = workflowStatusEnums.stream().collect(Collectors.toMap(WorkflowStatusEnum::getCode, WorkflowStatusEnum::getMessage, (a, b) -> b)); - partnerUserBaseVO.setSignUpStatus(Boolean.FALSE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.TWO); - partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_2,WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()).getMessage(),statusMap.get(hyPartnerLineInfoDO.getWorkflowStatus()))); - return partnerUserBaseVO; - } - } - //公海线索（公海线索不论条件都可报名） - if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())) { - partnerUserBaseVO.setSignUpStatus(Boolean.TRUE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.ZERO); - return partnerUserBaseVO; - } - //是否重复报名（已结束的展会不算） PC - if (exhibitionId!=null){ - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); - groupId = hyExhibitionDO.getExhibitionGroupId(); - } - //移动 - if(groupId!=null){ - ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(groupId, hyPartnerLineInfoDO.getId()); - if (exhibitionDTO !=null){ - partnerUserBaseVO.setSignUpStatus(Boolean.FALSE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.THREE); - partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName())); - return partnerUserBaseVO; - } - } - partnerUserBaseVO.setSignUpStatus(Boolean.TRUE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.ZERO); - return partnerUserBaseVO; - } - - private void fillUserInfoDOByRequest(HyPartnerUserInfoDO hyPartnerUserInfoDO, PartnerUserInfoRequest partnerUserInfoRequest) { - hyPartnerUserInfoDO.setUsername(partnerUserInfoRequest.getUsername()); - hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile()); - hyPartnerUserInfoDO.setLiveArea(partnerUserInfoRequest.getLiveArea()); - hyPartnerUserInfoDO.setWantShopArea(partnerUserInfoRequest.getWantShopArea()); - if (!Objects.isNull(partnerUserInfoRequest.getAcceptAdjustType())){ - hyPartnerUserInfoDO.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType()); - } - hyPartnerUserInfoDO.setInviteCode(partnerUserInfoRequest.getInviteCode()); - hyPartnerUserInfoDO.setShopCode(partnerUserInfoRequest.getShopCode()); - hyPartnerUserInfoDO.setShopName(partnerUserInfoRequest.getShopName()); - hyPartnerUserInfoDO.setShopId(partnerUserInfoRequest.getShopId()); - hyPartnerUserInfoDO.setRecommendPartnerId(partnerUserInfoRequest.getRecommendPartnerId()); - hyPartnerUserInfoDO.setRecommendPartnerName(partnerUserInfoRequest.getRecommendPartnerName()); - hyPartnerUserInfoDO.setRecommendPartnerMobile(partnerUserInfoRequest.getRecommendPartnerMobile()); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java deleted file mode 100644 index d260aff2a..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.RegionDAO; -import com.cool.store.dao.UserRegionMappingDAO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.RegionDO; -import com.cool.store.mq.producer.SimpleMessageService; -import com.cool.store.service.RegionService; -import com.cool.store.utils.RedisConstantUtil; -import com.cool.store.utils.RedisUtil; -import com.cool.store.vo.region.RegionBaseInfoVO; -import com.cool.store.vo.region.RegionUserAndSubRegionVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * @author zhangchenbiao - * @FileName: RegionServiceImpl - * @Description: - * @date 2023-06-05 10:43 - */ -@Service -public class RegionServiceImpl implements RegionService { - - @Resource - private RedisUtil redisUtil; - @Resource - private RegionDAO regionDAO; - @Resource - private UserRegionMappingDAO userRegionMappingDAO; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - - - @Override - public RegionBaseInfoVO getRegionBaseInfoList() { - List regionBaseInfoList = regionDAO.getRegionBaseInfoList(); - return RegionBaseInfoVO.convertTree(regionBaseInfoList); - } - - @Override - public RegionUserAndSubRegionVO getRegionUserAndSubRegion(String regionId) { - List subRegionList = regionDAO.getSubRegion(regionId); - List userIds = userRegionMappingDAO.getUserListByRegionId(regionId); - Map userMap = enterpriseUserDAO.getUserMap(userIds); - return RegionUserAndSubRegionVO.convertVO(subRegionList, userIds, userMap); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RoleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RoleServiceImpl.java deleted file mode 100644 index d5deecb93..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RoleServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dao.SysMenuDAO; -import com.cool.store.dao.SysRoleDAO; -import com.cool.store.dao.SysRoleMenuDAO; -import com.cool.store.dto.role.RoleUpdateDTO; -import com.cool.store.entity.SysRoleDO; -import com.cool.store.entity.SysRoleMenuDO; -import com.cool.store.enums.PlatFormTypeEnum; -import com.cool.store.service.RoleService; -import com.cool.store.vo.role.RoleAuthInfoVO; -import com.cool.store.vo.role.RolePageVO; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageInfo; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: RoleServiceImpl - * @Description: - * @date 2023-07-25 15:06 - */ -@Service -public class RoleServiceImpl implements RoleService { - - @Resource - private SysRoleDAO sysRoleDAO; - @Resource - private SysMenuDAO sysMenuDAO; - @Resource - private SysRoleMenuDAO sysRoleMenuDAO; - - @Override - public PageInfo getRolePage(Integer pageNum, Integer pageSize) { - Page page = sysRoleDAO.getRolePage(pageNum, pageSize); - PageInfo resultPage = new PageInfo(page); - List resultList = RolePageVO.convertList(page); - resultPage.setList(resultList); - return resultPage; - } - - @Override - public RoleAuthInfoVO getRoleAuthDetail(String roleId) { - SysRoleDO roleDetail = sysRoleDAO.getRoleDetail(roleId); - if(Objects.isNull(roleDetail)){ - return null; - } - List roleMenuAuths = sysRoleMenuDAO.getRoleMenuByRoleId(roleId); - return RoleAuthInfoVO.convertVO(roleDetail, roleMenuAuths); - } - - @Override - public Integer updateRoleAuth(String userId, RoleUpdateDTO param) { - return sysRoleMenuDAO.updateRoleAuth(param.getRoleId(), param.getMenuIds()); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SmsServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SmsServiceImpl.java deleted file mode 100644 index 1c4905f4c..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SmsServiceImpl.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.cool.store.service.impl; - -import com.alibaba.fastjson.JSON; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; -import com.cool.store.dto.sms.SendInvateMsgDTO; -import com.cool.store.dto.wx.MiniAppUrlLinkReqDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.HyPartnerLineInfoDO; -import com.cool.store.entity.HyPartnerUserInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.LineStatusEnum; -import com.cool.store.enums.SMSMsgEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mq.util.HttpRestTemplateService; -import com.cool.store.request.SmsSendRequest; -import com.cool.store.response.SmsSendResponse; -import com.cool.store.service.SmsService; -import com.cool.store.service.WechatMiniAppService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import java.io.IOException; -import java.text.MessageFormat; -import java.util.Objects; - -/** - * @Author: young.yu - * @Date: 2023-06-21 10:55 - * @Description: - */ -@Slf4j -@Service -public class SmsServiceImpl implements SmsService { - - /** - * 普通短信请求url - */ - private final static String NORMAL_SMS_URL = "https://smssh1.253.com/msg/v1/send/json"; - - /** - * 普通短信请求url - */ - private final static String VARIABLE_SMS_URL = "https://smssh1.253.com/msg/variable/json"; - - /** - * 用户平台API账号 - */ - private final static String ACCOUNT = "N7567896"; - /** - * 用户平台API密码 - */ - public final static String PASS_WORD = "MpGD8g15v2cea3"; - - @Autowired - private HttpRestTemplateService httpRestTemplateService; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Value("${weixin.index.url:null}") - private String miniAppIndexUrl; - @Value("${sms.invate.channel.id:null}") - private String smsInvateChannelId; - - @Autowired - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - - @Autowired - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Autowired - private EnterpriseUserDAO enterpriseUserDAO; - - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - /** - * 发送普通短信 - * @param phone 手机号码 - * @param smsMsgEnum 短信内容 - * @return - * @throws IOException - */ - @Override - @Async - public SmsSendResponse sendSmsNormal(String phone, SMSMsgEnum smsMsgEnum,Object... objects) { - try { - SmsSendRequest smsSingleRequest = new SmsSendRequest(ACCOUNT, PASS_WORD, MessageFormat.format(smsMsgEnum.getContent(), objects), phone); - String requestJson = JSON.toJSONString(smsSingleRequest); - String response = httpRestTemplateService.postForObject(NORMAL_SMS_URL, requestJson, String.class); - SmsSendResponse smsSingleResponse = JSON.parseObject(response, SmsSendResponse.class); - return smsSingleResponse; - }catch (Exception e){ - log.error("短信发送异常："+e.getMessage()); - } - return null; - } - - /** - * @deprecated 替换为 {@link com.cool.store.http.EventCenterHttpRequest#sendSmsVariable(String, SMSMsgEnum, String...)} - */ - @Override - @Deprecated - @Async - public SmsSendResponse sendSmsVariable(String phone, SMSMsgEnum smsMsgEnum,String... objects){ - // - //params 手机号,参数 多个使用;隔开 例: 手机号1,参数A,参数B;手机号2,参数C,参数D - StringBuffer params = new StringBuffer(phone); - for (String object : objects) { - params.append(",").append(object); - } - SmsSendRequest smsSingleRequest = new SmsSendRequest(ACCOUNT, PASS_WORD, smsMsgEnum.getContent(), params.toString()); - String requestJson = JSON.toJSONString(smsSingleRequest); - String response = httpRestTemplateService.postForObject(VARIABLE_SMS_URL, requestJson,String.class); - SmsSendResponse smsSingleResponse = JSON.parseObject(response, SmsSendResponse.class); - return smsSingleResponse; - } - - @Override - public void sendInvateMsg(SendInvateMsgDTO sendInvateMsgDTO) throws ApiException { - String mobile = sendInvateMsgDTO.getMobile(); - //查询用户基本信息 - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); - if(!Objects.isNull(hyPartnerUserInfoDO)){ - HyPartnerLineInfoDO partnerLine = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if(!Objects.isNull(partnerLine)){ - if(LineStatusEnum.PUBLIC_SEAS.getCode().intValue()==partnerLine.getLineStatus().intValue()){ - //在公海，提示去分配招商经理 - throw new ServiceException(ErrorCodeEnum.LINE_EXISTS_IN_PUBLIC_SEA); - }else if(LineStatusEnum.PRIVATE_SEAS.getCode().intValue()==partnerLine.getLineStatus().intValue()){ - EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(partnerLine.getInvestmentManager()); - //在私海，提示已存在 - String msg = enterpriseUser.getName()+"，"+enterpriseUser.getMobile(); - throw new ServiceException(ErrorCodeEnum.LINE_ALREADY_EXISTS,msg); - } - } - } - LoginUserInfo operator = CurrentUserHolder.getUser(); - StringBuffer stringBuffer = new StringBuffer(); - MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO = new MiniAppUrlLinkReqDTO(); - miniAppUrlLinkReqDTO.setPath(miniAppIndexUrl); - stringBuffer.append("userChannelEnum=").append(smsInvateChannelId) - .append("&inviter=").append(operator.getUserId()); - miniAppUrlLinkReqDTO.setQuery(stringBuffer.toString()); - - eventCenterHttpRequest.sendSmsVariable(mobile, SMSMsgEnum.SMS_INVATE,wechatMiniAppService.getMiniAppUrlLink(miniAppUrlLinkReqDTO)); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java deleted file mode 100644 index 394517c32..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.dto.trtc.callback.VideoCallBackDTO; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.request.TRTCVideoCallBackReq; -import com.cool.store.service.TRTCVideoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class TRTCVideoServiceImpl implements TRTCVideoService { - - @Autowired - private HyPartnerInterviewMapper interviewMapper; - - /** - * 音视频上传成功后的回调处理 - */ -// @Override -// public void handleVideoCallBack(TRTCVideoCallBackReq req) { -// //将视频播放地址拼接到对应的面试信息字段中 -// String videoUrl = req.getEventInfo().getPayLoad().getTencentVod().getVideoUrl(); -// String roomId = req.getEventInfo().getRoomId(); -// interviewMapper.addVideoUrl(roomId, videoUrl); -// } - - @Override - public void handleVideoCallBack(VideoCallBackDTO videoCallBackDTO) { - //防重 - Boolean hasVideoUrl = interviewMapper.hasVideoUrls(videoCallBackDTO.getEventInfo().getPayload().getTencentVod().getVideoUrl()); - if (hasVideoUrl) { - return; - } - //将视频播放地址拼接到对应的面试信息字段中 - String videoUrl = videoCallBackDTO.getEventInfo().getPayload().getTencentVod().getVideoUrl(); - String roomId = videoCallBackDTO.getEventInfo().getRoomId(); - interviewMapper.addVideoUrl(roomId, videoUrl); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TimeSlotGenerator.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TimeSlotGenerator.java deleted file mode 100644 index 1d4cab7f4..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TimeSlotGenerator.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.interview.CalendarInfo; -import com.cool.store.vo.interview.FreeBusyInfo; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -public class TimeSlotGenerator { - public static void main(String[] args) { - String startDate = "2023-02-27"; - String endDate = "2023-03-01"; - - List daySlots = generateDaySlots(startDate, endDate); - for (CalendarInfo daySlot : daySlots) { - System.out.println(JSON.toJSON(daySlot)); - } - } - - public static List generateDaySlots(String startDate, String endDate) { - List daySlots = new ArrayList<>(); - - Date start = DateUtil.parse(startDate); - Date end = DateUtil.parse(endDate); - - Calendar startCal = DateUtil.calendar(start); - Calendar endCal = DateUtil.calendar(end); - - while (!startCal.after(endCal)) { - int year = startCal.get(Calendar.YEAR); - int month = startCal.get(Calendar.MONTH) + 1; - int day = startCal.get(Calendar.DAY_OF_MONTH); - int dayOfWeek = startCal.get(Calendar.DAY_OF_WEEK); - - List hourSlots = generateHalfHourSlots(); - CalendarInfo daySlot = new CalendarInfo(transDayOfWeek(dayOfWeek), - String.valueOf(year), - StringUtil.addZeroForNum(String.valueOf(month),2), - StringUtil.addZeroForNum(String.valueOf(day),2), - DateUtil.format(startCal.getTime(), "yyyy-MM-dd"), - hourSlots); - daySlots.add(daySlot); - - startCal.add(Calendar.DATE, 1); - } - - return daySlots; - } - - public static List generateDaySlotsForPc(String startDate, String endDate) { - List daySlots = new ArrayList<>(); - - Date start = DateUtil.parse(startDate); - Date end = DateUtil.parse(endDate); - - Calendar startCal = DateUtil.calendar(start); - Calendar endCal = DateUtil.calendar(end); - - while (!startCal.after(endCal)) { - int year = startCal.get(Calendar.YEAR); - int month = startCal.get(Calendar.MONTH) + 1; - int day = startCal.get(Calendar.DAY_OF_MONTH); - int dayOfWeek = startCal.get(Calendar.DAY_OF_WEEK); - - List hourSlots = generateHalfHourSlotsForPC(); - CalendarInfo daySlot = new CalendarInfo(transDayOfWeek(dayOfWeek), - String.valueOf(year), - StringUtil.addZeroForNum(String.valueOf(month),2), - StringUtil.addZeroForNum(String.valueOf(day),2), - DateUtil.format(startCal.getTime(), "yyyy-MM-dd"), - hourSlots); - daySlots.add(daySlot); - - startCal.add(Calendar.DATE, 1); - } - - return daySlots; - } - - private static List generateHourSlots() { - List hourSlots = new ArrayList<>(); - - for (int hour = 10; hour < 17; hour++) { - String startTime = String.format("%02d:00", hour); - String endTime = String.format("%02d:00", hour + 1); - //默认空闲 - FreeBusyInfo hourSlot = new FreeBusyInfo(startTime, endTime, true, 0, false, false); - hourSlots.add(hourSlot); - } - - return hourSlots; - } - - private static List generateHalfHourSlots() { - List hourSlots = new ArrayList<>(); - - //循环打印半小时的时间段 - for (int hour = 10; hour < 17; hour++) { - if(hour == 12){ - continue; - } - String startTime = String.format("%02d:00", hour); - String endTime = String.format("%02d:30", hour); - //默认空闲 - FreeBusyInfo hourSlot = new FreeBusyInfo(startTime, endTime, true, 0, false, false); - hourSlots.add(hourSlot); - - String startTime2 = String.format("%02d:30", hour); - String endTime2 = String.format("%02d:00", hour + 1); - //默认空闲 - FreeBusyInfo hourSlot2 = new FreeBusyInfo(startTime2, endTime2, true, 0, false, false); - hourSlots.add(hourSlot2); - } - return hourSlots; - } - - private static List generateHalfHourSlotsForPC() { - List hourSlots = new ArrayList<>(); - - //循环打印半小时的时间段 - for (int hour = 8; hour < 24; hour++) { - String startTime = String.format("%02d:00", hour); - String endTime = String.format("%02d:30", hour); - //默认空闲 - FreeBusyInfo hourSlot = new FreeBusyInfo(startTime, endTime, true, 0, false, false); - hourSlots.add(hourSlot); - - String startTime2 = String.format("%02d:30", hour); - String endTime2 = String.format("%02d:00", hour + 1); - //默认空闲，预约人数为 0 - FreeBusyInfo hourSlot2 = new FreeBusyInfo(startTime2, endTime2, true, 0, false, false); - hourSlots.add(hourSlot2); - } - return hourSlots; - } - - public static int transDayOfWeek(int dayOfWeek) { - switch (dayOfWeek) { - case 1: - return 7; - case 2: - return 1; - case 3: - return 2; - case 4: - return 3; - case 5: - return 4; - case 6: - return 5; - case 7: - return 6; - default: - return 0; - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java deleted file mode 100644 index be50ac908..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.*; -import com.cool.store.dto.wx.*; -import com.cool.store.entity.*; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.UserChannelEnum; -import com.cool.store.enums.UserPlatformTypeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.WechatRest; -import com.cool.store.mapper.HyPartnerUserChannelMapper; -import com.cool.store.request.MobileUpdateRequest; -import com.cool.store.service.HyPhoneLocationService; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.utils.AesUtil; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.utils.UUIDUtils; -import com.cool.store.vo.PartnerUserInfoVO; -import com.cool.store.vo.wx.MiniProgramUserVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.Date; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: WechatMiniAppServiceImpl - * @Description: - * @date 2023-05-29 14:29 - */ -@Slf4j -@Service -public class WechatMiniAppServiceImpl implements WechatMiniAppService { - - @Resource - private RedisUtilPool redisUtilPool; - @Resource - private WechatRest wechatRest; - @Resource - private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - @Resource - private HyPartnerUserPlatformBindDAO hyPartnerUserPlatformBindDAO; - @Resource - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - @Resource - HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - @Resource - HyPhoneLocationService hyPhoneLocationService; - - @Autowired - private HyPartnerUserChannelMapper hyPartnerUserChannelMapper; - - @Value("${weixin.appId}") - private String wxAppId; - @Value("${weixin.appSecret}") - private String wxAppSecret; - @Value("${fixMobileOpenid}") - private String fixMobileOpenid; - @Value("${exhibition.channel.id}") - private Integer exhibition; - @Value("${recommended.channel.id}") - private Integer recommended; - - @Override - public PartnerUserInfoVO miniProgramLogin(MiniProgramLoginDTO param) { - log.info("miniProgramLogin #param {}", JSONObject.toJSONString(param)); - PartnerUserInfoVO userInfoVO = new PartnerUserInfoVO(); - String jsCode = param.getJsCode(); - String lockKey = "codeSession:" + wxAppId + CommonConstants.MOSAICS + jsCode; - boolean lock = redisUtilPool.lock(lockKey); - if (!lock) { - throw new ServiceException(ErrorCodeEnum.OPERATION_OVER_TIME); - } - CodeSessionDTO codeSession = wechatRest.miniProgramJsCodeSession(wxAppId, wxAppSecret, jsCode); - String openid = codeSession.getOpenid(); - String sessionCacheKey = MessageFormat.format(CommonConstants.MINI_PROGRAM_SESSION_KEY, wxAppId, openid); - redisUtilPool.setString(sessionCacheKey, codeSession.getSessionKey(), CommonConstants.THREE_DAY_SECONDS); - String unionId = codeSession.getUnionId(); - log.info("小程序登录:{}", unionId); - log.info("sessionKey {}", codeSession.getSessionKey()); - /* String decryptUser = AesUtil.decryptWechat(codeSession.getSessionKey(), param.getEncryptedData(), param.getIvStr()); - log.info("解密用户信息：{}", decryptUser); - MiniProgramUserVO miniProgramUser = JSON.parseObject(decryptUser, MiniProgramUserVO.class); - if (Objects.isNull(miniProgramUser)) { - throw new ServiceException(ErrorCodeEnum.GET_WECHAT_USER_INFO_FAIL); - }*/ - // 获取小程序token - String accessToken = wechatRest.getAccessToken(wxAppId, wxAppSecret); - // 获取手机号码 - PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(param.getMobileCode(), accessToken); - if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - - HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openid); - HyPartnerUserInfoDO hyPartnerUserInfoDO = null; - // 微信未授权过 - if(hyPartnerUserPlatformBindDO == null){ - hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - if(hyPartnerUserInfoDO != null){ - HyPartnerUserPlatformBindDO hy = hyPartnerUserPlatformBindDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if (hy!=null){ - throw new ServiceException(ErrorCodeEnum.MOBILE_WECHAT_EXIST); - } - } - if(hyPartnerUserInfoDO == null){ - hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); - hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); - hyPartnerUserInfoDO.setIsWritePartnerKnow(0); - Integer channelId = null; - String userChannel = param.getUserChannelEnum(); - if(StringUtils.isNotEmpty(userChannel)){ - if(UserChannelEnum.EXHIBITION.getCode().equals(userChannel)){ - channelId = exhibition; - }else if(UserChannelEnum.RECOMMENDED.getCode().equals(userChannel)){ - channelId = recommended; - }else { - if (StringUtils.isNumeric(userChannel)) { - channelId = Integer.valueOf(userChannel); - HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelId(Long.valueOf(channelId)); - if (Objects.isNull(hyPartnerUserChannelDO)|| hyPartnerUserChannelDO.getChannelId() == null ) { - //用户渠道不存在 - throw new ServiceException(ErrorCodeEnum.USER_CHANNEL_NOT_EXISTS); - } - - } - } - } - hyPartnerUserInfoDO.setUserChannelId(channelId); - hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); - } - hyPartnerUserPlatformBindDO = new HyPartnerUserPlatformBindDO(); - hyPartnerUserPlatformBindDO.setPlatformType(UserPlatformTypeEnum.WECHAT.getCode()); - hyPartnerUserPlatformBindDO.setPlatformUserId(openid); - hyPartnerUserPlatformBindDO.setBindTime(new Date()); - hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO); - }else { - hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); - } - if(!hyPartnerUserInfoDO.getMobile().equals(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - throw new ServiceException(ErrorCodeEnum.WECHAT_BIND_OTHER_MOBILE); - } - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if (lineInfoDO != null){ - userInfoVO.setPartnerLineId(lineInfoDO.getId()); - userInfoVO.setLineStatus(lineInfoDO.getLineStatus()); - } - } - userInfoVO.setOpenid(openid); - userInfoVO.setUnionId(unionId); - return userInfoVO; - } - - public static void main(String[] args) { - - } - - @Override - public String getUserPhoneNumber(String mobileCode) { - // 获取小程序token - String accessToken = wechatRest.getAccessToken(wxAppId, wxAppSecret); - // 获取手机号码 - PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(mobileCode, accessToken); - if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - return phoneInfoDTO.getPhoneInfo().getPhoneNumber(); - } - return null; - } - - @Override - public String updateUserPhoneNumber(MobileUpdateRequest request, PartnerUserInfoVO userInfoVO) { - String newMobile = ""; - HyPartnerUserInfoDO oldUserInfo = hyPartnerUserInfoDAO.selectByMobile(userInfoVO.getMobile()); - if (oldUserInfo == null) { - throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); - } - // 获取小程序token - String accessToken = wechatRest.getAccessToken(wxAppId, wxAppSecret); - // 获取手机号码 - PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(request.getMobileCode(), accessToken); - if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - newMobile = phoneInfoDTO.getPhoneInfo().getPhoneNumber(); - if(newMobile.equals(oldUserInfo.getMobile())){ - return newMobile; - } - HyPartnerUserInfoDO newUserInfo = hyPartnerUserInfoDAO.selectByMobile(newMobile); - if (newUserInfo != null) { - throw new ServiceException(ErrorCodeEnum.NEW_MOBILE_HAS_EXIST); - } - oldUserInfo.setMobile(newMobile); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(oldUserInfo); - //修改意向申请信息中的手机号 - hyPartnerBaseInfoDAO.updateByPartnerId(null, newMobile, oldUserInfo.getPartnerId()); - } - return newMobile; - } - - @Override - public PartnerUserInfoVO getUserInfo(String mobile, String openId) { - PartnerUserInfoVO userInfoVO = new PartnerUserInfoVO(); - if(fixMobileOpenid.equals(mobile)){ - userInfoVO.setMobile(mobile); - userInfoVO.setOpenid(mobile); - userInfoVO.setPartnerId(""); - return userInfoVO; - } - HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openId); - if(hyPartnerUserPlatformBindDO != null){ - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - userInfoVO.setOpenid(hyPartnerUserPlatformBindDO.getPlatformUserId()); - if(StringUtils.isNotBlank(hyPartnerUserInfoDO.getWantShopArea())){ - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); - userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim()); - } - HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if (lineInfoDO != null){ - userInfoVO.setPartnerLineId(lineInfoDO.getId()); - } - } - return userInfoVO; - } - - @Override - public String getMiniAppUrl() { - MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO = new MiniAppUrlLinkReqDTO(); - return getMiniAppUrlLink(miniAppUrlLinkReqDTO); - } - - @Override - public String getMiniAppUrlLink(MiniAppUrlLinkReqDTO miniAppUrlLinkReqDTO) { - String accessToken = wechatRest.getAccessToken(wxAppId, wxAppSecret); - MiniAppUrlLinkDTO miniAppUrlLink = wechatRest.getMiniAppUrlLink(accessToken, miniAppUrlLinkReqDTO); - if (miniAppUrlLink != null){ - return miniAppUrlLink.getUrlLink(); - } - return null; - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WorkFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WorkFlowServiceImpl.java deleted file mode 100644 index 1a3e9c3ad..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WorkFlowServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.service.impl; - -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.TransferInvestmentManagerRequest; -import com.cool.store.service.WorkFlowService; -import com.cool.store.service.impl.workflow.IntentWorkFlowService; -import com.cool.store.service.impl.workflow.InterviewWorkFlowService; -import com.cool.store.service.impl.workflow.ReservationWorkFlowService; -import com.cool.store.service.impl.workflow.WorkFlowBaseService; -import com.cool.store.utils.CommonContextUtil; -import org.springframework.stereotype.Service; - -/** - * @author zhangchenbiao - * @FileName: WorkFlowBaseService - * @Description: - * @date 2023-06-26 21:14 - */ -@Service -public class WorkFlowServiceImpl implements WorkFlowService{ - private WorkFlowBaseService getWorkflowService(WorkflowStageEnum workflowStage){ - switch (workflowStage){ - case INTENT: - return CommonContextUtil.getBean(IntentWorkFlowService.class); - case RESERVATION: - return CommonContextUtil.getBean(ReservationWorkFlowService.class); - case INTERVIEW: - return CommonContextUtil.getBean(InterviewWorkFlowService.class); - default: - return null; - } - } - - - @Override - public void endProcess(WorkflowStageEnum workflowStage, CloseFollowRequest request) throws ApiException { - getWorkflowService(workflowStage).endProcess(request); - } - - @Override - public void transferInvestmentManager(WorkflowStageEnum workflowStage, TransferInvestmentManagerRequest request) throws ApiException { - getWorkflowService(workflowStage).transferInvestmentManager(request); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java deleted file mode 100644 index 16f6ff6fd..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java +++ /dev/null @@ -1,238 +0,0 @@ -package com.cool.store.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dao.*; -import com.cool.store.dto.partner.ZoneCheckDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.HyIntendDevZoneInfoDO; -import com.cool.store.entity.HyIntendDevelopementMappingDO; -import com.cool.store.entity.HyOpenAreaInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.request.IntentAreaSettingRequest; -import com.cool.store.service.ZoneService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.StringUtil; -import com.cool.store.vo.OpenAreaSingleVO; -import com.cool.store.vo.OrganizationVO; -import com.cool.store.vo.ZoneCheckVO; -import com.cool.store.vo.ZoneVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Author suzhuhong - * @Date 2023/6/14 14:26 - * @Version 1.0 - */ -@Service -public class ZoneServiceImpl implements ZoneService { - - - @Resource - HyIntendDevZoneInfoDAO hyIntendDevZoneInfoDAO; - - @Resource - HyIntendDevMappingDAO hyIntendDevMappingDAO; - - @Resource - HyOpenAreaInfoDAO openAreaInfoDAO; - @Resource - EnterpriseUserDAO enterpriseUserDAO; - @Resource - RegionDAO regionDAO; - @Resource - HyOpenAreaInfoDAO hyOpenAreaInfoDAO; - - - - @Override - public Boolean addZone(String userId, IntentAreaSettingRequest intentAreaSettingRequest) { - if (CollectionUtils.isEmpty(intentAreaSettingRequest.getOpenAreaIdList())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = new HyIntendDevZoneInfoDO(); - hyIntendDevZoneInfoDO.setZoneName(intentAreaSettingRequest.getZoneName()); - if (CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())){ - hyIntendDevZoneInfoDO.setAssociatedRegionId(JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList())); - } - hyIntendDevZoneInfoDO.setCreateUserId(userId); - hyIntendDevZoneInfoDO.setType(intentAreaSettingRequest.getType()); - hyIntendDevZoneInfoDAO.insertSelective(hyIntendDevZoneInfoDO); - //添加战区映射的意向区域 - hyIntendDevMappingDAO.deleteByOpenAreaIds(intentAreaSettingRequest.getOpenAreaIdList(),hyIntendDevZoneInfoDO.getType()); - List openAreaIdList = intentAreaSettingRequest.getOpenAreaIdList(); - List openAreaIdFilterList = hyOpenAreaInfoDAO.filterLeafNode(openAreaIdList); - List list = new ArrayList<>(); - openAreaIdFilterList.stream().forEach(x->{ - HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = new HyIntendDevelopementMappingDO(); - hyIntendDevelopementMappingDO.setType(intentAreaSettingRequest.getType()); - hyIntendDevelopementMappingDO.setOpenAreaMappingId(String.valueOf(x)); - hyIntendDevelopementMappingDO.setMappingId(hyIntendDevZoneInfoDO.getId()); - list.add(hyIntendDevelopementMappingDO); - }); - hyIntendDevMappingDAO.batchInsert(list); - return Boolean.TRUE; - } - - @Override - public Boolean updateZone(String userId, IntentAreaSettingRequest intentAreaSettingRequest) { - if (CollectionUtils.isEmpty(intentAreaSettingRequest.getOpenAreaIdList())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = new HyIntendDevZoneInfoDO(); - hyIntendDevZoneInfoDO.setId(intentAreaSettingRequest.getId()); - hyIntendDevZoneInfoDO.setZoneName(intentAreaSettingRequest.getZoneName()); - hyIntendDevZoneInfoDO.setUpdateUserId(userId); - hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):null); - hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO); - //添加战区映射的意向区域 - hyIntendDevMappingDAO.deleteByOpenAreaIds(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType()); - hyIntendDevMappingDAO.deleteByMappingIds(Arrays.asList(intentAreaSettingRequest.getId()) - ,intentAreaSettingRequest.getType()); - List openAreaIdList = intentAreaSettingRequest.getOpenAreaIdList(); - List openAreaIdFilterList = hyOpenAreaInfoDAO.filterLeafNode(openAreaIdList); - List list = new ArrayList<>(); - openAreaIdFilterList.stream().forEach(x->{ - HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = new HyIntendDevelopementMappingDO(); - hyIntendDevelopementMappingDO.setType(intentAreaSettingRequest.getType()); - hyIntendDevelopementMappingDO.setOpenAreaMappingId(String.valueOf(x)); - hyIntendDevelopementMappingDO.setMappingId((hyIntendDevZoneInfoDO.getId())); - list.add(hyIntendDevelopementMappingDO); - }); - hyIntendDevMappingDAO.batchInsert(list); - return Boolean.TRUE; - } - - - @Override - public PageInfo getZoneList(String type, Integer pageSize, Integer pageNum) { - PageHelper.startPage(pageNum,pageSize); - PageInfo hyIntendDevZoneInfoList = new PageInfo(hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type)); - List result = new ArrayList<>(); - List list = hyIntendDevZoneInfoList.getList(); - if (CollectionUtils.isEmpty(list)){ - return hyIntendDevZoneInfoList; - } - List updateUserIdList = list.stream().map(HyIntendDevZoneInfoDO::getUpdateUserId).collect(Collectors.toList()); - List updateUserList = enterpriseUserDAO.getUserInfoByUserIds(updateUserIdList); - Map updateUserNameMap = updateUserList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName)); - - Set regionSet = new HashSet<>(); - list.stream().forEach(x->{ - if (StringUtil.isNotEmpty(x.getAssociatedRegionId())){ - List regionIds = JSONObject.parseArray(x.getAssociatedRegionId(), String.class); - regionSet.addAll(regionIds); - } - }); - Map regionMap = regionDAO.getRegionMap(new ArrayList<>(regionSet)); - list.forEach(x->{ - ZoneVO zoneVO = handleZoneVO(regionMap, x); - zoneVO.setUpdateUserName(updateUserNameMap.get(x.getUpdateUserId())); - result.add(zoneVO); - }); - hyIntendDevZoneInfoList.setList(result); - return hyIntendDevZoneInfoList; - } - - @Override - public ZoneVO zoneDetail(Long zoneId) { - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(zoneId); - if (hyIntendDevZoneInfoDO==null){ - throw new ServiceException(ErrorCodeEnum.ZONE_NOT_EXIST); - } - ZoneVO zoneVO = null; - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(hyIntendDevZoneInfoDO.getUpdateUserId()); - if (StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())){ - List regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class); - Map regionMap = regionDAO.getRegionMap(regionIds); - zoneVO = handleZoneVO(regionMap, hyIntendDevZoneInfoDO); - } - if (enterpriseUserDO!=null){ - zoneVO.setUpdateUserName(enterpriseUserDO.getName()); - } - List zoneCheckDTOS = hyIntendDevMappingDAO.selectByMappingIdList(Arrays.asList(zoneId)); - List openAreaVOS = new ArrayList<>(); - zoneCheckDTOS.forEach(x->{ - OpenAreaSingleVO openAreaSingleVO = new OpenAreaSingleVO(); - openAreaSingleVO.setId(x.getOpenAreaMappingId()); - openAreaVOS.add(openAreaSingleVO); - }); - zoneVO.setOpenAreaVOS(openAreaVOS); - return zoneVO; - } - - - private ZoneVO handleZoneVO(Map regionMap,HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO){ - ZoneVO zoneVO = new ZoneVO(); - zoneVO.setZoneName(hyIntendDevZoneInfoDO.getZoneName()); - zoneVO.setId(hyIntendDevZoneInfoDO.getId()); - zoneVO.setUpdateTime(DateUtil.format(hyIntendDevZoneInfoDO.getUpdateTime(), CoolDateUtils.DATE_FORMAT_SEC_2)); - List organizationVOS = new ArrayList<>(); - if (StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())){ - List regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class); - regionIds.forEach(regionId->{ - OrganizationVO organizationVO = new OrganizationVO(); - organizationVO.setId(regionId); - organizationVO.setName(regionMap.get(regionId)); - organizationVOS.add(organizationVO); - }); - } - zoneVO.setOrgVos(organizationVOS); - zoneVO.setUpdateUserId(hyIntendDevZoneInfoDO.getUpdateUserId()); - return zoneVO; - } - - @Override - public Boolean deletedZone(Long id) { - HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO = hyIntendDevZoneInfoDAO.selectById(id); - if (hyIntendDevZoneInfoDO==null){ - throw new ServiceException(ErrorCodeEnum.ZONE_NOT_EXIST); - } - hyIntendDevZoneInfoDO.setDeleted(1); - hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO); - hyIntendDevMappingDAO.deleteByMappingIds(Arrays.asList(id),hyIntendDevZoneInfoDO.getType()); - return Boolean.TRUE; - } - - @Override - public List checkZone(IntentAreaSettingRequest intentAreaSettingRequest) { - if (CollectionUtils.isEmpty(intentAreaSettingRequest.getOpenAreaIdList())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - //查询已经绑定战区的 意向区域 - List list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType(),intentAreaSettingRequest.getId()); - List openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList()); - List openAreaIdFilterList = hyOpenAreaInfoDAO.filterLeafNode(openAreaIdList); - List hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdFilterList); - Map areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName)); - List result = new ArrayList<>(); - list.forEach(x->{ - ZoneCheckVO zoneCheckVO = new ZoneCheckVO(); - zoneCheckVO.setZoneName(x.getZoneName()); - String areaName = areaNameMap.get(x.getOpenAreaMappingId()); - zoneCheckVO.setAreaName(areaName); - result.add(zoneCheckVO); - }); - return result; - } - - @Override - public List queryAllBingZoneRegionList(String type) { - PageInfo intend = new PageInfo<>(hyIntendDevZoneInfoDAO.getHyIntendDevZoneInfoList(type)); - List list = intend.getList(); - List resultList = list.stream().filter(x->StringUtil.isNotEmpty(x.getAssociatedRegionId())) - .flatMap(HyIntendDevZoneInfoDO -> JSONObject.parseArray(HyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class).stream()) - .collect(Collectors.toList()); - return resultList; - } - - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java deleted file mode 100644 index 391b9a26e..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ /dev/null @@ -1,957 +0,0 @@ -package com.cool.store.service.impl.exhibition; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import com.alibaba.excel.util.DateUtils; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.*; -import com.cool.store.dto.exhibition.*; -import com.cool.store.dto.partner.LineInterviewDTO; -import com.cool.store.dto.partner.MobileCheckDTO; -import com.cool.store.entity.*; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.request.CreateAppointmentReq; -import com.cool.store.request.FinishInterviewReq; -import com.cool.store.service.ExhibitionService; -import com.cool.store.service.InterviewService; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.utils.TRTCUtils; -import com.cool.store.utils.UUIDUtils; -import com.cool.store.utils.poi.StringUtils; -import com.cool.store.utils.poi.constant.Constants; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.exhibition.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author Fun Li 2023/11/30 14:42 - * @version 1.0 - */ -@Service -@Slf4j -public class ExhibitionServiceImpl implements ExhibitionService { - - @Autowired - private HyExhibitionGroupDAO hyExhibitionGroupDAO; - @Autowired - private HyExhibitionDAO hyExhibitionDAO; - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - @Resource - EnterpriseUserDAO enterpriseUserDAO; - @Resource - HyPartnerExhibitionDAO hyPartnerExhibitionDAO; - @Resource - WechatMiniAppService wechatMiniAppService; - - @Autowired - private HyPartnerInterviewMapper interviewMapper; - - @Autowired - private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; - - @Resource - HyPartnerUserChannelDAO hyPartnerUserChannelDAO; - - @Autowired - private InterviewService interviewService; - - @Autowired - private HyPartnerInterviewPlanMapper interviewPlanMapper; - - @Autowired - private TRTCUtils trtcUtils; - - @Resource - HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; - @Resource - HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; - - @Resource - HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - @Value("${offline.exhibition.channel.id:null}") - private String offlineExhibition; - - @Override - @Transactional - public EnterInterviewVO startExhibitionInterview(ExhibitionEnterInterviewDTO dto) throws ApiException { - //1. 核验线索状态 - HyPartnerLineInfoDO partnerLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(Long.parseLong(dto.getPartnerLineId())); - if (ObjectUtils.isEmpty(partnerLineInfo)) { - throw new ApiException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); - } - //1.1 获取线索参加会销状态 - HyPartnerExhibitionDO hyPartnerExhibitionDO = new HyPartnerExhibitionDO(); - hyPartnerExhibitionDO.setDeleted(Boolean.FALSE); - hyPartnerExhibitionDO.setExhibitionId(dto.getExhibitionId()); - hyPartnerExhibitionDO.setPartnerLineId(Long.parseLong(dto.getPartnerLineId())); - hyPartnerExhibitionDO = hyPartnerExhibitionDAO.querySelective(hyPartnerExhibitionDO); - //1.2 核验会销签到状态 - if (hyPartnerExhibitionDO == null - //线索未会销签到并且提交意向申请或未处在预约面试阶段 - || !(hyPartnerExhibitionDO.getParticipationStatus().equals(ExhibitionPartnerStatus.APPLIED.getCode()))) - { - throw new ApiException(ErrorCodeEnum.EXHIBITION_NOT_SIGNED); - } - //1.3 核验是否提交意向申请 - if (partnerLineInfo.getWorkflowStage().equals(WorkflowStageEnum.INTENT.getCode()) && partnerLineInfo.getWorkflowStatus().equals(WorkflowStatusEnum.INTENT_0.getCode())) { - throw new ApiException(ErrorCodeEnum.EXHIBITION_NOT_SUBMIT_INTENTION); - } - //1.4 核验是否未预约面试 - if (partnerLineInfo.getWorkflowStage().equals(WorkflowStageEnum.RESERVATION.getCode()) && !partnerLineInfo.getWorkflowStatus().equals(WorkflowStatusEnum.RESERVATION_0.getCode()) || - partnerLineInfo.getWorkflowStage().equals(WorkflowStageEnum.INTERVIEW.getCode())) { - throw new ApiException(ErrorCodeEnum.EXHIBITION_LINE_INTERVIEWED); - } - - //2. 调用招商经理服务的直接进入面试方法 - CreateAppointmentReq createAppointmentReq = new CreateAppointmentReq(); - createAppointmentReq.setPartnerId(partnerLineInfo.getPartnerId()); - createAppointmentReq.setPartnerLineId(partnerLineInfo.getId()); - String bookStartTime = nearestInterviewTime(); - String bookEndTime = DateUtil.offsetMinute(DateUtil.parseDateTime(bookStartTime), 30).toString("yyyy-MM-dd HH:mm:ss"); - createAppointmentReq.setStartBookingTime(bookStartTime); - createAppointmentReq.setEndBookingTime(bookEndTime); - Map interviewInfoMap = interviewService.agreeInterviewWithoutBook(createAppointmentReq, Boolean.TRUE, CurrentUserHolder.getUserId(), Boolean.FALSE); - HyPartnerInterviewPlanDO interviewPlan = (HyPartnerInterviewPlanDO) interviewInfoMap.get("interviewPlan"); - HyPartnerInterviewDO interviewInfo = (HyPartnerInterviewDO) interviewInfoMap.get("interview"); - - //3. 修改线索参加会销状态 - HyPartnerExhibitionDO updatePartnerExhibition = new HyPartnerExhibitionDO(); - updatePartnerExhibition.setId(hyPartnerExhibitionDO.getId()); - updatePartnerExhibition.setInterviewPlanId(interviewPlan.getId()); - updatePartnerExhibition.setParticipationStatus(ExhibitionPartnerStatus.INTERVIEWING.getCode()); - hyPartnerExhibitionDAO.updateByPrimaryKeySelective(updatePartnerExhibition); - - //4. 修改面试相关信息 - //4.1 面试计划相关信息 - HyPartnerInterviewPlanDO interviewPlanDO = new HyPartnerInterviewPlanDO(); - interviewPlanDO.setId(interviewPlan.getId()); - interviewPlanDO.setActualStartTime(new Date()); - interviewPlanDO.setIsPartnerInterview(1); - interviewPlanMapper.updateByPrimaryKeySelective(interviewPlanDO); - //4.2 面试信息相关 - HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO(); - interviewDO.setId(interviewInfo.getId()); - interviewDO.setPartnerEnterTime(new Date()); - interviewDO.setInterviewerEnterTime(new Date()); - interviewMapper.updateByPrimaryKeySelective(interviewDO); - - //5. 返回进入面试间所需信息 - EnterInterviewVO enterInterviewVO = interviewMapper.getInterviewerByInterviewPlanId(interviewPlan.getId().toString()); - enterInterviewVO.setUserSign(trtcUtils.genUserSig(CurrentUserHolder.getUserId())); - enterInterviewVO.setInterviewPlanId(interviewPlan.getId()); - return enterInterviewVO; - } - - @Override - @Transactional - public void finishInterview(FinishInterviewReq request) throws ApiException { - //1. 正常的结束面试逻辑 - interviewService.finishInterview(request); - //2. 更新线索参加会销状态 - hyPartnerExhibitionDAO.updateStatusAfterFinishInterview(request.getInterviewPlanId()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean addExhibitionGroup(ExhibitionGroupDTO exhibitionGroupDTO, LoginUserInfo userInfo) throws ApiException { - checkExhibitionGroup(exhibitionGroupDTO); - //新增会销组信息 - HyExhibitionGroupDO hyExhibitionGroupDO = new HyExhibitionGroupDO(); - hyExhibitionGroupDO.setExhibitionGroupName(exhibitionGroupDTO.getExhibitionGroupName()); - hyExhibitionGroupDO.setCreator(userInfo.getUserId()); - hyExhibitionGroupDAO.insertSelective(hyExhibitionGroupDO); - - //新增会销信息 - List insertList = new ArrayList<>(); - for (ExhibitionDTO exhibitionDTO : exhibitionGroupDTO.getExhibitionList()){ - HyExhibitionDO hyExhibitionDO = new HyExhibitionDO(); - hyExhibitionDO.setExhibitionName(exhibitionDTO.getExhibitionName()); - if (CollectionUtils.isNotEmpty(exhibitionDTO.getCollaborators())){ - String collaborators = exhibitionDTO.getCollaborators().stream().map(CollaboratorDTO::getCollaborateId).collect(Collectors.joining(Constants.COMMA)); - hyExhibitionDO.setCollaborators(String.format("%s%s%s", Constants.COMMA, collaborators, Constants.COMMA)); - } - hyExhibitionDO.setExhibitionCode(String.valueOf(CommonConstants.MIN_CODE+new Random().nextInt(CommonConstants.MAX_CODE))); - hyExhibitionDO.setCreator(userInfo.getUserId()); - hyExhibitionDO.setLocation(exhibitionDTO.getLocation()); - hyExhibitionDO.setExhibitionGroupId(hyExhibitionGroupDO.getId()); - hyExhibitionDO.setStartDate(CoolDateUtils.parseDate(exhibitionDTO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2)); - insertList.add(hyExhibitionDO); - } - //批量新增会销 - batchInsertExhibition(exhibitionGroupDTO,insertList,userInfo); - return Boolean.TRUE; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean editExhibitionGroup(ExhibitionGroupDTO exhibitionGroupDTO, LoginUserInfo userInfo) throws ApiException { - checkExhibitionGroup(exhibitionGroupDTO); - //编辑 ID不能为空 - if (exhibitionGroupDTO.getExhibitionGroupId() == null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupDTO.getExhibitionGroupId()); - //会销组不存在 - if (hyExhibitionGroupDO== null){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_GROUP_NOT_EXIST); - } - // TODO: 2023/12/4 关闭的会销组是否能修改？ - hyExhibitionGroupDO.setExhibitionGroupName(exhibitionGroupDTO.getExhibitionGroupName()); - hyExhibitionGroupDO.setUpdater(userInfo.getUserId()); - hyExhibitionGroupDAO.updateByPrimaryKeySelective(hyExhibitionGroupDO); - - List batchInsertList = new ArrayList<>(); - List batchUpdateList = new ArrayList<>(); - exhibitionGroupDTO.getExhibitionList().forEach(exhibitionDTO->{ - HyExhibitionDO hyExhibitionDO = new HyExhibitionDO(); - hyExhibitionDO.setExhibitionGroupId(hyExhibitionGroupDO.getId()); - hyExhibitionDO.setExhibitionName(exhibitionDTO.getExhibitionName()); - hyExhibitionDO.setLocation(exhibitionDTO.getLocation()); - if (CollectionUtils.isNotEmpty(exhibitionDTO.getCollaborators())){ - String collaborators = exhibitionDTO.getCollaborators().stream().map(CollaboratorDTO::getCollaborateId).collect(Collectors.joining(Constants.COMMA)); - hyExhibitionDO.setCollaborators(String.format("%s%s%s", Constants.COMMA, collaborators, Constants.COMMA)); - } - - if (exhibitionDTO.getId()== null){ - hyExhibitionDO.setCreator(userInfo.getUserId()); - hyExhibitionDO.setExhibitionCode(String.valueOf(CommonConstants.MIN_CODE+new Random().nextInt(CommonConstants.MAX_CODE))); - hyExhibitionDO.setStartDate(CoolDateUtils.parseDate(exhibitionDTO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2)); - batchInsertList.add(hyExhibitionDO); - }else { - hyExhibitionDO.setUpdater(userInfo.getUserId()); - hyExhibitionDO.setId(exhibitionDTO.getId()); - if (CollectionUtils.isEmpty(exhibitionDTO.getCollaborators())){ - hyExhibitionDO.setCollaborators(""); - } - batchUpdateList.add(hyExhibitionDO); - } - }); - //batchInsertList 不为空 批量新增 - if (CollectionUtils.isNotEmpty(batchInsertList)){ - batchInsertExhibition(exhibitionGroupDTO,batchInsertList,userInfo); - } - //batchUpdateList 不为空 批量更新 - if (CollectionUtils.isNotEmpty(batchUpdateList)){ - hyExhibitionDAO.batchUpdate(batchUpdateList); - } - return Boolean.TRUE; - } - - @Override - public PageInfo getMyExhibitionList(String userId,String startDate,String closedType,Integer pageSize,Integer pageNum) { - Integer type = CommonConstants.MINUS_ONE; - if (StringUtils.isNotEmpty(closedType)){ - type = CommonConstants.CLOSE.equals(closedType)?CommonConstants.ONE:CommonConstants.ZERO; - } - PageHelper.startPage(pageNum,pageSize); - List exhibitionList = hyExhibitionDAO.getExhibitionListByUserId(userId, startDate, type); - PageInfo hyExhibitionDOPage = new PageInfo<>(exhibitionList); - if (CollectionUtils.isEmpty(exhibitionList)){ - return hyExhibitionDOPage; - } - List list = new ArrayList<>(); - //查询协作人 - Set collaboratorsSet = new HashSet(); - List codeList = new ArrayList<>(); - exhibitionList.forEach(x->{ - codeList.add(x.getId()); - if (StringUtils.isNotEmpty(x.getCollaborators())){ - List userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); - collaboratorsSet.addAll(userIdList); - } - }); - List userInfoList = enterpriseUserDAO.getUserInfoByUserIds(new ArrayList<>(collaboratorsSet)); - Map resultMap = userInfoList.stream() - .collect(Collectors.toMap(EnterpriseUserDO::getUserId, - u -> new CollaboratorVO(u.getUserId(), u.getName()))); - - Map statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList); - - exhibitionList.forEach(x->{ - MyExhibitionVO myExhibitionVO = new MyExhibitionVO(); - myExhibitionVO.setExhibitionName(x.getExhibitionName()); - myExhibitionVO.setLocation(x.getLocation()); - myExhibitionVO.setId(x.getId()); - myExhibitionVO.setExhibitionCode(x.getExhibitionCode()); - myExhibitionVO.setClosedType(x.getClosedType()); - myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2)); - if (StringUtils.isNotEmpty(x.getCollaborators())){ - List userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); - List coll = new ArrayList<>(); - userIdList.forEach(userIds->{ - coll.add(resultMap.get(userIds)); - }); - myExhibitionVO.setCollaborators(coll); - } - ExhibitionStatisticsDTO statistics = statisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO()); - myExhibitionVO.setSignUpCount(statistics.getSignUpCount()); - myExhibitionVO.setCheckInCount(statistics.getCheckInCount()); - myExhibitionVO.setFormFillCount(statistics.getFormFillCount()); - myExhibitionVO.setInterviewCount(statistics.getInterviewCount()); - list.add(myExhibitionVO); - }); - hyExhibitionDOPage.setList(list); - return hyExhibitionDOPage; - } - - @Override - public PageInfo getMyExhibitionGroupList(String userId, Integer pageSize, Integer pageNum) { - PageHelper.startPage(pageNum, pageSize); - List myExhibitionGroupDTOS = hyExhibitionGroupDAO.listByCreator(userId); - PageInfo myExhibitionGroupDTOPage = new PageInfo<>(myExhibitionGroupDTOS); - if (CollectionUtils.isEmpty(myExhibitionGroupDTOS)){ - return myExhibitionGroupDTOPage; - } - List groupIds = myExhibitionGroupDTOS.stream().map(MyExhibitionGroupDTO::getId).collect(Collectors.toList()); - List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(groupIds,Boolean.FALSE); - Map> groupMap = exhibitionDTOS.stream().collect(Collectors.groupingBy(ExhibitionDTO::getExhibitionGroupId)); - - List result = new ArrayList<>(); - myExhibitionGroupDTOS.forEach(x->{ - MyExhibitionGroupVO myExhibitionGroupVO = new MyExhibitionGroupVO(); - myExhibitionGroupVO.setExhibitionGroupName(x.getExhibitionGroupName()); - myExhibitionGroupVO.setId(x.getId()); - myExhibitionGroupVO.setClosed(x.getClosed()); - myExhibitionGroupVO.setCreateId(x.getCreateId()); - myExhibitionGroupVO.setCreateName(x.getCreateName()); - myExhibitionGroupVO.setMobile(x.getMobile()); - List list = groupMap.get(x.getId()); - List exhibitionVOS = new ArrayList<>(); - Date date = null; - if (CollectionUtils.isNotEmpty(list)){ - //根据ID排序 - list.sort(Comparator.comparing(ExhibitionDTO::getId)); - list.forEach(exhibitionDTO->{ - ExhibitionVO exhibitionVO = new ExhibitionVO(); - exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setCreateId(exhibitionDTO.getCreator()); - exhibitionVO.setClosedType(exhibitionDTO.getClosedType()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); - exhibitionVO.setId(exhibitionDTO.getId()); - exhibitionVOS.add(exhibitionVO); - }); - //是否所有的不为空 所有不为空表示 会销组结束 - Boolean flag = list.stream().map(ExhibitionDTO::getCloseTime).allMatch(closeTime -> closeTime != null); - if(flag){ - date = list.stream().map(ExhibitionDTO::getCloseTime).filter(closeTime -> closeTime != null).max(Date::compareTo).orElse(null); - } - } - myExhibitionGroupVO.setExhibitionList(exhibitionVOS); - if (date!=null){ - myExhibitionGroupVO.setExpiresTime(DateUtils.format(date, DateUtils.DATE_FORMAT_19_FORWARD_SLASH)); - } - result.add(myExhibitionGroupVO); - }); - myExhibitionGroupDTOPage.setList(result); - return myExhibitionGroupDTOPage; - } - - @Override - public ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId,Boolean includeCollaborators,Boolean filterCloseExhibition) { - //查询标签组 - HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId); - if (ObjectUtils.isEmpty(hyExhibitionGroupDO)){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_GROUP_NOT_EXIST); - } - ExhibitionGroupDetailVO exhibitionGroupDetailVO = new ExhibitionGroupDetailVO(); - exhibitionGroupDetailVO.setExhibitionGroupName(hyExhibitionGroupDO.getExhibitionGroupName()); - exhibitionGroupDetailVO.setId(hyExhibitionGroupDO.getId()); - List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(Arrays.asList(exhibitionGroupId),filterCloseExhibition); - List exhibitionVOS = new ArrayList<>(); - //会销对应的会销协作人map - Map resultMap = getExhibitionCollaboratorMap(exhibitionDTOS); - - exhibitionDTOS.forEach(exhibitionDTO->{ - ExhibitionVO exhibitionVO = new ExhibitionVO(); - exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); - exhibitionVO.setLocation(exhibitionDTO.getLocation()); - exhibitionVO.setClosedType(exhibitionDTO.getClosedType()); - exhibitionVO.setCreateId(exhibitionDTO.getCreator()); - exhibitionVO.setId(exhibitionDTO.getId()); - //需要加载协作人才加载 不需要的时候 不加载 - if (includeCollaborators&&StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){ - List userIdList = Arrays.asList(exhibitionDTO.getCollaboratorStr().substring(CommonConstants.ONE).split(Constants.COMMA)); - List coll = new ArrayList<>(); - userIdList.forEach(userIds->{ - coll.add(resultMap.get(userIds)); - }); - exhibitionVO.setCollaborators(coll); - } - exhibitionVOS.add(exhibitionVO); - }); - exhibitionGroupDetailVO.setExhibitionList(exhibitionVOS); - return exhibitionGroupDetailVO; - } - - @Override - public ExhibitionDetailVO getExhibitionDetail(Integer exhibitionId) { - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); - if (hyExhibitionDO==null){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); - } - ExhibitionDetailVO exhibitionDetailVO = new ExhibitionDetailVO(); - exhibitionDetailVO.setExhibitionName(hyExhibitionDO.getExhibitionName()); - exhibitionDetailVO.setId(hyExhibitionDO.getId()); - exhibitionDetailVO.setExhibitionCode(hyExhibitionDO.getExhibitionCode()); - exhibitionDetailVO.setLocation(hyExhibitionDO.getLocation()); - exhibitionDetailVO.setStartDate(DateUtil.format(hyExhibitionDO.getStartDate(), CoolDateUtils.DATE_FORMAT_DAY_2)); - exhibitionDetailVO.setClosedType(hyExhibitionDO.getClosedType()); - exhibitionDetailVO.setCreateTime(DateUtil.format(hyExhibitionDO.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_7)); - exhibitionDetailVO.setCloseTime(DateUtil.format(hyExhibitionDO.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_7)); - - Map statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(Arrays.asList(hyExhibitionDO.getId())); - exhibitionDetailVO.setSignUpCount(statisticsMap.getOrDefault(hyExhibitionDO.getId(), new ExhibitionStatisticsDTO()).getSignUpCount()); - if (StringUtils.isNotEmpty(hyExhibitionDO.getCollaborators())) { - List userIdList = Arrays.asList(hyExhibitionDO.getCollaborators().substring(1).split(Constants.COMMA)); - List userInfoList = enterpriseUserDAO.getUserInfoByUserIds(userIdList); - List collaboratorVOS = userInfoList.stream().map(u -> new CollaboratorVO(u.getUserId(), u.getName())).collect(Collectors.toList()); - exhibitionDetailVO.setCollaborators(collaboratorVOS); - } - if (StringUtils.isNotEmpty(hyExhibitionDO.getCreator())){ - EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(hyExhibitionDO.getCreator()); - exhibitionDetailVO.setCreateId(user.getUserId()); - exhibitionDetailVO.setMobile(user.getMobile()); - exhibitionDetailVO.setCreateName(user.getName()); - } - return exhibitionDetailVO; - } - - @Override - public Boolean editExhibition(ExhibitionDTO exhibitionDTO, LoginUserInfo userInfo) { - if (exhibitionDTO == null || exhibitionDTO.getId()==null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - //查询会销 - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionDTO.getId()); - if (hyExhibitionDO == null){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); - } - hyExhibitionDO.setExhibitionName(exhibitionDTO.getExhibitionName()); - hyExhibitionDO.setLocation(exhibitionDTO.getLocation()); - if (CollectionUtils.isNotEmpty(exhibitionDTO.getCollaborators())){ - String collaborators = exhibitionDTO.getCollaborators().stream().map(CollaboratorDTO::getCollaborateId).collect(Collectors.joining(Constants.COMMA)); - hyExhibitionDO.setCollaborators(String.format("%s%s%s", Constants.COMMA, collaborators, Constants.COMMA)); - }else { - //如果协助人没有 则需要置空 - hyExhibitionDO.setCollaborators(""); - } - hyExhibitionDO.setUpdater(userInfo.getName()); - hyExhibitionDAO.updateByPrimaryKeySelective(hyExhibitionDO); - //发送通知 给报名的人员 - //查询报名了该会销的线索 - List exhibitionLine = hyPartnerExhibitionDAO.getExhibitionLine(hyExhibitionDO.getId()); - exhibitionLine.forEach(x->{ - try { - eventCenterHttpRequest.sendSmsVariable(x.getMobile(), SMSMsgEnum.EXHIBITION_INFO_UPDATE,hyExhibitionDO.getExhibitionName(), - DateUtils.format(hyExhibitionDO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2),hyExhibitionDO.getLocation(),wechatMiniAppService.getMiniAppUrl()); - } catch (ApiException e) { - log.info("发送短信通知失败,mobile:{},ex:{}",x.getMobile(),e); - } - }); - return Boolean.TRUE; - } - - @Override - public PageInfo getExhibitionLineList(Integer exhibitionId, Integer participationStatus, String partnerUserId, Integer pageSize, Integer pageNum,String userId,Integer id) { - if (exhibitionId==null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - PageHelper.startPage(pageNum, pageSize); - List exhibitionLineDTOS = hyPartnerExhibitionDAO.exhibitionLineList(exhibitionId, participationStatus, partnerUserId,userId,id); - PageInfo pageInfo = new PageInfo<>(exhibitionLineDTOS); - if (CollectionUtils.isEmpty(exhibitionLineDTOS)){ - return pageInfo; - } - List lineIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList()); - List planIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getPlanId).collect(Collectors.toList()); - //面试官info - List lineInterviewList = hyPartnerLineInfoDAO.lineInterviewList(planIds); - Map lineInterviewMap = lineInterviewList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); - //招商经理info - List lineInvestmentList = hyPartnerLineInfoDAO.lineInvestmentList(lineIds); - Map lineInvestmentMap = lineInvestmentList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); - List result = new ArrayList<>(); - List channelIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getChannelId).collect(Collectors.toList()); - Map channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(channelIds); - exhibitionLineDTOS.forEach(x->{ - ExhibitionLineVO exhibitionLineVO = new ExhibitionLineVO(); - LineInterviewDTO inter = lineInterviewMap.getOrDefault(x.getLineId(), new LineInterviewDTO()); - LineInterviewDTO investment = lineInvestmentMap.getOrDefault(x.getLineId(), new LineInterviewDTO()); - BeanUtil.copyProperties(x,exhibitionLineVO); - exhibitionLineVO.setChannelName(channelMap.get(x.getChannelId())); - exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " ")); - exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager()); - exhibitionLineVO.setLineStatus(investment.getLineStatus()); - exhibitionLineVO.setId(x.getId()); - exhibitionLineVO.setInvestmentManagerName(investment.getInvestmentManagerName()); - exhibitionLineVO.setInvestmentManagerMobile(investment.getInvestmentManagerMobile()); - exhibitionLineVO.setInterviewer(inter.getInterviewer()); - exhibitionLineVO.setInterviewPlanId(inter.getId()); - exhibitionLineVO.setInterviewerName(inter.getInterviewerName()); - exhibitionLineVO.setInterviewerMobile(inter.getInterviewerMobile()); - result.add(exhibitionLineVO); - }); - pageInfo.setList(result); - return pageInfo; - } - - @Override - public List exhibitionLineBaseList(Integer exhibitionId, String partnerName) { - List exhibitionLineBaseDTOS = hyPartnerExhibitionDAO.exhibitionLineBaseInfo(partnerName, exhibitionId); - List result = new ArrayList<>(); - exhibitionLineBaseDTOS.forEach(x->{ - ExhibitionLineBaseVO exhibitionLineBaseVO = new ExhibitionLineBaseVO(); - BeanUtil.copyProperties(x,exhibitionLineBaseVO); - result.add(exhibitionLineBaseVO); - }); - //去重 - return result.stream() - .collect(Collectors.toMap(ExhibitionLineBaseVO::getMobile, Function.identity(), (existing, replacement) -> existing)) - .values().stream() - .collect(Collectors.toList()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public SignUpExhibitionVO signUpExhibition(SignUpExhibitionDTO signUpExhibitionDTO, LoginUserInfo userInfo) throws ApiException { - //报名会销 - if (signUpExhibitionDTO.getExhibitionId() == null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(signUpExhibitionDTO.getExhibitionId()); - if (hyExhibitionDO == null){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); - } - //先判断会销是否结束 已结束不能报名 - if(hyExhibitionDO.getClosedType()!=0){ - return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.ONE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_1)); - } - //是否存在线索 - //查询线索信息 - MobileCheckDTO mobileCheckDTO = hyPartnerUserInfoDAO.selectByCheckMobile(signUpExhibitionDTO.getMobile()); - if(mobileCheckDTO==null){ - mobileCheckDTO = new MobileCheckDTO(); - } - //线索不存在 - Boolean sendNotice = Boolean.TRUE; - String investManager = mobileCheckDTO.getInvestmentManager(); - String partnerId = mobileCheckDTO.getPartnerId(); - Long lineId = mobileCheckDTO.getLineId(); - if (mobileCheckDTO.getMobile() == null||mobileCheckDTO.getLineStatus() == null){ - //走这里不需要发送通知 - sendNotice = Boolean.FALSE; - //mobileCheckDTO为空 表示从没有授权过 mobileCheckDTO不为空 但是线索状态为空 表示授权过 但是没有线索 - if (mobileCheckDTO.getMobile()==null){ - partnerId = UUIDUtils.get32UUID(); - HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); - resultUser.setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()).setPartnerId(partnerId).setCreateTime(new Date()) - .setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(Integer.valueOf(offlineExhibition)); - hyPartnerUserInfoDAO.insertSelective(resultUser); - }else { - if (StringUtils.isEmpty(mobileCheckDTO.getPartnerName())){ - HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); - resultUser.setUsername(signUpExhibitionDTO.getPartnerName()); - resultUser.setPartnerId(partnerId); - hyPartnerUserInfoDAO.updateByPartnerId(resultUser); - } - } - HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); - resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode()) - .setOperatorType("add").setAllotTime(new Date()).setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()).setInvestmentManager(hyExhibitionDO.getCreator()); - hyPartnerLineInfoDAO.insertSelective(resultLine); - HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO(); - resultBase.setPartnerId(partnerId).setPartnerLineId(resultLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). - setCreateTime(new Date()).setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()); - hyPartnerBaseInfoDAO.insertSelective(resultBase); - lineId = resultLine.getId(); - } - //如果是公海状态 但是结束时间不为空 - if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(mobileCheckDTO.getLineStatus())){ - sendNotice = Boolean.FALSE; - //不管冷静期有没有结束 会销创建人直接认领改线索 - //发送工作通知的招商经理 - investManager = hyExhibitionDO.getCreator(); - if(mobileCheckDTO.getCloseTime()!=null){ - //将老的线索置为删除状态 - hyPartnerLineInfoDAO.batchDeleted(Arrays.asList(Long.valueOf(lineId))); - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setPartnerId(partnerId); - //给会销创建人 - hyPartnerLineInfoDO.setInvestmentManager(hyExhibitionDO.getCreator()); - hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); - hyPartnerLineInfoDO.setLineStatus(1); - hyPartnerLineInfoDO.setAllotTime(new Date()); - hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); - HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO(); - resultBase.setPartnerId(partnerId).setPartnerLineId(hyPartnerLineInfoDO.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())). - setCreateTime(new Date()).setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()); - hyPartnerBaseInfoDAO.insertSelective(resultBase); - lineId = hyPartnerLineInfoDO.getId(); - }else{ - //如果首次在公海 直接分配会销创建人为线索招商经理 - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(Long.valueOf(lineId)); - hyPartnerLineInfoDO.setAllotTime(new Date()); - hyPartnerLineInfoDO.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()); - hyPartnerLineInfoDO.setInvestmentManager(hyExhibitionDO.getCreator()); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); - } - } - SignUpExhibitionVO signUpExhibitionVO = checkSignUp(mobileCheckDTO); - if (signUpExhibitionVO!=null){ - return signUpExhibitionVO; - } - //是否重复报名（已结束的展会不算） - Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); - ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(exhibitionGroupId, lineId); - if (exhibitionDTO != null){ - return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName())); - } - //开始报名 - //判断是否之前报名过该会销 - HyPartnerExhibitionDO partnerExhibition = hyPartnerExhibitionDAO.getPartnerExhibition(hyExhibitionDO.getId(), lineId); - if (partnerExhibition != null){ - partnerExhibition.setParticipationStatus(ExhibitionPartnerStatus.REGISTERED.getCode()); - partnerExhibition.setWantShopArea(signUpExhibitionDTO.getWantShopArea()); - partnerExhibition.setInvestmentManagerName(signUpExhibitionDTO.getIntendedAccountManager()); - partnerExhibition.setCreateTime(new Date()); - partnerExhibition.setExpectedVisitorsCount(signUpExhibitionDTO.getExpectedVisitorsCount()); - partnerExhibition.setExpectedInformation(signUpExhibitionDTO.getExpectedInformation()); - hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition); - }else { - HyPartnerExhibitionDO hyPartnerExhibitionDO = new HyPartnerExhibitionDO(); - hyPartnerExhibitionDO.setExhibitionId(signUpExhibitionDTO.getExhibitionId()); - hyPartnerExhibitionDO.setPartnerLineId(lineId); - hyPartnerExhibitionDO.setPartnerId(partnerId); - hyPartnerExhibitionDO.setWantShopArea(signUpExhibitionDTO.getWantShopArea()); - hyPartnerExhibitionDO.setInvestmentManagerName(signUpExhibitionDTO.getIntendedAccountManager()); - hyPartnerExhibitionDO.setExpectedVisitorsCount(signUpExhibitionDTO.getExpectedVisitorsCount()); - hyPartnerExhibitionDO.setExpectedInformation(signUpExhibitionDTO.getExpectedInformation()); - hyPartnerExhibitionDO.setParticipationStatus(ExhibitionPartnerStatus.REGISTERED.getCode()); - hyPartnerExhibitionDO.setCreator(userInfo.getUserId()); - hyPartnerExhibitionDAO.insertSelective(hyPartnerExhibitionDO); - } - //计算是否会销中 - whetherInExhibition(Arrays.asList(lineId),Boolean.TRUE); - if (sendNotice){ - //发送通知 - List feishuUserIdListByUserIds = enterpriseUserDAO.getFeishuUserIdListByUserIds(Arrays.asList(investManager)); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.PARTNER_SIGNUP_EXHIBITION, - feishuUserIdListByUserIds, - mobileCheckDTO.getLineId().toString(), - mobileCheckDTO.getPartnerId(), - mobileCheckDTO.getPartnerName(), - mobileCheckDTO.getMobile(), - DateUtils.format(hyExhibitionDO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2), - hyExhibitionDO.getExhibitionName(), - hyExhibitionDO.getLocation()); - } - return new SignUpExhibitionVO(Boolean.TRUE,CommonConstants.ZERO,null); - } - - @Override - public Boolean cancelSignUpExhibition(Integer exhibitionId,Long lineId,LoginUserInfo userInfo) { - if (exhibitionId == null || lineId == null){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - //取消报名 - HyPartnerExhibitionDO partnerExhibition = hyPartnerExhibitionDAO.getPartnerExhibition(exhibitionId, lineId); - partnerExhibition.setParticipationStatus(ExhibitionPartnerStatus.SIGN_CANCELED.getCode()); - partnerExhibition.setUpdater(userInfo.getUserId()); - hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition); - //计算是否会销中 - whetherInExhibition(Arrays.asList(lineId),Boolean.FALSE); - return Boolean.TRUE; - } - - @Override - public Boolean manualCheckIn(Integer exhibitionId, Long lineId,LoginUserInfo userInfo) { - //签到 - HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(lineId); - Integer status = ExhibitionPartnerStatus.SIGNED.getCode(); - if (hyPartnerIntentInfoDO != null){ - status = ExhibitionPartnerStatus.APPLIED.getCode(); - } - HyPartnerExhibitionDO partnerExhibition = hyPartnerExhibitionDAO.getPartnerExhibition(exhibitionId, lineId); - partnerExhibition.setParticipationStatus(status); - partnerExhibition.setUpdater(userInfo.getUserId()); - partnerExhibition.setCheckInTime(new Date()); - hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition); - return Boolean.TRUE; - } - - @Override - public Boolean closeExhibition(Integer exhibitionId, LoginUserInfo userInfo) { - //查询展会 - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); - if (hyExhibitionDO == null){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); - } - hyExhibitionDO.setClosedType(CommonConstants.TWO); - hyExhibitionDO.setCloseTime(new Date()); - hyExhibitionDO.setUpdater(userInfo.getUserId()); - //更新展会结束状态 - hyExhibitionDAO.updateByPrimaryKeySelective(hyExhibitionDO); - //批量处理报名线索是否会销中状态 - List exhibitionLine = hyPartnerExhibitionDAO.getExhibitionLine(hyExhibitionDO.getId()); - List lineIds = exhibitionLine.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList()); - //结束是否会销中 - whetherInExhibition(lineIds,Boolean.FALSE); - Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); - List hyExhibitionDOS = hyExhibitionDAO.listByExhibitionGroupId(exhibitionGroupId, Boolean.FALSE); - if (CollectionUtils.isEmpty(hyExhibitionDOS)){ - //如果没有会销是打开状态了，则关闭会销组 - HyExhibitionGroupDO hyExhibitionGroupDO = new HyExhibitionGroupDO(); - hyExhibitionGroupDO.setClosed(Boolean.TRUE); - hyExhibitionGroupDO.setId(exhibitionGroupId); - hyExhibitionGroupDAO.updateByPrimaryKeySelective(hyExhibitionGroupDO); - } - //短信通知 - exhibitionLine.stream().forEach(x->{ - try { - eventCenterHttpRequest.sendSmsVariable(x.getMobile(),SMSMsgEnum.EXHIBITION_CLOSE); - } catch (ApiException e) { - log.info("closeExhibition 发送短信通知失败,mobile:{},exhibitionId:{}",x.getMobile(),hyExhibitionDO.getId()); - } - }); - return Boolean.TRUE; - } - - - @Override - public List getPartnerExhibitionList(Long partnerLineId) { - return hyExhibitionDAO.getPartnerExhibitionList(partnerLineId); - } - - @Override - public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) { - PartnerExhibitionInfoVO partnerExhibitionInfo = hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); - if (partnerExhibitionInfo == null) { - return null; - } - partnerExhibitionInfo.setWhetherIntentionApply(Boolean.TRUE); - HyPartnerIntentInfoDO intentInfo = hyPartnerIntentInfoDAO.selectByLineId(partnerLineId); - if (intentInfo == null) { - partnerExhibitionInfo.setWhetherIntentionApply(Boolean.FALSE); - } - return partnerExhibitionInfo; - } - - @Override - @Transactional - public int autoCloseExhibition(Date now) { - //1. 查询需要关闭的会销 - HyExhibitionDO hyExhibitionDO = new HyExhibitionDO(); - hyExhibitionDO.setClosedType(0); - hyExhibitionDO.setStartDateStr(DateUtil.format(now, CoolDateUtils.DATE_FORMAT_DAY)); - hyExhibitionDO.setDeleted(Boolean.FALSE); - List hyExhibitionDOS = hyExhibitionDAO.querySelective(hyExhibitionDO); - if (CollectionUtils.isEmpty(hyExhibitionDOS)) { - return 0; - } - List exhibitionIds = hyExhibitionDOS.stream().map(HyExhibitionDO::getId).collect(Collectors.toList()); - - //2. 批量刷新会销为结束状态 - int res = hyExhibitionDAO.batchCloseExhibition(exhibitionIds, 1, DateUtil.format(now, CoolDateUtils.DATE_FORMAT_SEC)); - - //3. 处理需要关闭的会销组 - hyExhibitionGroupDAO.batchCloseExhibitionGroup(); - - //4. 批量处理报名线索是否会销中状态 - //4.1 查询可能需要修改状态的会销线索 lineId - List lineIds = hyPartnerExhibitionDAO.getCloseExhibitionLineIds(exhibitionIds); - if (CollectionUtils.isEmpty(lineIds)){ - return res; - } - //4.2 处理会销线索是否会销中状态 - whetherInExhibition(lineIds, Boolean.FALSE); - - return res; - } - - @Override - public void sendSMSToExhibitionApplicants() { - //1. 查询昨晚被自动结束的会销 - HyExhibitionDO hyExhibitionDO = new HyExhibitionDO(); - hyExhibitionDO.setClosedType(1); - String startDayStr = DateUtil.format(DateUtil.offsetDay(new Date(), -1), CoolDateUtils.DATE_FORMAT_DAY); - hyExhibitionDO.setStartDateStr(startDayStr); - hyExhibitionDO.setDeleted(Boolean.FALSE); - List hyExhibitionDOS = hyExhibitionDAO.querySelective(hyExhibitionDO); - if (CollectionUtils.isEmpty(hyExhibitionDOS)) { - return; - } - - //2. 昨晚结束的会销关联的线索 - List exhibitionLine = hyPartnerExhibitionDAO.getLineByExhibitionIds(hyExhibitionDOS.stream().map(HyExhibitionDO::getId).collect(Collectors.toList())); - if (CollectionUtils.isEmpty(exhibitionLine)){ - return; - } - - //3. 短信通知 - exhibitionLine.stream().forEach(x->{ - try { - eventCenterHttpRequest.sendSmsVariable(x.getMobile(), SMSMsgEnum.EXHIBITION_CLOSE); - } catch (ApiException e) { - log.info("closeExhibition 发送短信通知失败,mobile:{}, exhibitionId:{}", x.getMobile(), hyExhibitionDO.getId()); - } - }); - } - - /** - * 计算是否会销中 - * @param lineId - */ - private void whetherInExhibition(List lineId,Boolean insertFlag){ - //计算是否会销中(报名了会销(不能是取消报名状态) 且会销属于开发中 ) - List partnerSignUpDTOS = hyPartnerExhibitionDAO.partnerSignUpCount(lineId); - log.info("whetherInExhibition:{}", JSONObject.toJSONString(partnerSignUpDTOS)); - //会销状态 - Map map = partnerSignUpDTOS.stream().collect(Collectors.toMap(PartnerSignUpDTO::getLineId, PartnerSignUpDTO::getCount)); - List lineInfoDOS = new ArrayList<>(); - lineId.forEach(x->{ - Boolean exhibitionStatus = (map.get(x)!=null||insertFlag)?Boolean.TRUE:Boolean.FALSE; - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(x); - hyPartnerLineInfoDO.setWhetherInExhibition(exhibitionStatus); - lineInfoDOS.add(hyPartnerLineInfoDO); - }); - hyPartnerLineInfoDAO.batchUpdate(lineInfoDOS); - } - - /** - * 校验报名 - * @param mobileCheckDTO - * @return - */ - private SignUpExhibitionVO checkSignUp(MobileCheckDTO mobileCheckDTO){ - //黑名单 - if (LineStatusEnum.BLACKLIST.getCode().equals(mobileCheckDTO.getLineStatus())){ - return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.TWO,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_4)); - } - //私海 - //能报名的列表 - Map> map = WorkflowStageEnum.getExhibitionSignUpMap(); - if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(mobileCheckDTO.getLineStatus())){ - List list = map.get(mobileCheckDTO.getWorkflowStage()); - if (!list.contains(mobileCheckDTO.getWorkflowStatus())){ - HashMap> workflowStatusMap = WorkflowStageEnum.getWorkflowStatusMap(); - List workflowStatusEnums = workflowStatusMap.get(mobileCheckDTO.getWorkflowStage()); - Map statusMap = workflowStatusEnums.stream().collect(Collectors.toMap(WorkflowStatusEnum::getCode, WorkflowStatusEnum::getMessage, (a, b) -> b)); - return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.TWO,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_2, - WorkflowStageEnum.getWorkflowStageByCode(mobileCheckDTO.getWorkflowStage()).getMessage(),statusMap.get(mobileCheckDTO.getWorkflowStatus()))); - } - } - return null; - } - - /** - * 协作人处理 - * @param exhibitionList - * @return - */ - private Map getExhibitionCollaboratorMap(List exhibitionList){ - Set collaboratorsSet = new HashSet(); - Map resultMap = new HashMap<>(); - if (CollectionUtils.isNotEmpty(exhibitionList)) { - exhibitionList.forEach(x -> { - if (StringUtils.isNotEmpty(x.getCollaboratorStr())) { - List userIdList = Arrays.asList(x.getCollaboratorStr().substring(1).split(Constants.COMMA)); - collaboratorsSet.addAll(userIdList); - } - }); - List userInfoList = enterpriseUserDAO.getUserInfoByUserIds(new ArrayList<>(collaboratorsSet)); - resultMap = userInfoList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, - u -> new CollaboratorVO(u.getUserId(), u.getName()))); - } - return resultMap; - } - - /** - * 新增数据 - * @param insertList - */ - private void batchInsertExhibition(ExhibitionGroupDTO exhibitionGroupDTO,List insertList,LoginUserInfo userInfo) throws ApiException { - hyExhibitionDAO.batchInsert(insertList); - //新增之后 发送消息通知 防止通知已发送 数据出现回滚 - for (HyExhibitionDO exhibitionDTO : insertList){ - if (StringUtils.isNotEmpty(exhibitionDTO.getCollaborators())){ - List userIds = Arrays.asList(exhibitionDTO.getCollaborators().substring(1).split(",")); - List userIdsByUserIds = enterpriseUserDAO.getFeishuUserIdListByUserIds(userIds); - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.EXHIBITION_COLLABORATOR, - userIdsByUserIds, - exhibitionDTO.getId().toString(), - userInfo.getName(), - exhibitionDTO.getExhibitionName(), - DateUtils.format(exhibitionDTO.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2), - exhibitionDTO.getLocation()); - } - } - } - - - /** - * 校验一下会销组 - * @param exhibitionGroupDTO - */ - private void checkExhibitionGroup(ExhibitionGroupDTO exhibitionGroupDTO) { - if (exhibitionGroupDTO == null|| StringUtils.isEmpty(exhibitionGroupDTO.getExhibitionGroupName())){ - throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); - } - //会销组中必须添加至少一个会销 - if (CollectionUtils.isEmpty(exhibitionGroupDTO.getExhibitionList())){ - throw new ServiceException(ErrorCodeEnum.EXHIBITION_GROUP_NOT_NULL); - } - } - - - /** - * 返回时间 - * @return YYYY-MM-DD HH:mm:ss - */ - private String nearestInterviewTime() { - LocalDateTime now = LocalDateTime.now(); - int minute = now.getMinute(); - LocalDateTime nearestDateTime; - - //1. 在 00-30 范围内，最近的面试开始时间为 00 - if (minute < 30) { - nearestDateTime = now.withMinute(0).withSecond(0).withNano(0); - //2. 在 30-00 范围内，最近的面试开始时间为 30 - } else { - nearestDateTime = now.withMinute(30).withSecond(0).withNano(0); - } - - // 格式化为字符串 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - return nearestDateTime.format(formatter); - } - -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/IntentWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/IntentWorkFlowService.java deleted file mode 100644 index ace04cbcd..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/IntentWorkFlowService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.service.impl.workflow; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.entity.HyPartnerInterviewDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.RoomStatus; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.EntrustOthersReq; -import com.cool.store.request.TransferInvestmentManagerRequest; -import com.cool.store.service.InterviewService; -import com.cool.store.vo.interview.InterviewVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: IntentWorkFlowService - * @Description: 意向申请 - * @date 2023-06-26 21:21 - */ -@Slf4j -@Service -public class IntentWorkFlowService extends WorkFlowBaseService { - - @Override - public WorkflowStageEnum getWorkFlowStage() { - return WorkflowStageEnum.INTENT; - } - - @Override - public void endProcess(CloseFollowRequest request) { - log.info("意向申请结束~"); - } - - @Override - public void transferInvestmentManager(TransferInvestmentManagerRequest request) { - log.info("转让招商经理~"); - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java deleted file mode 100644 index 9e5443b08..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.cool.store.service.impl.workflow; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.HyPartnerExhibitionDAO; -import com.cool.store.dto.log.RejectInterviewDTO; -import com.cool.store.entity.HyInspectionDO; -import com.cool.store.entity.HyPartnerInterviewDO; -import com.cool.store.enums.*; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.EventCenterHttpRequest; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.mapper.HyInspectionMapper; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.EntrustOthersReq; -import com.cool.store.request.TransferInvestmentManagerRequest; -import com.cool.store.service.InterviewService; -import com.cool.store.service.LogService; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.utils.CoolDateUtils; -import com.cool.store.vo.interview.InterviewVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: InterviewWorkFlowService - * @Description:面试流程 - * @date 2023-06-26 21:24 - */ -@Slf4j -@Service -public class InterviewWorkFlowService extends WorkFlowBaseService { - - @Autowired - private HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private HyInspectionMapper inspectionMapper; - - @Autowired - private InterviewService interviewService; - - @Autowired - private ISVHttpRequest isvHttpRequest; - - @Autowired - private LogService logService; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private HyPartnerExhibitionDAO partnerExhibitionDAO; - - @Autowired - private EventCenterHttpRequest eventCenterHttpRequest; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @Override - public WorkflowStageEnum getWorkFlowStage() { - return WorkflowStageEnum.RESERVATION; - } - - @Override - public void endProcess(CloseFollowRequest request) throws ApiException { - Long lineId = request.getLineId(); - //根据线索id查询面试信息 - List interviewBaseInfos = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(Arrays.asList(lineId)); - if (CollectionUtils.isEmpty(interviewBaseInfos)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - LoginUserInfo operator = CurrentUserHolder.getUser(); - HyPartnerInterviewDO interviewBaseInfo = interviewBaseInfos.get(0); - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewBaseInfo.getInterviewPlanId())); - Integer transferTimes = hyPartnerLineInfoMapper.getTransferTimes(interviewInfo.getPartnerLineId()); - if(transferTimes==0&&Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) == interviewBaseInfo.getStatus() - && StringUtils.isNotEmpty(interviewInfo.getRoomStatus()) - && String.valueOf(RoomStatus.WAIT_FOR_OPEN.getCode()).equals(interviewInfo.getRoomStatus()) - && StringUtils.isNotEmpty(interviewInfo.getFeishuCalendarId()) - && StringUtils.isNotEmpty(interviewInfo.getFeishuScheduleId()) - && interviewInfo.getInterviewerId().equals(operator.getUserId())){ - //1.5.2 后不再使用飞书日程 - // 原面试官日程删除 -// DeleteCalendarEventDTO deleteCalendarEventDTO = new DeleteCalendarEventDTO(); -// deleteCalendarEventDTO.setCalendarId(interviewInfo.getFeishuCalendarId()); -// deleteCalendarEventDTO.setEventId(interviewInfo.getFeishuScheduleId()); -// deleteCalendarEventDTO.setUserId(interviewInfo.getInterviewerId()); -// UserCalendarsEventDTO userCalendarsEventDTO = isvHttpRequest.deleteUserCalendarEvent(deleteCalendarEventDTO); -// if(userCalendarsEventDTO == null ){ -// throw new ApiException(ErrorCodeEnum.FEISHU_DELETE_SCHEDULE_ERROR); -// } - } else if (Integer.parseInt(WorkflowStatusEnum.INTERVIEW_6.getCode()) == interviewBaseInfo.getStatus()) { - //删除稽核信息 - HyInspectionDO rawHyInspection = inspectionMapper.selectByInterviewPlanId(interviewBaseInfo.getInterviewPlanId()); - HyInspectionDO hyInspection = new HyInspectionDO(); - hyInspection.setId(rawHyInspection.getId()); - hyInspection.setDeleted(Boolean.TRUE); - inspectionMapper.updateByPrimaryKeySelective(hyInspection); - } - interviewService.rejectInterviewAndSuspendLine(interviewBaseInfo.getId(),interviewBaseInfo.getInterviewPlanId(),null); - //将线索进行到面试中的会销信息设为不通过 - partnerExhibitionDAO.rejectExhibitionInterview(interviewBaseInfo.getPartnerLineId().toString()); - - //面试待审核阶段被结束发送面试不通过短信 - //拉入黑名单不发短信 - if (request.getWhetherBlackList().equals(0) && interviewInfo.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()))) { - eventCenterHttpRequest.sendSmsVariable(interviewInfo.getPartnerMobile(), SMSMsgEnum.INTERVIEW_REJECT, request.getRejectPublicReason(), wechatMiniAppService.getMiniAppUrl()); - } - - //记录日志 - RejectInterviewDTO log = RejectInterviewDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) - .rejectRealReason(request.getRejectRealReason()).rejectPublicReason(request.getRejectPublicReason()).certifyFile(request.getCertifyFile()).build(); - logService.recordBizLog(operator,request.getLineId(), OperateTypeEnum.REJECT_INTERVIEW,log); - } - - @Override - public void transferInvestmentManager(TransferInvestmentManagerRequest request) throws ServiceException, ApiException { - Long lineId = request.getLineId(); - //根据线索id查询面试信息 - List interviewBaseInfos = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(Arrays.asList(lineId)); - if (CollectionUtils.isEmpty(interviewBaseInfos)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - HyPartnerInterviewDO interviewBaseInfo = interviewBaseInfos.get(0); - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewBaseInfo.getInterviewPlanId())); - if(null == interviewInfo){ - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - Integer status = interviewInfo.getStatus(); - Date now = new Date(); - if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()) || - (interviewInfo.getRoomStatus()!=null && String.valueOf(RoomStatus.OPEN.getCode()).equals(interviewInfo.getRoomStatus())) || - (DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0 - && DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR); - } else if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode())) { - EntrustOthersReq entrustOthersReq = new EntrustOthersReq(); - entrustOthersReq.setInterviewPlanId(interviewInfo.getInterviewPlanId()); - entrustOthersReq.setNewInterviewerId(request.getUserId()); - entrustOthersReq.setPartnerLineId(interviewInfo.getPartnerLineId()); - interviewService.entrustOthers(entrustOthersReq); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java deleted file mode 100644 index 5ced3e9e6..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/ReservationWorkFlowService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.service.impl.workflow; - -import com.cool.store.entity.HyPartnerInterviewDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.EntrustOthersReq; -import com.cool.store.request.TransferInvestmentManagerRequest; -import com.cool.store.service.InterviewService; -import com.cool.store.vo.interview.InterviewVO; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: ReservationWorkFlowService - * @Description:预约面试 - * @date 2023-06-26 21:23 - */ -@Slf4j -@Service -public class ReservationWorkFlowService extends WorkFlowBaseService { - - @Autowired - private HyPartnerInterviewMapper hyPartnerInterviewMapper; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private InterviewService interviewService; - - @Override - public WorkflowStageEnum getWorkFlowStage() { - return WorkflowStageEnum.RESERVATION; - } - - @Override - public void endProcess(CloseFollowRequest request) { - log.info("预约面试结束~"); - } - - @Override - public void transferInvestmentManager(TransferInvestmentManagerRequest request) throws ApiException { - Long lineId = request.getLineId(); - //根据线索id查询面试信息 - List interviewBaseInfos = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(Arrays.asList(lineId)); - if (CollectionUtils.isEmpty(interviewBaseInfos)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - HyPartnerInterviewDO interviewBaseInfo = interviewBaseInfos.get(0); - InterviewVO interviewInfo = hyPartnerInterviewPlanMapper.getInterviewInfo(String.valueOf(interviewBaseInfo.getInterviewPlanId())); - if (null == interviewInfo) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); - } - //还未提交面试预约就未创建面试信息，自然不存在转让面试官操作 - if (!WorkflowStatusEnum.RESERVATION_0.getCode().equals(interviewBaseInfo.getStatus().toString())) { - EntrustOthersReq entrustOthersReq = new EntrustOthersReq(); - entrustOthersReq.setInterviewPlanId(interviewInfo.getInterviewPlanId()); - entrustOthersReq.setNewInterviewerId(request.getUserId()); - entrustOthersReq.setPartnerLineId(interviewInfo.getPartnerLineId()); - interviewService.entrustOthers(entrustOthersReq); - } - } -} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java deleted file mode 100644 index 64c56f29c..000000000 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/WorkFlowBaseService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.service.impl.workflow; - -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.TransferInvestmentManagerRequest; - -/** - * @author zhangchenbiao - * @FileName: WorkFlowBaseService - * @Description: - * @date 2023-06-26 22:15 - */ -public abstract class WorkFlowBaseService { - - /** - * 获取流程阶段 - * @return - */ - public abstract WorkflowStageEnum getWorkFlowStage(); - - /** - * 结束流程 - * @param request - */ - public abstract void endProcess(CloseFollowRequest request) throws ApiException; - - /** - * 转让招商经理（实际是转让面试官，转让招商经理的操作在前置已进行） - * @param request - */ - public abstract void transferInvestmentManager(TransferInvestmentManagerRequest request) throws ApiException; -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java index c2c23a9b2..b7906862a 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -81,51 +81,51 @@ public class TokenValidateFilter implements Filter { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); - HttpServletResponse response = (HttpServletResponse) servletResponse; - HttpServletRequest reqs = (HttpServletRequest) servletRequest; - String uri = reqs.getRequestURI(); - String method = reqs.getMethod(); - String userStr = ""; - LoginUserInfo currentUser = null; - boolean isInWhiteList = excludePath(uri); - String accessToken = reqs.getHeader("accessToken"); - String key = MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, accessToken); - if(StringUtils.isNotBlank(accessToken)){ - userStr = redisUtilPool.getString(key); - if(StringUtils.isNotBlank(userStr)){ - currentUser = JSON.parseObject(userStr, LoginUserInfo.class); - } - } - log.info("url:{}", uri); - if ( !isInWhiteList && !method.equals("OPTIONS")) { - if (StringUtils.isEmpty(accessToken)) { - response.setStatus(HttpStatus.OK.value()); - response.getWriter().write(JSON.toJSONString( - ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); - return; - } - if (Objects.isNull(currentUser)) { - response.setStatus(HttpStatus.OK.value()); - response.getWriter().write(JSON.toJSONString( - ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); - return; - } - log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName()); - } - if(StringUtils.isBlank(userStr) && !isInWhiteList){ - response.setStatus(HttpStatus.OK.value()); - response.getWriter().write(JSON.toJSONString( - ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); - return; - } - try { - CurrentUserHolder.setUser(userStr); - filterChain.doFilter(servletRequest, servletResponse); - } finally { - CurrentUserHolder.removeUser(); - MDC.clear(); - } +// MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); +// HttpServletResponse response = (HttpServletResponse) servletResponse; +// HttpServletRequest reqs = (HttpServletRequest) servletRequest; +// String uri = reqs.getRequestURI(); +// String method = reqs.getMethod(); +// String userStr = ""; +// LoginUserInfo currentUser = null; +// boolean isInWhiteList = excludePath(uri); +// String accessToken = reqs.getHeader("accessToken"); +// String key = MessageFormat.format(CommonConstants.ACCESS_TOKEN_KEY, accessToken); +// if(StringUtils.isNotBlank(accessToken)){ +// userStr = redisUtilPool.getString(key); +// if(StringUtils.isNotBlank(userStr)){ +// currentUser = JSON.parseObject(userStr, LoginUserInfo.class); +// } +// } +// log.info("url:{}", uri); +// if ( !isInWhiteList && !method.equals("OPTIONS")) { +// if (StringUtils.isEmpty(accessToken)) { +// response.setStatus(HttpStatus.OK.value()); +// response.getWriter().write(JSON.toJSONString( +// ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); +// return; +// } +// if (Objects.isNull(currentUser)) { +// response.setStatus(HttpStatus.OK.value()); +// response.getWriter().write(JSON.toJSONString( +// ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); +// return; +// } +// log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName()); +// } +// if(StringUtils.isBlank(userStr) && !isInWhiteList){ +// response.setStatus(HttpStatus.OK.value()); +// response.getWriter().write(JSON.toJSONString( +// ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID))); +// return; +// } +// try { +// CurrentUserHolder.setUser(userStr); +// filterChain.doFilter(servletRequest, servletResponse); +// } finally { +// CurrentUserHolder.removeUser(); +// MDC.clear(); +// } } @Override diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/AdvanceSettingController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/AdvanceSettingController.java deleted file mode 100644 index 7a4278476..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/AdvanceSettingController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.request.AdvancedSettingRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.AdvanceSettingService; -import com.cool.store.vo.AdvancedSettingVO; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @Author suzhuhong - * @Date 2023/6/14 20:48 - * @Version 1.0 - */ -@RestController -@Slf4j -public class AdvanceSettingController { - - @Resource - AdvanceSettingService advanceSettingService; - - @GetMapping(path = "/getAdvanceSetting") - @ApiOperation("查询企业高级设置") - public ResponseResult getAdvanceSetting(){ - return ResponseResult.success(advanceSettingService.getAdvancedSettingDetail()); - } - - @GetMapping(path = "/changeAdvanceSetting") - @ApiOperation("新增或者修改高级设置") - public ResponseResult getAdvanceSetting(@RequestBody AdvancedSettingRequest advancedSettingRequest){ - return ResponseResult.success(advanceSettingService.addOrUpdateAdvanceSetting(CurrentUserHolder.getUserId(),advancedSettingRequest)); - } - - - - - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/AuditResultController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/AuditResultController.java deleted file mode 100644 index 68aec0a62..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/AuditResultController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.request.GetInterviewInspectionResultListReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.InterviewInspectionService; -import com.cool.store.vo.interview.InterviewInspectionResultVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author hxd - * @version 1.0 - * @date 2023/7/19 16:48 - */ -@RestController -@RequestMapping("/inspection/auditResult") -@Api(tags = "面试稽核结果") -public class AuditResultController { - - @Autowired - private InterviewInspectionService interviewInspectionService; - - /** - * 获取面试稽核结果列表 - * - * @param request - * @return - */ - @PostMapping("/getList") - @ApiOperation("获取面试稽核结果列表") - public ResponseResult> interviewInspectionResultGetList(@RequestBody GetInterviewInspectionResultListReq request) { - List interviewInspectionResultGetList = interviewInspectionService.interviewInspectionResultGetList(request); - return ResponseResult.success(new PageInfo<>(interviewInspectionResultGetList)); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java deleted file mode 100644 index 9a95adf7f..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/BeautyCameraSettingController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.request.beauty.AddBeautyCameraSettingRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.BeautyCameraSettingService; -import com.cool.store.vo.beauty.BeautyCameraSettingVO; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: BeautyCameraSettingController - * @Description: 美颜配置 - * @date 2023-09-11 14:21 - */ -@RestController -@Api(tags = "美颜配置") -public class BeautyCameraSettingController { - - @Resource - private BeautyCameraSettingService beautyCameraSettingService; - - - @PostMapping("/saveBeautyCameraSetting") - public ResponseResult saveBeautyCameraSetting(@RequestBody AddBeautyCameraSettingRequest request){ - Long result = beautyCameraSettingService.saveBeautyCameraSetting(CurrentUserHolder.getUserId(), request); - return ResponseResult.success(result); - } - - @GetMapping("/queryBeautyCameraSetting") - public ResponseResult queryBeautyCameraSetting(){ - return ResponseResult.success(beautyCameraSettingService.queryBeautyCameraSetting(CurrentUserHolder.getUserId())); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/CallController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/CallController.java deleted file mode 100644 index 11d26ff8d..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/CallController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.CallRecordBackReq; -import com.cool.store.request.CallUpReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.CallService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: young.yu - * @Date: 2023-08-10 18:05 - * @Description: - */ -@RestController -@RequestMapping("call") -@Api(tags = "通话") -@Slf4j -public class CallController { - - @Autowired - private CallService callService; - - @PostMapping("/callUp") - @ApiOperation("呼出电话") - public ResponseResult callUp(@RequestBody CallUpReq request) throws ApiException { - String res = callService.callUp(request); - return ResponseResult.success(res); - } - -// @PostMapping("/finish/callback") -// @ApiOperation("通话结束回调") -// public ResponseResult callFinishBack(@RequestBody CallFinishBackReq request) throws ApiException { -// callService.callFinishBack(request); -// return ResponseResult.success(); -// } - - @PostMapping("/record/callback") - @ApiOperation("录音上传回调") - public ResponseResult callRecordBack(@RequestBody CallRecordBackReq request) throws ApiException { - callService.callRecordBack(request); - return ResponseResult.success(); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java deleted file mode 100644 index f20a95cfc..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.response.ResponseResult; -import com.cool.store.service.HyPartnerClerkService; -import com.cool.store.vo.PartnerClerkVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/15 11:13 - * @Version 1.0 - */ -@RestController -@Slf4j -@Api(tags = "店员") -public class ClerkController { - - @Resource - HyPartnerClerkService hyPartnerClerkService; - - - @GetMapping(path = "/queryPartnerClerkInfoList") - @ApiOperation("根据线索ID 查询店员列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult> queryPartnerClerkInfoList(@RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(hyPartnerClerkService.getPartnerClerkList(lineId)); - } - - - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/CommonController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/CommonController.java deleted file mode 100644 index d8ea2a989..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/CommonController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetTipsInfoReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.CommonService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: young.yu - * @Date: 2023-06-28 21:33 - * @Description: - */ - -@RestController -@RequestMapping("/common") -@Api(tags = "通用信息") -public class CommonController { - - @Autowired - private CommonService commonService; - @PostMapping("/getTipsInfo") - @ApiOperation("获取面试最新更新信息") - public ResponseResult getTipsInfo(@RequestBody GetTipsInfoReq request) throws ApiException { - String res = commonService.getTipsInfo(request); - return ResponseResult.success(res); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java deleted file mode 100644 index f46cb3119..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.content.*; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.ContentService; -import com.cool.store.vo.HyContentInfoVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("news") -@Api(tags = "动态") -@Slf4j -public class ContentController { - - @Autowired - private ContentService contentService; - - @PostMapping("/queryTitles") - @ApiOperation("搜索标题是否重复") - public ResponseResult queryTitles(@RequestBody ContentQueryTitlesDto title) { - return ResponseResult.success(contentService.queryTitles(title.getTitle())); - } - - @PostMapping("/add") - @ApiOperation("新增动态") - public ResponseResult addContent(@RequestBody ContentAddDto dto) throws ApiException { - return ResponseResult.success(contentService.addNews(dto)); - } - - @PostMapping("/delete") - @ApiOperation("删除动态") - public ResponseResult deleteContent(@RequestBody ContentDelDto dto) { - contentService.deleteContent(dto.getContentId()); - return ResponseResult.success(); - } - - @PostMapping("/modify") - @ApiOperation("修改动态") - public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException { - contentService.updateContent(dto); - return ResponseResult.success(); - } - - @PostMapping("/queryContentList") - @ApiOperation("查询动态列表") - public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = contentService.queryContentList(dto); - PageInfo page = new PageInfo<>(list); - return ResponseResult.success(page); - } - - @PostMapping("/detail") - @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestBody ContentQueryDetailDto dto) { - return ResponseResult.success(contentService.queryContentInfo(dto.getContentId())); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java deleted file mode 100644 index d3a9d463a..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ /dev/null @@ -1,353 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.calendar.UserCalendarsEventDTO; -import com.cool.store.enums.LineStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.request.*; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.*; -import com.cool.store.vo.*; -import com.cool.store.vo.interview.InterviewVO; -import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; -import com.cool.store.vo.partner.PartnerUserBaseVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/30 17:19 - * @Version 1.0 - */ -@RestController -@Slf4j -public class DeskController { - - @Resource - DeskService deskService; - @Resource - HyPartnerIntentInfoService hyPartnerIntentInfoService; - @Resource - HyPartnerInterviewPlanService hyPartnerInterviewPlanService; - @Resource - HyPartnerLineInfoService hyPartnerLineInfoService; - @Resource - HyPartnerBaseInfoService hyPartnerBaseInfoService; - @Resource - EnterpriseUserService enterpriseUserService; - @Resource - PartnerUserInfoService partnerUserInfoService; - @Resource - HyPhoneLocationService hyPhoneLocationService; - - - - @GetMapping(path = "/interviewSchedule") - @ApiOperation("面试日程信息 面试信息有限 不做分页") - public ResponseResult interviewSchedule(@RequestParam(value = "selectedData",required = false) String selectedData){ - - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(deskService.interviewSchedule(userId,selectedData)); - } - - - @GetMapping(path = "/getInvestmentManagerList") - @ApiOperation("招商经理") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "allocation-招商经理 transfer", required = false), - @ApiImplicitParam(name = "keyword", value = "keyword", required = false), - }) - public ResponseResult> getInvestmentManagerList(String type,String keyword){ - return ResponseResult.success(enterpriseUserService.getInvestmentManagerList(type,CurrentUserHolder.getUserId(),keyword)); - } - - - @GetMapping(path = "/getUserCalendarsEvents") - @ApiOperation("飞书日程信息") - public ResponseResult> getUserCalendarsEvents(@RequestParam(value = "startTime") Long startTime, - @RequestParam(value = "endTime") Long endTime) throws ApiException { - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(deskService.getUserCalendarsEvents(userId,startTime,endTime)); - } - - - - @GetMapping(path = "/queryStageCount") - @ApiOperation("招商经理视角====各阶段待处理待跟进数量") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false), - }) - public ResponseResult queryStageCount(@RequestParam(value = "type",required = false)String type){ - return ResponseResult.success(deskService.getStageCountByType(CurrentUserHolder.getUserId(),type)); - } - - @GetMapping(path = "/queryInterviewPlan") - @ApiOperation("是否有面试与临期线索") - public ResponseResult> queryInterviewPlanVO(){ - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(deskService.getInterviewPlan(userId)); - } - - - @PostMapping(path = "/queryIntentApplyList") - @ApiOperation("招商经理视角===意向申请审核列表") - public ResponseResult> queryIntentApplyList(@RequestBody PartnerIntentApplyRequest req){ - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,req.getType(),req.getPageSize(),req.getPageNumber(),req.getKeyword(),req.getCallStatus(),req.getUserPortraitIdList(),req.getLastFollowStartTime() - ,req.getLastFollowEndTime(),req.getUserChannelIdList())); - } - - - @GetMapping(path = "/querySubscribeInterviewTimeList") - @ApiOperation("招商经理视角===预约面试时间 列表") - public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)String type, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,type,pageSize,pageNumber)); - } - - @GetMapping(path = "/queryQualifiedInterviewList") - @ApiOperation("招商经理视角===合格资格面试 列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false), - }) - public ResponseResult> queryQualifiedInterviewList(@RequestParam(value = "type",required = false)String type, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(hyPartnerInterviewPlanService.getQualifiedInterviewList(userId,type,pageSize,pageNumber)); - } - - - @GetMapping(path = "/getPartnerLineInfoAndBaseInfo") - @ApiOperation("查询加盟商线索详情之一 线索信息与基本信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult getPartnerLineInfoAndBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(hyPartnerLineInfoService.selectPartnerLineInfoAndBaseInfo(lineId)); - } - - - @GetMapping(path = "/getPartnerIntentInfo") - @ApiOperation("查询加盟商线索详情 意向信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyDetail(lineId)); - } - - - @GetMapping(path = "/getInviteCodeDetail") - @ApiOperation("查询加盟商线索详情 邀请码信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), - }) - public ResponseResult getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)String partnerId){ - return ResponseResult.success(partnerUserInfoService.selectInviteCodeDetail(partnerId)); - } - - - @GetMapping(path = "/getFollowHistory") - @ApiOperation("查询加盟商线索详情 跟进历史") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), - }) - public ResponseResult> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId){ - return ResponseResult.success(hyPartnerLineInfoService.getLineFollowHistory(partnerId)); - } - - - @GetMapping(path = "/lastMonthCloseLine") - @ApiOperation("最近30天结束的线索") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNumber", value = "页码", required = false), - @ApiImplicitParam(name = "pageSize", value = "分页大小", required = false) - }) - public ResponseResult> lastMonthCloseLine(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(hyPartnerLineInfoService.lastMonthCloseLine(userId,pageSize,pageNumber)); - } - - - @PostMapping(path = "/allocationInvestmentManager") - @ApiOperation("分配招商经理/批量分配招商经理") - public ResponseResult allocationInvestmentManager(@RequestBody AllocationInvestmentManagerRequest request){ - - return ResponseResult.success(hyPartnerLineInfoService.allocationInvestmentManager(CurrentUserHolder.getUser(),request.getUserId(),request.getLineIdList())); - } - - - @PostMapping(path = "/transferInvestmentManager") - @ApiOperation("转让招商经理") - public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request,Boolean.TRUE )); - } - - @PostMapping(path = "/batchTransferInvestmentManager") - @ApiOperation("批量转让招商经理") - public ResponseResult> batchTransferInvestmentManager(@RequestBody BatchTransferInvestmentManagerRequest request) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.batchTransferInvestmentManager(CurrentUserHolder.getUser(),request )); - } - - - @PostMapping(path = "/queryPublicSeqLineList") - @ApiOperation("公海列表") - public ResponseResult> queryPublicSeaLineList(@RequestBody LineRequest lineRequest){ - return ResponseResult.success(hyPartnerLineInfoService.publicSeaLineList(CurrentUserHolder.getUserId(),lineRequest)); - } - - - @PostMapping(path = "/queryPrivateSeaLineList") - @ApiOperation("私海列表") - public ResponseResult> queryPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ - return ResponseResult.success(hyPartnerLineInfoService.privateSeaLineList(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.FALSE)); - } - - @PostMapping(path = "/getPrivateSeaPageDetailNext") - @ApiOperation("私海列表详情翻页") - public ResponseResult getPrivateSeaPageDetailNext(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ - return ResponseResult.success(hyPartnerLineInfoService.privateSeaPageDetailNext(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.FALSE)); - } - - - - @PostMapping(path = "/getPrivateAllSeaPageDetailNext") - @ApiOperation("全量私海列表详情翻页") - public ResponseResult getPrivateAllSeaPageDetailNext(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ - return ResponseResult.success(hyPartnerLineInfoService.privateSeaPageDetailNext(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.TRUE)); - } - - @PostMapping(path = "/getPublicSeaPageDetailNext") - @ApiOperation("公海列表详情翻页") - public ResponseResult getPublicSeaPageDetailNext(@RequestBody LineRequest lineRequest){ - return ResponseResult.success(hyPartnerLineInfoService.publicSeaPageDetailNext(CurrentUserHolder.getUserId(),lineRequest)); - } - - @PostMapping(path = "/queryAllPrivateSeqLineList") - @ApiOperation("全量私海") - public ResponseResult> queryAllPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){ - return ResponseResult.success(hyPartnerLineInfoService.privateSeaLineList(CurrentUserHolder.getUserId(),privateSeaLineListRequest,Boolean.TRUE)); - } - - @PostMapping(path = "/queryBlackList") - @ApiOperation("黑名单列表") - public ResponseResult> queryBlackList(@RequestBody LineRequest lineRequest){ - - return ResponseResult.success(hyPartnerLineInfoService.getBlackList(lineRequest)); - } - - - @PostMapping(path = "/removeBlackList") - @ApiOperation("移出黑名单") - public ResponseResult removeBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ - - return ResponseResult.success(hyPartnerLineInfoService.removeBlackList(CurrentUserHolder.getUser(),lineBlackListRequest.getLineId(), LineStatusEnum.PUBLIC_SEAS.getCode(),lineBlackListRequest.getCause())); - } - - @PostMapping(path = "/joinBlackList") - @ApiOperation("加入黑名单") - public ResponseResult joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest) throws ApiException { - - return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(CurrentUserHolder.getUser(),lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause())); - } - - - @PostMapping(path = "/closeOrPassFollow") - @ApiOperation("意向申请审核 结束跟进/通过流程") - public ResponseResult closeOrPassFollow(@RequestBody CloseFollowRequest closeFollowRequest) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(CurrentUserHolder.getUser(),closeFollowRequest)); - } - - - @GetMapping(path = "/queryPartnerBaseInfo") - @ApiOperation("查看意向申请书——用户基本信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryPartnerBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(hyPartnerBaseInfoService.getByPartnerLineId(lineId)); - } - - @PostMapping(path = "/updatePartnerIntentInfo") - @ApiOperation("修改加盟商意向信息/行业认知") - public ResponseResult updatePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest) throws ApiException { - return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest)); - } - - @PostMapping(path = "/changeIntentInfo") - @ApiOperation("员工端变更C端用户意向信息") - public ResponseResult changeIntentInfo( @RequestBody BaseUserInfoRequest baseUserInfoRequest){ - return ResponseResult.success(hyPartnerIntentInfoService.updatePartnerIntentInfo(CurrentUserHolder.getUser(),baseUserInfoRequest)); - } - - - @PostMapping(path = "/addTags") - @ApiOperation("添加标签接口") - public ResponseResult addTags(@RequestBody AddTagsRequest addTagsRequest){ - return ResponseResult.success(hyPartnerBaseInfoService.addTags(CurrentUserHolder.getUser(),addTagsRequest)); - } - - - @GetMapping(path = "/getAssignFollowUser") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), - }) - public ResponseResult getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId, - @RequestParam(value = "type",required = false)String type){ - return ResponseResult.success(hyPartnerLineInfoService.getAssignFollowUser(partnerId,type)); - } - - @GetMapping(path = "/assignFollowUser") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), - }) - public ResponseResult getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId, - @RequestParam(value = "wantShopArea",required = false)String wantShopArea, - @RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){ - return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType,Boolean.TRUE)); - } - - - @GetMapping(path = "/getInterviewInfoByLineId") - @ApiOperation("查询加盟商线索详情 根据线索信息查询面试信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId, - @RequestParam(value = "needDevelopmentDirector",required = false)Boolean needDevelopmentDirector) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId,needDevelopmentDirector)); - } - - @PostMapping(path = "/editBaseInfo") - @ApiOperation("修改接口") - public ResponseResult editBaseInfo(@RequestBody EditBaseInfoRequest request){ - return ResponseResult.success(hyPartnerLineInfoService.editBaseInfo(request)); - } - - @GetMapping(path = "/queryBaseInfo") - @ApiOperation("获取数据接口") - public ResponseResult queryBaseInfo(@RequestParam(value = "partnerLineId")Long partnerLineId){ - return ResponseResult.success(hyPartnerLineInfoService.queryBaseInfo(partnerLineId)); - } - - @GetMapping(path = "/getPartnerInfo") - @ApiOperation("线索基本信息") - public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile, - @RequestParam(value = "exhibitionId")Integer exhibitionId){ - return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,exhibitionId,null)); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EcSyncController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EcSyncController.java deleted file mode 100644 index 1e7bfa878..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EcSyncController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.cool.store.controller; - - -import com.cool.store.entity.HyPartnerEcTrackLogDO; -import com.cool.store.request.CustomerInfoRequest; -import com.cool.store.request.GetTagRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.EcSyncService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - - -@RestController -@RequestMapping("/ecSync") -@Slf4j -public class EcSyncController { - - - @Resource - private EcSyncService ecSyncService; - - @PostMapping(path = "/ecToApplet") - @ApiOperation("ec同步数据到招商系统") - public ResponseResult ecToApplet(@RequestBody List queryListData){ - return ResponseResult.success(ecSyncService.ecToApplet(queryListData)); - } - - @PostMapping(path = "/labelInfo") - @ApiOperation("ec同步标签数据到招商系统") - public ResponseResult labelInfo(@RequestBody List getTagRequestList){ - return ResponseResult.success(ecSyncService.labelInfo(getTagRequestList)); - } - - - @GetMapping(path = "/getCrmCreateTime") - @ApiOperation("ec同步标签数据到招商系统") - public ResponseResult getCrmCreateTime(){ - return ResponseResult.success(ecSyncService.getLastCrmCreateTime()); - } - - - @PostMapping(path = "/historyLine") - @ApiOperation("ec同步线索到招商系统") - public ResponseResult historyLine(@RequestBody List resultCustomerInfoList){ - return ResponseResult.success(ecSyncService.historyLine(resultCustomerInfoList)); - } - - - @PostMapping(path = "/historyLineTrajectory") - @ApiOperation("ec同步跟进记录到招商系统") - public ResponseResult historyLineTrajectory(@RequestBody List resultTrajectoryList){ - return ResponseResult.success(ecSyncService.historyLineTrajectory(resultTrajectoryList)); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java deleted file mode 100644 index 17af44459..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/EnterpriseUserController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.response.ResponseResult; -import com.cool.store.service.EnterpriseUserService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: EnterpriseUserController - * @Description: - * @date 2023-05-30 17:20 - */ -@RestController -@RequestMapping({"/enterprises/users"}) -@Slf4j -public class EnterpriseUserController { - - @Resource - public EnterpriseUserService enterpriseUserService; - - @ApiOperation("获取开发主管") - @GetMapping("/getDevelopmentDirectorList") - public ResponseResult getDevelopmentDirectorList(@RequestParam(value = "wantShopArea",required = false) String wantShopArea){ - return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea)); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java deleted file mode 100644 index f1cb11d03..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dto.exhibition.ExhibitionDTO; -import com.cool.store.dto.exhibition.ExhibitionEnterInterviewDTO; -import com.cool.store.dto.exhibition.ExhibitionGroupDTO; -import com.cool.store.dto.exhibition.SignUpExhibitionDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.FinishInterviewReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.ExhibitionService; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.exhibition.SignUpExhibitionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * @author Fun Li 2023/11/30 14:44 - * @version 1.0 - */ -@RestController -@Api(tags = "会销相关接口") -@RequestMapping("/exhibition") -@Slf4j -public class ExhibitionController { - - @Autowired - private ExhibitionService exhibitionService; - - - @PostMapping(value = "/addExhibitionGroup") - @ApiOperation("添加会销组") - public ResponseResult addExhibitionGroup(@RequestBody ExhibitionGroupDTO exhibitionGroupDTO) throws ApiException { - return ResponseResult.success(exhibitionService.addExhibitionGroup(exhibitionGroupDTO, CurrentUserHolder.getUser())); - } - - @PostMapping(value = "/editExhibitionGroup") - @ApiOperation("编辑会销组") - public ResponseResult editExhibitionGroup(@RequestBody ExhibitionGroupDTO exhibitionGroupDTO) throws ApiException { - return ResponseResult.success(exhibitionService.editExhibitionGroup(exhibitionGroupDTO, CurrentUserHolder.getUser())); - } - - @GetMapping(value = "/getMyExhibitionList") - @ApiOperation("我的会销") - public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedType") String closedType, - @RequestParam(required = false,value = "startDate") String startDate, - @RequestParam(required = false,value = "pageNum") Integer pageNum, - @RequestParam(required = false,value = "pageSize") Integer pageSize) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),startDate ,closedType,pageSize,pageNum)); - } - - @GetMapping(value = "/getMyExhibitionGroupList") - @ApiOperation("我的会销组") - public ResponseResult getMyExhibitionGroupList(@RequestParam(required = false,value = "pageNum") Integer pageNum, - @RequestParam(required = false,value = "pageSize") Integer pageSize) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getMyExhibitionGroupList(user.getUserId(),pageSize,pageNum)); - } - - - @GetMapping(value = "/getExhibitionGroupDetail") - @ApiOperation("会销组详情") - public ResponseResult getExhibitionGroupDetail(@RequestParam(required = false,value = "exhibitionGroupId") Integer exhibitionGroupId) { - return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId,Boolean.TRUE,Boolean.FALSE)); - } - - - @GetMapping(value = "/exhibitionDetail") - @ApiOperation("会销详情") - public ResponseResult getExhibitionDetail(@RequestParam(required = false,value = "exhibitionId") Integer exhibitionId) { - return ResponseResult.success(exhibitionService.getExhibitionDetail(exhibitionId)); - } - - @PostMapping(value = "/editExhibition") - @ApiOperation("编辑会销") - public ResponseResult editExhibition(@RequestBody ExhibitionDTO exhibitionDTO) { - return ResponseResult.success(exhibitionService.editExhibition(exhibitionDTO, CurrentUserHolder.getUser())); - } - - - @ApiOperation("会销面试") - @PostMapping("/enter/interview") - public ResponseResult enterInterview(@RequestBody ExhibitionEnterInterviewDTO dto) throws ApiException { - return ResponseResult.success(exhibitionService.startExhibitionInterview(dto)); - } - - @PostMapping("/finish/interview") - @ApiOperation("结束面试") - public ResponseResult finishInterview(@RequestBody FinishInterviewReq request) throws ApiException { - exhibitionService.finishInterview(request); - return ResponseResult.success(); - } - - @GetMapping(value = "/lineListByExhibitionId") - @ApiOperation("会销报名列表") - public ResponseResult getExhibitionLineList(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, - @RequestParam(required = false,value = "participationStatus") Integer participationStatus, - @RequestParam(required = false,value = "partnerId") String partnerId, - @RequestParam(required = false,value = "id") Integer id, - @RequestParam(required = false,value = "pageSize" ,defaultValue = "10") Integer pageSize, - @RequestParam(required = false,value = "pageNum",defaultValue = "1") Integer pageNum) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getExhibitionLineList(exhibitionId,participationStatus,partnerId,pageSize,pageNum,user.getUserId(),id)); - } - - - @GetMapping(value = "/getExhibitionSignUpList") - @ApiOperation("会销报名列表") - public ResponseResult getExhibitionLineList(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, - @RequestParam(required = false,value = "partnerName") String partnerName) { - return ResponseResult.success(exhibitionService.exhibitionLineBaseList(exhibitionId,partnerName)); - } - - @ApiOperation("报名会销") - @PostMapping("/signUpExhibition") - public ResponseResult signUpExhibition(@RequestBody SignUpExhibitionDTO dto) throws ApiException { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.signUpExhibition(dto,user)); - } - - @ApiOperation("取消报名会销") - @GetMapping("/cancelSignUp") - public ResponseResult cancelSignUp(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, - @RequestParam(required = true,value = "lineId") Long lineId) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.cancelSignUpExhibition(exhibitionId,lineId,user)); - } - - @ApiOperation("签到") - @GetMapping("/manualCheckIn") - public ResponseResult manualCheckIn(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, - @RequestParam(required = true,value = "lineId") Long lineId) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.manualCheckIn(exhibitionId,lineId,user)); - } - - @ApiOperation("结束会销") - @GetMapping("/closeExhibition") - public ResponseResult closeExhibition(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId) { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.closeExhibition(exhibitionId,user)); - } - - - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FeiShuController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FeiShuController.java deleted file mode 100644 index ced7dedd2..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FeiShuController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.FeiShuService; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:06 - * @Description: - * @deprecated {@link com.cool.store.controller.InterviewController} - */ -@Api(tags = "飞书相关接口") -@RestController -@RequestMapping({"/feishu"}) -@Deprecated -public class FeiShuController { - - /** - * @deprecated {@link com.cool.store.controller.InterviewController#getFreeBusyList(GetFreeBusyListReq)} - */ - @Autowired - private FeiShuService feiShuService; - @PostMapping("/interviewer/freebusy/list") - @ApiOperation("查询日程忙闲信息") - @Deprecated - public ResponseResult getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException { - GetFreeBusyListVO getFreeBusyListVO= feiShuService.getFreeBusyList(request); - return ResponseResult.success(getFreeBusyListVO); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java deleted file mode 100644 index 191d251a5..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.CreateQualifyVerifyReq; -import com.cool.store.request.QualificationCallbackReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.FlowService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; - -/** - * @Author: young.yu - * @Date: 2023-06-14 13:47 - * @Description: 流程相关 - */ -@Api(tags = "流程相关接口") -@RestController -@RequestMapping({"/flow"}) -public class FlowController { - - @Autowired - private FlowService flowService; - - @PostMapping("/qualifyVerify/create") - @ApiOperation("发起加盟商资质审核") - public ResponseResult createQualifyVerify(@RequestBody CreateQualifyVerifyReq request) throws ApiException, IOException { - flowService.createQualifyVerify(request); - return ResponseResult.success(); - } - - @PostMapping("/qualificationReview/callback") - @ApiOperation("加盟商资质审核流程信息回调接口") - public ResponseResult qualificationCallback(@RequestBody QualificationCallbackReq request) throws ApiException { - flowService.qualificationCallback(request); - return ResponseResult.success(); - } - - @GetMapping("/dictList") - @ApiOperation("获取资质审核数据来源") - public ResponseResult getDictList(){ - return ResponseResult.success(flowService.getDictList()); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java deleted file mode 100644 index 94ba6c93b..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.exception.ApiException; -import com.cool.store.entity.HyPartnerEcTrackLogDO; -import com.cool.store.request.follow.AddFollowLogRequest; -import com.cool.store.request.follow.AddFollowTaskRequest; -import com.cool.store.request.follow.FollowTaskIdRequest; -import com.cool.store.request.follow.UpdateFollowTaskRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.FollowTaskService; -import com.cool.store.vo.follow.FollowTaskLogVO; -import com.cool.store.vo.follow.FollowTaskPageVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: FollowTaskController - * @Description: - * @date 2023-08-08 14:35 - */ -@RestController -@Slf4j -@Api(tags = "跟进任务") -public class FollowTaskController { - - @Resource - private FollowTaskService followTaskService; - - @ApiOperation("工作台获取跟进任务") - @GetMapping("/follow/task/page") - public ResponseResult> getFollowTaskPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, - @RequestParam("taskStatus")Integer taskStatus, @RequestParam(value = "queryDate", required = false) String queryDate){ - return ResponseResult.success(followTaskService.getFollowTaskPage(pageNum, pageSize, taskStatus, queryDate, CurrentUserHolder.getUserId())); - } - - @ApiOperation("获取线索跟进日志") - @GetMapping("/follow/log/page") - public ResponseResult> getFollowLogPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, @RequestParam("partnerLineId")Long partnerLineId){ - return ResponseResult.success(followTaskService.getFollowLogPage(pageNum, pageSize, partnerLineId)); - } - - @ApiOperation("获取线索ec跟进日志") - @GetMapping("/follow/ecLog/page") - public ResponseResult> getEcFollowLogPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize, @RequestParam("partnerId")String partnerId){ - return ResponseResult.success(followTaskService.getEcFollowLogPage(pageNum, pageSize, partnerId)); - } - - @ApiOperation("添加跟进日志") - @PostMapping("/follow/log/add") - public ResponseResult addFollowLog(@RequestBody @Validated AddFollowLogRequest request){ - return ResponseResult.success(followTaskService.addFollowLog(request, CurrentUserHolder.getUser())); - } - - @ApiOperation("新增跟进任务") - @PostMapping("/follow/task/add") - public ResponseResult addFollowTask(@RequestBody @Validated AddFollowTaskRequest request) throws ApiException { - return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUser())); - } - - @ApiOperation("编辑跟进任务") - @PostMapping("/follow/task/update") - public ResponseResult updateFollowTask(@RequestBody @Validated UpdateFollowTaskRequest request) throws ApiException { - return ResponseResult.success(followTaskService.updateFollowTask(request, CurrentUserHolder.getUserId())); - } - - @ApiOperation("完成跟进任务") - @PostMapping("/follow/task/finish") - public ResponseResult finishFollowTask(@RequestBody @Validated FollowTaskIdRequest request){ - return ResponseResult.success(followTaskService.finishFollowTask(request, CurrentUserHolder.getUserId())); - } - - @ApiOperation("作废跟进任务") - @PostMapping("/follow/task/cancel") - public ResponseResult cancelFollowTask(@RequestBody @Validated FollowTaskIdRequest request){ - return ResponseResult.success(followTaskService.cancelFollowTask(request, CurrentUserHolder.getUserId())); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java deleted file mode 100644 index b023c76a4..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InspectionSettingController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.inspection.setting.AddInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.CheckInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.DeleteInspectionSettingDTO; -import com.cool.store.dto.inspection.setting.UpdateInspectionSettingDTO; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.InspectionSettingService; -import com.cool.store.vo.inspection.setting.InspectionSettingCheckVO; -import com.cool.store.vo.inspection.setting.InspectionSettingDetailVO; -import com.cool.store.vo.inspection.setting.InspectionSettingPageVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: InspectionSettingController - * @Description:稽核区域设置 - * @date 2023-07-17 14:29 - */ -@RestController -@Slf4j -@Api(tags = "稽核区域设置") -public class InspectionSettingController { - - @Resource - private InspectionSettingService inspectionSettingService; - - @ApiOperation("稽核区域设置列表") - @GetMapping("/inspection/setting/page") - public ResponseResult> getInspectionSettingPage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){ - return ResponseResult.success(inspectionSettingService.getInspectionSettingPage(pageNum, pageSize)); - } - - @ApiOperation("稽核区域设置详情") - @GetMapping("/inspection/setting/detail") - public ResponseResult getInspectionSettingDetail(@RequestParam("inspectionSettingId")Long inspectionSettingId){ - return ResponseResult.success(inspectionSettingService.getInspectionSettingDetail(inspectionSettingId)); - } - - @ApiOperation("新增稽核区域设置") - @PostMapping("/inspection/setting/add") - public ResponseResult addInspectionSetting(@RequestBody AddInspectionSettingDTO param){ - return ResponseResult.success(inspectionSettingService.addInspectionSetting(CurrentUserHolder.getUserId(), param)); - } - - @ApiOperation("编辑稽核区域设置") - @PostMapping("/inspection/setting/update") - public ResponseResult updateInspectionSetting(@RequestBody UpdateInspectionSettingDTO param){ - return ResponseResult.success(inspectionSettingService.updateInspectionSetting(CurrentUserHolder.getUserId(), param)); - } - - @ApiOperation("删除稽核区域设置") - @PostMapping("/inspection/setting/delete") - public ResponseResult deleteInspectionSetting(@RequestBody DeleteInspectionSettingDTO param){ - return ResponseResult.success(inspectionSettingService.deleteInspectionSetting(CurrentUserHolder.getUserId(), param.getInspectionSettingId())); - } - - @ApiOperation("校验稽核区域设置") - @PostMapping("/inspection/setting/check") - public ResponseResult> checkInspectionSetting(@RequestBody CheckInspectionSettingDTO param){ - return ResponseResult.success(inspectionSettingService.checkInspectionSetting(param)); - } - - @ApiOperation("查询已经关联的稽核人") - @GetMapping("/inspection/setting/bind/users") - public ResponseResult> getBingUser(){ - return ResponseResult.success(inspectionSettingService.getBingUser()); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java deleted file mode 100644 index cfc9917bb..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.exception.ApiException; -import com.cool.store.request.*; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.InterviewService; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.interview.CreateAppointmentVO; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import com.cool.store.vo.interview.InterviewVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @Author: young.yu - * @Date: 2023-06-06 15:22 - * @Description: - */ -@RestController -@RequestMapping("/interview") -@Api(tags = "面试信息") -public class InterviewController { - - @Autowired - private InterviewService interviewService; - - @PostMapping("/list") - @ApiOperation("获取面试信息列表") - public ResponseResult> getInterviewList(@RequestBody GetInterviewListReq request) { - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - List interviewList = interviewService.getInterviewList(request); - return ResponseResult.success(new PageInfo<>(interviewList)); - } - - @PostMapping("/queryByInterviewPlanId") - @ApiOperation("根据面试会议计划id查询面试信息") - public ResponseResult queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) throws ApiException { - InterviewVO interviewVO = interviewService.getInterviewInfo(request); - return ResponseResult.success(interviewVO); - } - - @PostMapping("/entrustOthers") - @ApiOperation("委托他人") - public ResponseResult entrustOthers(@RequestBody EntrustOthersReq request) throws ApiException { - interviewService.entrustOthers(request); - return ResponseResult.success(); - } - - @PostMapping("/freebusy/list") - @ApiOperation("查询各预约时间段情况") - public ResponseResult getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException { - GetFreeBusyListVO getFreeBusyListVO= interviewService.getFreeBusyList(request); - return ResponseResult.success(getFreeBusyListVO); - } - - @PostMapping("/appointment/booking") - @ApiOperation("招商经理主动预约面试") - public ResponseResult bookInterview(@RequestBody CreateAppointmentReq request) throws ApiException { - return ResponseResult.success(interviewService.bookInterview(request)); - } - - @PostMapping("/modifyInterviewTime") - @ApiOperation("修改面试时间") - public ResponseResult modifyInterviewTime(@RequestBody ModifyInterviewTimeReq request) throws ApiException { - interviewService.modifyInterviewTime(request); - return ResponseResult.success(); - } - - @PostMapping("/finish") - @ApiOperation("结束面试") - public ResponseResult finishInterview(@RequestBody FinishInterviewReq request) throws ApiException { - interviewService.finishInterview(request); - return ResponseResult.success(); - } - - @PostMapping("/enter") - @ApiOperation("进入面试房间") - public ResponseResult enterInterviewRoom(@RequestBody EnterInterviewDto dto) throws ApiException { - return ResponseResult.success(interviewService.enterInterviewRoom(dto)); - } - - @PostMapping("/appointment/approve") - @ApiOperation("同意面试预约") - public ResponseResult approveAppointment(@RequestBody ApproveAppointmentReq request) throws ApiException { - interviewService.approveAppointment(request); - return ResponseResult.success(); - } - - @PostMapping("/reInterview") - @ApiOperation("重新面试") - public ResponseResult reInterview(@RequestBody ReInterviewReq request) throws ApiException { - interviewService.reInterview(request); - return ResponseResult.success(); - } - -// @PostMapping("/reject") -// @ApiOperation("拒绝面试") -// public ResponseResult reInterview(@RequestBody RejectInterviewReq request) throws ApiException { -// interviewService.rejectInterview(request); -// return ResponseResult.success(); -// } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java deleted file mode 100644 index 5ec784d0e..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.inspection.interview.InspectionRevocationDTO; -import com.cool.store.dto.inspection.interview.InspectionSubmissionDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetInterviewInspectionListReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.InterviewInspectionService; -import com.cool.store.vo.interview.GetInterviewInspectionHistoryListVO; -import com.cool.store.vo.interview.InterviewInspectionHistoryInfo; -import com.cool.store.vo.interview.InterviewInspectionInfo; -import com.cool.store.vo.interview.InterviewInspectionVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author Fun Li - * @version 1.0 - * @date 2023/7/19 16:48 - */ -@RestController -@RequestMapping("/inspection/interview") -@Api(tags = "面试稽核") -public class InterviewInspectionController { - - @Autowired - private InterviewInspectionService interviewInspectionService; - - @PostMapping("/submission") - @ApiOperation("提交稽核结果") - public ResponseResult interviewInspectionSubmit(@RequestBody InspectionSubmissionDTO dto) throws ApiException { - interviewInspectionService.submit(dto); - return ResponseResult.success(); - } - - @PostMapping("/revocation") - @ApiOperation("撤销稽核结果") - public ResponseResult interviewInspectionRevoke(@RequestBody InspectionRevocationDTO dto) throws ApiException { - interviewInspectionService.revoke(dto); - return ResponseResult.success(); - } - - - /** - * 获取面试稽核列表 - * - * @param request - * @return - */ - @PostMapping("/getList") - @ApiOperation("获取面试稽核列表") - public ResponseResult> interviewInspectionGetList(@RequestBody GetInterviewInspectionListReq request) { - List interviewInspectionVOList = interviewInspectionService.interviewInspectionGetList(request); - return ResponseResult.success(new PageInfo<>(interviewInspectionVOList)); - } - - - /** - * 获取面试稽核详情信息 - * - * @param id - * @return - */ - @GetMapping("/getDetail") - @ApiOperation("获取面试稽核详情信息") - public ResponseResult interviewInspectionGetDetail(@RequestParam("id") Long id) { - InterviewInspectionInfo interviewInspectionInfo = interviewInspectionService.interviewInspectionGetDetail(id); - return ResponseResult.success(interviewInspectionInfo); - } - - /** - * 面试稽核历史结果查看 - * - * @param id - * @return - */ - @GetMapping("/getHistoryDetail") - @ApiOperation("稽核历史结果查看") - public ResponseResult interviewInspectionGetHistoryDetail(@RequestParam("id") Long id) { - List interviewInspectionHistoryInfos = interviewInspectionService.interviewInspectionGetHistoryDetail(id); - return ResponseResult.success(new GetInterviewInspectionHistoryListVO().setInterviewInspectionHistoryInfos(interviewInspectionHistoryInfos)); - } - - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java deleted file mode 100644 index ae544dc9c..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.label.LabelAddDTO; -import com.cool.store.dto.label.LabelDeleteDTO; -import com.cool.store.dto.label.LabelListDTO; -import com.cool.store.dto.label.LabelUpdateDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.LabelService; -import com.cool.store.vo.LabelGroupVO; -import com.cool.store.vo.LabelListVo; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author Fun Li 2023/8/10 14:20 - * @version 1.0 - */ -@Api(tags = "标签管理") -@RestController -@RequestMapping("/label") -public class LabelController { - - @Autowired - private LabelService labelService; - - @ApiOperation("标签列表查询") - @PostMapping("/list") - public ResponseResult> getLabelList(@RequestBody LabelListDTO dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List result = labelService.getLabelList(dto); - return ResponseResult.success(new PageInfo<>(result)); - } - - @ApiOperation("查询标签组及子标签列表") - @GetMapping("/labelGroupAndLabelList") - public ResponseResult> getAllLabelList() { - List result = labelService.getAllGroupAndLabelList(); - return ResponseResult.success(result); - } - - @ApiOperation("新增标签") - @PostMapping("/add") - public ResponseResult addLabel(@RequestBody LabelAddDTO dto) throws ApiException { - labelService.addLabel(dto); - return ResponseResult.success(); - } - - @ApiOperation("修改标签") - @PostMapping("/edit") - public ResponseResult updateLabel(@RequestBody LabelUpdateDTO dto) throws ApiException { - labelService.updateLabel(dto); - return ResponseResult.success(); - } - - @ApiOperation("删除标签") - @PostMapping("/delete") - public ResponseResult deleteLabel(@RequestBody LabelDeleteDTO dto) { - labelService.deleteLabel(dto); - return ResponseResult.success(); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java deleted file mode 100644 index 53b941c75..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.label.LabelGroupAddDTO; -import com.cool.store.dto.label.LabelGroupDeleteDTO; -import com.cool.store.dto.label.LabelGroupListDTO; -import com.cool.store.dto.label.LabelGroupUpdateDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.LabelGroupService; -import com.cool.store.vo.LabelGroupListVo; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author Fun Li 2023/8/10 10:54 - * @version 1.0 - */ -@Api(tags = {"标签组管理"}) -@RestController -@RequestMapping({"/labelGroup"}) -public class LabelGroupController { - @Autowired - private LabelGroupService labelGroupService; - - @ApiOperation("标签组分页查询") - @PostMapping({"/list"}) - public ResponseResult> getLabelGroupList(@RequestBody LabelGroupListDTO dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List result = labelGroupService.getLabelGroupList(dto); - return ResponseResult.success(new PageInfo<>(result)); - } - - @ApiOperation("新增标签组") - @PostMapping({"/add"}) - public ResponseResult addLabelGroup(@RequestBody LabelGroupAddDTO dto) throws ApiException { - labelGroupService.addLabelGroup(dto); - return ResponseResult.success(); - } - - @ApiOperation("修改标签组") - @PostMapping({"/edit"}) - public ResponseResult updateLabelGroup(@RequestBody LabelGroupUpdateDTO dto) throws ApiException { - labelGroupService.updateLabelGroup(dto); - return ResponseResult.success(); - } - - @ApiOperation("删除标签组") - @PostMapping({"/delete"}) - public ResponseResult deleteLabelGroup(@RequestBody LabelGroupDeleteDTO dto) throws ApiException { - labelGroupService.deleteLabelGroup(dto); - return ResponseResult.success(); - } - - @ApiOperation("获取所有标签组") - @PostMapping({"/allList"}) - public ResponseResult> deleteLabelGroup() { - return ResponseResult.success(labelGroupService.getAllLabelGroupList()); - } - - @ApiOperation("获取所有标签组") - @PostMapping({"/allListAsc"}) - public ResponseResult> getLabelGroupListOrder() { - return ResponseResult.success(labelGroupService.getLabelGroupListOrder()); - } -} - diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LineHighSeasController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LineHighSeasController.java deleted file mode 100644 index 44c318952..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LineHighSeasController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.controller; - - -import com.cool.store.exception.ApiException; -import com.cool.store.request.AddLineRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.LineHighSeasService; -import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.validation.Valid; - -/** - * @Author: hxd - * @Date: 2023-06-06 15:22 - * @Description: - */ -@RestController -@RequestMapping("/line/highSeas") -public class LineHighSeasController { - - - @Autowired - private LineHighSeasService lineHighSeasService; - - @PostMapping("/add") - @ApiOperation("新建线索") - public ResponseResult addLine(@RequestBody @Valid AddLineRequest request) throws ApiException { - return ResponseResult.success(lineHighSeasService.addLine(request)); - } - - - - @PostMapping(value = "/import") - @ApiOperation("批量导入线索") - public ResponseResult importLine(@RequestParam(value = "file") MultipartFile file) { - return lineHighSeasService.importLine(file); - } - - - @GetMapping("/addCheckout") - @ApiOperation("线索手机号校验") - public ResponseResult addCheckout(@Param("partnerMobile")String partnerMobile) throws ApiException { - return lineHighSeasService.addCheckout(partnerMobile); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java deleted file mode 100644 index f817a1397..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.cool.store.controller; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.login.FeiShuLoginDTO; -import com.cool.store.dto.login.UserIdInfoDTO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.request.UserOnlineStatusRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.LoginService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: LoginController - * @Description:登录 - * @date 2023-05-19 17:22 - */ -@RestController -@Slf4j -public class LoginController { - - @Autowired - private LoginService loginService; - @Autowired - private ISVHttpRequest isvHttpRequest; - - - @PostMapping(value = "/feiShuLogin") - public ResponseResult feiShuLogin(@RequestBody FeiShuLoginDTO param) { - log.info("feiShuLogin data={}", JSONObject.toJSONString(param)); - String code = param.getCode(); - try { - UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(code); - if(Objects.isNull(userInfo)){ - throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR); - } - log.info("userInfo:{}", JSON.toJSONString(userInfo)); - String userId = userInfo.getOpenId(); - return ResponseResult.success(loginService.feiShuLogin(userId, Boolean.TRUE, StringUtils.EMPTY)); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR); - } - } - - @GetMapping("/getUserInfoByToken") - public ResponseResult getUserInfoByToken(){ - return ResponseResult.success(CurrentUserHolder.getUser()); - } - - @PostMapping("/saveUserOnlineStatus") - public ResponseResult saveUserOnlineStatus(@RequestBody UserOnlineStatusRequest param){ - return ResponseResult.success(loginService.saveUserOnlineStatus(CurrentUserHolder.getUser().getUserId(), param.getOnlineStatus())); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java deleted file mode 100644 index 3727d7674..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.mdm.AreaSonDTO; -import com.cool.store.entity.MDMAreaDO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.response.mdm.BelongRegion; -import com.cool.store.response.mdm.BusinessRegion; -import com.cool.store.service.MDMAreaService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -import static com.cool.store.response.ResponseResult.success; - -@RestController -@RequestMapping("/mdm/area") -@Api(tags = "MDM区域信息") -public class MDMAreaController { - - @Autowired - private MDMAreaService mdmAreaService; - - @PostMapping("/province") - @ApiOperation("获取MDM省级信息") - public ResponseResult> getProvince() { - return success(mdmAreaService.getProvince()); - } - - @PostMapping("/son") - @ApiOperation("获取子级区域数据") - public ResponseResult> getSonArea(@RequestBody AreaSonDTO areaSon) { - return success(mdmAreaService.getSonArea(areaSon.getCode())); - } - - @PostMapping("/belonging/region") - @ApiOperation("获取 mdm 所有归属大区") - public ResponseResult> getBelongRegion() throws ApiException { - return ResponseResult.success(mdmAreaService.getBelongRegion()); - } - - @PostMapping("/business/region") - @ApiOperation("获取 mdm 所有业务区域") - public ResponseResult> getBusinessRegion() throws ApiException { - return ResponseResult.success(mdmAreaService.getBusinessRegion()); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java deleted file mode 100644 index 4a0e65172..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.common.IdParamDTO; -import com.cool.store.dto.common.IdsParamDTO; -import com.cool.store.dto.menu.AddMenuDTO; -import com.cool.store.enums.MenuTypeEnum; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.MenuService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: MenuController - * @Description: - * @date 2023-06-08 16:58 - */ -@RestController -@Slf4j -@Api(tags = "菜单") -public class MenuController { - - @Resource - private MenuService menuService; - - @ApiOperation("获取用户权限菜单") - @GetMapping("/menu/getUserMenus") - public ResponseResult getUserMenus(){ - return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId())); - } - - @ApiOperation("获取所有菜单") - @GetMapping("/menu/getAllMenus") - public ResponseResult getAllMenus(){ - return ResponseResult.success(menuService.getAllMenus()); - } - - @ApiOperation("新增菜单") - @PostMapping(path = "/menu/add") - public ResponseResult addMenu(@RequestBody AddMenuDTO param){ - return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU)); - } - - @ApiOperation("新增权限") - @PostMapping(path = "/menu/auth/add") - public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){ - return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH)); - } - - @ApiOperation("删除菜单或权限") - @PostMapping(path = "/menu/auth/delete") - public ResponseResult deleteMenuAuth(@RequestBody IdParamDTO param){ - return ResponseResult.success(menuService.deleteMenuAuth(param.getId())); - } - - @ApiOperation("排序") - @PostMapping(path = "/menu/sort") - public ResponseResult sortMenu(@RequestBody IdsParamDTO param){ - return ResponseResult.success(menuService.sortMenu(param.getIds())); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java deleted file mode 100644 index f4c4958eb..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OpenAreaController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.request.OpenAreaRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.OpenAreaService; -import com.cool.store.vo.OpenAreaTreeVO; -import com.cool.store.vo.OpenAreaVO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/15 9:49 - * @Version 1.0 - */ -@RestController -public class OpenAreaController { - - @Resource - OpenAreaService openAreaService; - - @GetMapping(path = "/getOpenAreaTree") - @ApiOperation("开放城市树-搜索城市 到第二节点") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false), - @ApiImplicitParam(name = "areaStatus", value = "状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和", required = false) - }) - public ResponseResult> getOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword, - @RequestParam(value = "areaStatus",required = false)String areaStatus){ - return ResponseResult.success(openAreaService.queryByKeyword(keyword,areaStatus,Boolean.TRUE)); - } - - - @GetMapping(path = "/getAllOpenAreaTree") - @ApiOperation("开放城市树-所有节点") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false) - }) - public ResponseResult> getAllOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){ - return ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,null,Boolean.FALSE)); - } - - - @GetMapping(path = "/getOpenAreaList") - @ApiOperation("开放城市树-子列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), - @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) - }) - public ResponseResult> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId, - @RequestParam(value = "type",required = false)String type){ - return ResponseResult.success(openAreaService.getChildrenList(type,parentId)); - } - - - - @PostMapping(path = "/changeOpenAreaStatus") - @ApiOperation("变更开放区域状态") - public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ - String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java deleted file mode 100644 index fb3b33e98..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cool.store.controller; - -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.common.utils.BinaryUtil; -import com.aliyun.oss.model.MatchMode; -import com.aliyun.oss.model.PolicyConditions; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.exception.ServiceException; -import com.cool.store.response.ResponseResult; -import com.cool.store.vo.oss.OssUploadConfigVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.sql.Date; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: OssClientController - * @Description: - * @date 2023-06-01 11:25 - */ -@RestController -@RequestMapping({"/oss"}) -@Slf4j -public class OssClientController { - - @Value("${oss.accessKeyId:null}") - private String accessKeyId; - @Value("${oss.accessKeySecret:null}") - private String accessKeySecret; - @Value("${oss.endpoint:null}") - private String endpoint; - @Value("${oss.bucket:null}") - private String bucket; - @Value("${cdn.url:null}") - private String cdnUrl; - @Value("${oss.file.dir:null}") - private String dir; - - @GetMapping("/getUploadFileConfig") - public ResponseResult getUploadFileConfig(){ - // host的格式为 bucketname.endpoint - String host = "https://" + bucket + "." + endpoint; - OSS client = null; - try { - client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - long expireTime = 300; - long expireEndTime = System.currentTimeMillis() + expireTime * 1000; - Date expiration = new Date(expireEndTime); - PolicyConditions policyConds = new PolicyConditions(); - policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000); - policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir); - String postPolicy = client.generatePostPolicy(expiration, policyConds); - byte[] binaryData = postPolicy.getBytes("utf-8"); - String encodedPolicy = BinaryUtil.toBase64String(binaryData); - String signature = client.calculatePostSignature(postPolicy); - OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl); - return ResponseResult.success(result); - }catch (Exception e){ - log.info("exception", e); - throw new ServiceException(ErrorCodeEnum.GET_INFO_ERROR); - }finally { - if(Objects.nonNull(client)){ - client.shutdown(); - } - } - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OutboundController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OutboundController.java deleted file mode 100644 index 26a4232c7..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OutboundController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.outbound.AddNumberDTO; -import com.cool.store.dto.outbound.DeleteNumberDTO; -import com.cool.store.dto.outbound.OutboundListDTO; -import com.cool.store.dto.outbound.UpdateNumberDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.HyOutboundService; -import com.cool.store.vo.HyOutboundVo; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author Fun Li 2023/8/9 15:31 - * @version 1.0 - */ -@RestController -@RequestMapping("/outbound/number") -@Api(tags = "呼出号码管理") -public class OutboundController { - - @Autowired - private HyOutboundService hyOutboundService; - - @ApiOperation("已配置号码列表") - @PostMapping("/list") - public ResponseResult> getOutboundNumberList(@RequestBody OutboundListDTO dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List result = hyOutboundService.getOutboundNumberList(dto); - return ResponseResult.success(new PageInfo<>(result)); - } - - @ApiOperation("新增号码") - @PostMapping("/add") - public ResponseResult addOutboundNumber(@RequestBody AddNumberDTO dto) throws ApiException { - hyOutboundService.addOutboundNumber(dto); - return ResponseResult.success(); - } - - @ApiOperation("编辑号码") - @PostMapping("/update") - public ResponseResult updateOutboundNumber(@RequestBody UpdateNumberDTO dto) throws ApiException { - hyOutboundService.updateOutboundNumber(dto); - return ResponseResult.success(); - } - - @ApiOperation("删除号码") - @PostMapping("/delete") - public ResponseResult deleteOutboundNumber(@RequestBody DeleteNumberDTO dto) throws ApiException { - hyOutboundService.deleteOutboundNumber(dto); - return ResponseResult.success(); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java deleted file mode 100644 index 44632a16b..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.response.ResponseResult; -import com.cool.store.service.RegionService; -import com.cool.store.service.ZoneService; -import com.cool.store.vo.region.RegionBaseInfoVO; -import com.cool.store.vo.region.RegionUserAndSubRegionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: RegionController - * @Description: - * @date 2023-06-12 15:53 - */ -@RestController -@RequestMapping({"/v1/region" }) -@Slf4j -@Api(tags = "组织架构") -public class RegionController { - - @Resource - private RegionService regionService; - @Resource - private ZoneService zoneService; - - @GetMapping("/getRegionList") - public ResponseResult> getRegionBaseInfoList(){ - List resultList = new ArrayList<>(Arrays.asList(regionService.getRegionBaseInfoList())); - return ResponseResult.success(resultList); - } - - - @ApiOperation("查询所有被绑定战区的组织机构") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "intent-意向区域 dev 开发区域", required = false) - }) - @GetMapping("/queryAllBingZoneRegionList") - public ResponseResult> queryAllBingZoneRegionList(@RequestParam(value = "type",required = false)String type){ - return ResponseResult.success(zoneService.queryAllBingZoneRegionList(type)); - } - - @ApiOperation("获取部门下的人和部门") - @GetMapping("/getRegionUserAndSubRegion") - public ResponseResult getRegionUserAndSubRegion(@RequestParam(value = "regionId")String regionId){ - return ResponseResult.success(regionService.getRegionUserAndSubRegion(regionId)); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RoleController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/RoleController.java deleted file mode 100644 index fa5b2b83f..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RoleController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.dto.role.RoleUpdateDTO; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.RoleService; -import com.cool.store.vo.role.RoleAuthInfoVO; -import com.cool.store.vo.role.RolePageVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * @author zhangchenbiao - * @FileName: RoleController - * @Description: - * @date 2023-07-25 14:58 - */ -@RestController -@Slf4j -@Api(tags = "角色") -public class RoleController { - - @Resource - private RoleService roleService; - - @ApiOperation("角色列表") - @GetMapping("/role/page") - public ResponseResult> getRolePage(@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){ - return ResponseResult.success(roleService.getRolePage(pageNum, pageSize)); - } - - @ApiOperation("角色权限详情") - @GetMapping("/role/auth/detail") - public ResponseResult getRoleAuthDetail(@RequestParam("roleId")String roleId){ - return ResponseResult.success(roleService.getRoleAuthDetail(roleId)); - } - - @ApiOperation("角色更新") - @PostMapping("/role/auth/update") - public ResponseResult updateRoleAuth(@RequestBody RoleUpdateDTO param){ - return ResponseResult.success(roleService.updateRoleAuth(CurrentUserHolder.getUserId(), param)); - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/SmsController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/SmsController.java deleted file mode 100644 index 6e95e1ded..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/SmsController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.sms.SendInvateMsgDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.SmsService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: young.yu - * @Date: 2023-10-20 13:49 - * @Description: - */ -@RestController -@Slf4j -@RequestMapping("/sms") -@Api(tags = "短信发送") -public class SmsController { - - @Autowired - private SmsService smsService; - - @PostMapping("/invate") - @ApiOperation("招商邀请短信") - public ResponseResult sendInvateMsg(@RequestBody SendInvateMsgDTO sendInvateMsgDTO) throws ApiException { - smsService.sendInvateMsg(sendInvateMsgDTO); - return ResponseResult.success(); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java deleted file mode 100644 index 5ea002238..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.cool.store.controller; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyPartnerTaskInfoLogDAO; -import com.cool.store.dto.calendar.CreateCalendarEventDTO; -import com.cool.store.dto.calendar.DeleteCalendarEventDTO; -import com.cool.store.dto.calendar.UpdateCalendarEventDTO; -import com.cool.store.dto.calendar.UserCalendarsEventDTO; -import com.cool.store.dto.message.SendCardMessageDTO; -import com.cool.store.dto.response.ResultDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.IDCardSideEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.http.ISVHttpRequest; -import com.cool.store.mapper.HyOpenAreaInfoMapper; -import com.cool.store.request.TestRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.*; -import com.cool.store.vo.cuser.IdentityCardInfoVO; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @author zhangchenbiao - * @FileName: TestController - * @Description: - * @date 2023-05-26 11:32 - */ -@Slf4j -@RestController -@RequestMapping("test/") -public class TestController { - - @Resource - private EnterpriseUserService enterpriseUserService; - @Resource - private ISVHttpRequest isvHttpRequest; - @Resource - private HyOpenAreaInfoMapper hyOpenAreaInfoMapper; - @Resource - private EnterpriseSyncService enterpriseSyncService; - @Resource - private EnterpriseUserDAO enterpriseUserDAO; - @Resource - private AliyunService aliyunService; - @Resource - private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; - @Resource - private OpenAreaService openAreaService; - @Resource - private FollowTaskService followTaskService; - - @Autowired - private WechatMiniAppService wechatMiniAppService; - - @PostMapping("/post") - public ResponseResult get(@RequestBody List testRequestList){ - log.info(JSON.toJSONString(testRequestList)); - return ResponseResult.success(Boolean.TRUE); - } - - @GetMapping("getUserInfo") - public ResponseResult getUserInfo(@RequestParam("userId")String userId){ - EnterpriseUserDO enterpriseUser = enterpriseUserService.getUserInfoByUserId(userId); - return ResponseResult.success(enterpriseUser); - } - - @GetMapping("getUserIdByCode") - public ResponseResult getUserIdByCode(@RequestParam("paramStr")String paramStr){ - return ResponseResult.success(isvHttpRequest.getUserIdByCode(paramStr)); - } - - @GetMapping("getUserDetailByUserId") - public ResponseResult getUserDetailByUserId(@RequestParam("userId")String userId){ - return ResponseResult.success(isvHttpRequest.getUserDetailByUserId(userId)); - } - - @GetMapping("getAdminUserList") - public ResponseResult getAdminUserList(){ - return ResponseResult.success(isvHttpRequest.getAdminUserList()); - } - - @GetMapping("getAuthInfo") - public ResponseResult getAuthInfo(){ - return ResponseResult.success(isvHttpRequest.getAuthInfo()); - } - - @GetMapping("getDepartments") - public ResponseResult getDepartments(@RequestParam("parentId")String parentId){ - return ResponseResult.success(isvHttpRequest.getDepartments(parentId)); - } - - @GetMapping("getAuthScope") - public ResponseResult getAuthScope(){ - return ResponseResult.success(isvHttpRequest.getAuthScope()); - } - - @GetMapping("getDepartmentUsers") - public ResponseResult getDepartmentUsers(@RequestParam("deptId")String deptId){ - return ResponseResult.success(isvHttpRequest.getDepartmentUsers(deptId)); - } - - @GetMapping("getUserDetailByUserIds") - public ResponseResult getUserDetailByUserIds(@RequestParam("userIds") List userIds){ - return ResponseResult.success(isvHttpRequest.getUserDetailByUserIds(userIds)); - } - - @GetMapping("getSubDepartments") - public ResponseResult getSubDepartments(@RequestParam("parentId")String parentId, @RequestParam("fetchChild")Boolean fetchChild){ - return ResponseResult.success(isvHttpRequest.getSubDepartments(parentId, fetchChild)); - } - - @GetMapping("syncAll") - public ResponseResult syncAll(){ - enterpriseSyncService.syncAll(); - return ResponseResult.success(); - } - - @GetMapping("/user/getFreeBusyList") - public ResultDTO> getFreeBusyList(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime, - @RequestParam("endTime") long endTime) throws ApiException { - log.info("getUserCalendarsEvents , appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime); - return ResultDTO.successResult(isvHttpRequest.getFreeBusyList(userId, startTime, endTime)); - } - - @PostMapping("/user/createUserCalendarEvent") - public ResultDTO createUserCalendarEvent(@RequestBody CreateCalendarEventDTO param) throws ApiException { - log.info("createUserCalendarEvent , param:{}", JSONObject.toJSONString(param)); - return ResultDTO.successResult(isvHttpRequest.createUserCalendarEvent(param)); - } - - @PostMapping("/user/updateUserCalendarEvent") - public ResultDTO updateUserCalendarEvent(@RequestBody UpdateCalendarEventDTO param) throws ApiException { - log.info("updateUserCalendarEvent , param:{}", JSONObject.toJSONString(param)); - return ResultDTO.successResult(isvHttpRequest.updateUserCalendarEvent(param)); - } - - @PostMapping("/user/deleteUserCalendarEvent") - public ResultDTO deleteUserCalendarEvent(@RequestBody DeleteCalendarEventDTO param) throws ApiException { - log.info("createUserCalendarEvent , param:{}", JSONObject.toJSONString(param)); - return ResultDTO.successResult(isvHttpRequest.deleteUserCalendarEvent(param)); - } - - @GetMapping("/user/getUserCalendarsEvents") - public ResultDTO> getUserCalendarsEvents(@RequestParam("userId") String userId, @RequestParam("startTime") long startTime, - @RequestParam("endTime") long endTime) throws ApiException { - log.info("getUserCalendarsEvents : appType:{}, userId:{}, startTime:{}, endTime:{}", userId, startTime, endTime); - return ResultDTO.successResult(isvHttpRequest.getUserCalendarsEvents(userId, startTime, endTime)); - } - - @GetMapping("/getIdentityCardInfo") - @ApiOperation("根据身份证正面解析获取数据") - public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){ - try { - IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, IDCardSideEnum.FACE); - return ResponseResult.success(identityCardInfo); - } catch (Exception e) { - throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL); - } - } - - @PostMapping("/sendFeiShuCardMessage") - public ResponseResult sendFeiShuCardMessage(@RequestBody SendCardMessageDTO param){ - try { - isvHttpRequest.sendFeiShuCardMessage(param); - return ResponseResult.success(); - } catch (Exception e) { - throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL); - } - } - - @GetMapping("getUserIdsByScope") - public ResponseResult getUserIdsByScope(@RequestParam("userId") String userId){ - return ResponseResult.success(enterpriseUserService.getUserIdsByScope(userId)); - } - - @GetMapping("getDevelopmentDirectorList") - public ResponseResult getDevelopmentDirectorList(@RequestParam("wantShopArea") String wantShopArea){ - return ResponseResult.success(enterpriseUserService.getDevelopmentDirectorList(wantShopArea)); - } - - @GetMapping("getDevelopmentByZoneId") - public ResponseResult getDevelopmentByZoneId(@RequestParam("zoneId") Long zoneId){ - return ResponseResult.success(enterpriseUserService.getDevelopmentByZoneId(zoneId)); - } - - @GetMapping("/searchOpenArea") - public ResponseResult searchOpenArea(@RequestParam(value = "keyword",required = false)String keyword, @RequestParam(value = "applyFlag",required = false)Boolean applyFlag){ - return ResponseResult.success(openAreaService.searchOpenArea(keyword, applyFlag, Boolean.FALSE)); - } - - @Resource - HyPhoneLocationService hyPhoneLocationService; - - @GetMapping("/handleHyPhoneAddress") - public ResponseResult test(@RequestParam(value = "phone",required = false)String phone){ - hyPhoneLocationService.handleHyPhoneAddress(phone); - return ResponseResult.success(Boolean.TRUE); - } - - @GetMapping("/getWechatAccessToken") - public ResponseResult getWechatAccessToken(@RequestParam(value = "appId")String appId, @RequestParam("appSecret")String appSecret) { - try { - return ResponseResult.success(isvHttpRequest.getWechatAccessToken(appId, appSecret)); - } catch (ApiException e) { - e.printStackTrace(); - } - return null; - } - - @GetMapping("/followTaskDailyRemind") - public ResponseResult followTaskDailyRemind() throws ApiException { - followTaskService.followTaskDailyRemind(); - return ResponseResult.success(); - } - - @GetMapping("/followTaskAnHourAgoRemind") - public ResponseResult followTaskAnHourAgoRemind() throws ApiException { - followTaskService.followTaskAnHourAgoRemind(); - return ResponseResult.success(); - } - - @GetMapping("/initOpenArea") - public ResponseResult initOpenArea() { - return ResponseResult.success(openAreaService.addOpenArea()); - } - - @GetMapping("/getMiniAppUrl") - public ResponseResult getMiniAppUrl(){ - return ResponseResult.success(wechatMiniAppService.getMiniAppUrl()); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/UserChannelController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/UserChannelController.java deleted file mode 100644 index f045be0e1..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/UserChannelController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.partner.UserChannelDTO; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.HyPartnerUserChannelService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/8/10 11:17 - * @Version 1.0 - */ -@RestController -@Api(tags = "线索来源") -@Slf4j -public class UserChannelController { - - @Resource - HyPartnerUserChannelService hyPartnerUserChannelService; - - @GetMapping(path = "/queryAllUserChannelList") - @ApiOperation("线索来源列表") - public ResponseResult> queryAllUserChannelList(){ - return ResponseResult.success(hyPartnerUserChannelService.queryAllUserChannelList()); - } -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java deleted file mode 100644 index 68d0c983b..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.cool.store.controller; - -import com.alibaba.fastjson.JSONObject; -import com.cool.store.dto.trtc.callback.VideoCallBackDTO; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.TRTCVideoService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/video") -@Api(tags = "腾讯音视频接口") -@Slf4j -public class VideoController { - - @Autowired - private TRTCVideoService videoService; - - @PostMapping("/callback") - @ApiOperation("音视频回调（腾讯云回调）") - public ResponseResult videoCallback(@RequestBody VideoCallBackDTO videoCallBackDTO) { - try { - log.info("腾讯音视频上传回调开始，request{}", JSONObject.toJSONString(videoCallBackDTO)); - //不是音视频上传的回调 - if (311 != videoCallBackDTO.getEventType()) { - return null; - } - if (0 != videoCallBackDTO.getEventInfo().getPayload().getStatus()) { - log.error("腾讯音视频录制视频上传错误：request：\t{}", videoCallBackDTO); - return null; - } - videoService.handleVideoCallBack(videoCallBackDTO); - return new ResponseResult(0, "腾讯云回调音视频回调数据接收成功"); - } catch (Exception e) { - log.error("腾讯音视频录制视频上传回调错误：e：\t{}", e.toString()); - } - return null; - } - -} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java deleted file mode 100644 index bdd180639..000000000 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.request.IntentAreaSettingRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.ZoneService; -import com.cool.store.vo.ZoneCheckVO; -import com.cool.store.vo.ZoneVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/6/14 11:40 - * @Version 1.0 - */ -@RestController -@Slf4j -@Api(tags = "战区") -public class ZoneController { - - @Resource - ZoneService zoneService; - - @PostMapping(path = "/addZone") - @ApiOperation("新建意向战区/开发战区") - public ResponseResult addZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ - return ResponseResult.success(zoneService.addZone( CurrentUserHolder.getUserId(),intentAreaSettingRequest)); - } - - @PostMapping(path = "/checkZone") - @ApiOperation("校验战区") - public ResponseResult> checkZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ - return ResponseResult.success(zoneService.checkZone(intentAreaSettingRequest)); - } - - @PostMapping(path = "/updateZone") - @ApiOperation("编辑意向战区/开发战区") - public ResponseResult updateZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ - - return ResponseResult.success(zoneService.updateZone(CurrentUserHolder.getUserId(),intentAreaSettingRequest)); - } - - @GetMapping(path = "/getZoneList") - @ApiOperation("战区列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), - }) - public ResponseResult> getZoneList(@RequestParam(value = "type",required = false)String type, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - return ResponseResult.success(zoneService.getZoneList(type,pageSize,pageNumber)); - } - - - @GetMapping(path = "/deletedZone") - @ApiOperation("删除战区") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "id", required = false), - }) - public ResponseResult deletedZone(@RequestParam(value = "id",required = false)Long id){ - return ResponseResult.success(zoneService.deletedZone(id)); - } - - @GetMapping(path = "/zoneDetail") - @ApiOperation("战区详情") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "id", required = false), - }) - public ResponseResult zoneDetail(@RequestParam(value = "id",required = false)Long id){ - return ResponseResult.success(zoneService.zoneDetail(id)); - } -} diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties index 04a4e67af..e20af0316 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties @@ -1,4 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202 -spring.cloud.nacos.config.server-addr=192.168.1.202 -spring.cloud.nacos.config.file-extension=properties -spring.cloud.nacos.config.namespace=80efeafb-563c-4acf-a6dd-23c3ed2b849a \ No newline at end of file +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties index a17d74480..f7024ccc3 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,13 @@ -spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +#沪上配置 +#spring.cloud.nacos.discovery.server-addr=192.168.1.137:8848 +#spring.cloud.nacos.config.server-addr=192.168.1.137:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +#酷点掌配置 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties -spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..fbe8b17a7 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=test server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/CommonServiceImplTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/CommonServiceImplTest.java deleted file mode 100644 index 23528363f..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/CommonServiceImplTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetTipsInfoReq; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -/** - * @author Fun Li 2023/12/4 14:51 - * @version 1.0 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Slf4j -class CommonServiceImplTest extends AbstractJUnit4SpringContextTests { - - @Autowired - private CommonService commonService; - - @Test - void testGetTipsInfo() throws ApiException { - GetTipsInfoReq getTipsInfoReq = new GetTipsInfoReq(); - getTipsInfoReq.setPartnerLineId("237272"); - String tipsInfo = commonService.getTipsInfo(getTipsInfoReq); - log.debug(tipsInfo); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/EnterpriseUserInfoDAOTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/EnterpriseUserInfoDAOTest.java deleted file mode 100644 index 41ffe11a6..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/EnterpriseUserInfoDAOTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.dao.EnterpriseUserDAO; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import java.util.Arrays; -import java.util.Map; - -/** - * @author Fun Li 2023/10/25 10:52 - * @version 1.0 - */ -@Slf4j -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -class EnterpriseUserInfoDAOTest extends AbstractJUnit4SpringContextTests { - - @Autowired - EnterpriseUserDAO enterpriseUserDAO; - - @Test - void testGetFeishuUserId() { - Map feishuUserIdsByUserIds = enterpriseUserDAO.getFeishuUserIdsByUserIds(Arrays.asList("ou_473e7063755c39b932028ec64914b500", "ou_72c0cf5fd9c50f05d7e1208449446a00")); - log.info(feishuUserIdsByUserIds.toString()); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java deleted file mode 100644 index 9ca4de9dc..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.cool.store.service; - -import cn.hutool.core.util.RandomUtil; -import com.cool.store.enums.FeiShuNoticeMsgEnum; -import com.cool.store.enums.SMSMsgEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.http.EventCenterHttpRequest; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import javax.annotation.Resource; -import java.util.Arrays; - -/** - * @author Fun Li 2023/10/24 10:48 - * @version 1.0 - */ -@Slf4j -//SpringBootTest 默认不启动 web 环境，会导致 websocket 发现 web 容器不可用而报错，所以需要指定 web 环境 -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -class EventRequestTest extends AbstractJUnit4SpringContextTests { - - @Resource - private EventCenterHttpRequest eventCenterHttpRequest; - - @Test - void test() { - log.info("test"); - } - - @Test - void testSendFeiShuNotice() throws ApiException { - //招商企业 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.common_notice, Arrays.asList("34f4a9ga"), "测试"); - //任务中枢企业 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER, Arrays.asList("661c6cfg"), "2023-07-24 10:09:04", "测试", "10088911"); - } - - @Test - void testFeishuNotice() throws ApiException { - String userId = "34f4a9ga"; - //1. 工作台通知 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.common_notice, Arrays.asList(userId), "测试"); - //2. 分配招商经理 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.ALLOCATION_INVESTMENT_MANAGER, Arrays.asList(userId), "2011-12-11 11:11:11", "测试", "1008631"); - //3. 转让招商经理 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER, Arrays.asList(userId), "2012-11-11 11:11:11", "测试", "1108611"); - //4. 收到新线索 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.BATCH_TRANS_INVESTMENT_MANAGER, Arrays.asList(userId), "1", "2023-01-24 16:41:07"); - //5. 加盟意向申请 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTENTION_APPLY, Arrays.asList(userId), "测试", "1007611", "2023-09-24 16:42:07"); - //6. 线索跟进任务 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.FOLLOW_TASK, Arrays.asList(userId), "测试线索跟进任务"); - //7. 面试预约申请 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, Arrays.asList(userId), "测试", "1108611", "2023-10-24 16:43:07"); - //8. 会销协作通知 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.EXHIBITION_COLLABORATOR, Arrays.asList(userId), "68", "老大", "会销", "2023-12-31", "系东方大酒店"); - //9. 线索报名会销 - eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.PARTNER_SIGNUP_EXHIBITION, Arrays.asList(userId), "237409", "3eb15ac62c1949ef9b17522386b532d7", "线索客户", "1008611", "2023-10-24", "会销", "蜀山"); - } - - @Test - void testSMSNotice() throws ApiException { - String testPhone = "17612868414"; - String testDate = "2023-11-05 10:00:00"; - String randomStr = RandomUtil.randomString(12); - String wxUrlPrefix = "https://wxaurl.cn/"; - String testWXUrl = wxUrlPrefix + randomStr; - //1. 意向申请通过 - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTENTION_APPLY_PASS, testDate, testWXUrl); - //2. 预约面试通过通知 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_APPOINTMENT_PASS, testDate, testWXUrl); - //3. 面试通过通知 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_PASS, testWXUrl); - //4. 面试开始前一天 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_BEGIN_IN_DAY, "10", testDate, testWXUrl); - //5. 面试开始前30分钟 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_BEGIN_IN_MINUTES, testWXUrl); - //6. 短信邀约 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.SMS_INVATE, testWXUrl); - //7. 展会信息变更 - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_INFO_UPDATE, "测试", "2023-12-24", "1008611", testWXUrl); - //8. 展会结束 - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, ""); - randomStr = RandomUtil.randomString(12); - testWXUrl = wxUrlPrefix + randomStr; - //8. 面试未通过结束 - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, "不太行", testWXUrl); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/ExhibitionServiceTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/ExhibitionServiceTest.java deleted file mode 100644 index fe29c1237..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/ExhibitionServiceTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cool.store.service; - -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import java.util.Date; - -/** - * @author Fun Li 2023/12/6 16:17 - * @version 1.0 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Slf4j -class ExhibitionServiceTest extends AbstractJUnit4SpringContextTests { - - @Autowired - private ExhibitionService exhibitionService; - - @Test - void testStartExhibitionInterview() { - log.debug(""); - } - - @Test - void testAutoCloseExhibition() { - int i = exhibitionService.autoCloseExhibition(new Date()); - log.info(i + ""); - } - - @Test - void testSendSMSToExhibitionApplicants() { - exhibitionService.sendSMSToExhibitionApplicants(); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java deleted file mode 100644 index d564416b0..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/HyPartnerInterviewTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cool.store.service; - -import cn.hutool.core.date.DateUtil; -import com.cool.store.context.CurrentUserHolder; -import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.HyInterviewDAO; -import com.cool.store.dto.log.AutoOpenInterviewRoomDTO; -import com.cool.store.enums.OperateTypeEnum; -import com.cool.store.enums.RoomStatus; -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.mapper.HyPartnerInterviewPlanMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; -import com.cool.store.request.GetTipsInfoReq; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Fun Li 2023/12/12 18:07 - * @version 1.0 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Slf4j -class HyPartnerInterviewTest extends AbstractJUnit4SpringContextTests { - - @Autowired - private HyPartnerInterviewPlanService hyPartnerInterviewPlanService; - - @Autowired - private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; - - @Autowired - private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; - - @Autowired - private HyInterviewDAO interviewDAO; - - @Autowired - private LogService logService; - - @Autowired - private CommonService commonService; - - @Test - void testOpenInterviewRoom() throws ApiException { - //更新房间状态为开启 - List lineIds = Arrays.asList(38711L); - hyPartnerInterviewPlanMapper.openInterviewRoom(lineIds, RoomStatus.OPEN.getCode()); - interviewDAO.batchUpdateInterviewWorkflowStatus(lineIds,Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode())); - - //记录日志 - LoginUserInfo user = CurrentUserHolder.getUser(); - AutoOpenInterviewRoomDTO autoOpenInterviewRoomLog = AutoOpenInterviewRoomDTO.builder() - .operateTime(DateUtil.now()).build(); - for (Long lineId : lineIds) { - logService.recordBizLog(user, lineId, OperateTypeEnum.AUTO_OPEN_INTERVIEW, autoOpenInterviewRoomLog); - } - - GetTipsInfoReq getTipsInfoReq = new GetTipsInfoReq(); - getTipsInfoReq.setPartnerLineId(lineIds.get(0).toString()); - String tipsInfo = commonService.getTipsInfo(getTipsInfoReq); - log.info("tipsInfo:{}", tipsInfo); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/TestJobs.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/TestJobs.java deleted file mode 100644 index a323bab32..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/TestJobs.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cool.store.service; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -/** - * @author Fun Li 2023/10/25 14:03 - * @version 1.0 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class TestJobs extends AbstractJUnit4SpringContextTests { - - @Autowired - private EnterpriseSyncService enterpriseSyncService; - - @Test - public void testSyncOrganization() { - enterpriseSyncService.syncAll(); - } - -} diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/TestMDM.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/TestMDM.java deleted file mode 100644 index 13ee108e8..000000000 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/TestMDM.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cool.store.service; - -import com.cool.store.exception.ApiException; -import com.cool.store.http.MDMHttpRequest; -import com.cool.store.response.mdm.BusinessRegion; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - -import java.util.List; - -/** - * @author Fun Li 2023/10/26 11:24 - * @version 1.0 - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@Slf4j -class TestMDM extends AbstractJUnit4SpringContextTests { - - @Autowired - MDMHttpRequest mdmHttpRequest; - - @Autowired - MDMAreaService mdmAreaService; - - @Test - void testGetBusinessRegion() throws ApiException { - List businessRegion = mdmAreaService.getBusinessRegion(); - mdmAreaService.getBelongRegion(); - mdmHttpRequest.getDictList(); - log.info(businessRegion.toString()); - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java index e90e46e12..6f355c98a 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -6,12 +6,10 @@ import com.cool.store.constants.CommonConstants; import com.cool.store.context.PartnerUserHolder; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.response.ResponseResult; -import com.cool.store.service.WechatMiniAppService; import com.cool.store.utils.AESDecryptor; import com.cool.store.utils.Md5Utils; import com.cool.store.utils.Sha1Utils; import com.cool.store.utils.UUIDUtils; -import com.cool.store.vo.PartnerUserInfoVO; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; @@ -38,8 +36,8 @@ import java.util.List; @Slf4j public class SignValidateFilter implements Filter { - @Resource - private WechatMiniAppService wechatMiniAppService; +// @Resource +// private WechatMiniAppService wechatMiniAppService; @Value("${signKey}") private String signKey; @@ -77,57 +75,57 @@ public class SignValidateFilter implements Filter { @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); - HttpServletResponse response = (HttpServletResponse) servletResponse; - HttpServletRequest request = (HttpServletRequest) servletRequest; - CustomHttpServletRequestWrapper wrapper = (CustomHttpServletRequestWrapper) request; - String uri = request.getRequestURI(); - String method = request.getMethod(); - String userStr = ""; - boolean isInWhiteList = excludePath(uri); - log.info("url:{}", uri); - if ( !isInWhiteList && !method.equals("OPTIONS")) { - String params = ""; - if("GET".equalsIgnoreCase(method)){ - params = request.getQueryString(); - }else if("POST".equalsIgnoreCase(method)){ - params = wrapper.getBody(); - } - log.info("params:{}", params); - String sign = request.getHeader("SIGN"); - String nonce = request.getHeader("NONCE"); - String timestamp = request.getHeader("TIMESTAMP"); - String aesPhone = request.getHeader("PHONE"); - String openid = request.getHeader("OPENID"); - log.info("aesPhone:{}, signKey:{}", aesPhone, signKey); - String phone = AESDecryptor.decrypt(aesPhone, signKey); - String plaintextOpenid = AESDecryptor.decrypt(openid, signKey); - String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid)); - log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}", - sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid); - String signStr = timestamp + nonce + params + signKey + md5Value; - String newSign = Sha1Utils.getSha1(signStr.getBytes()); - log.info("signStr: {}, newSign: {}", signStr, newSign); - // 前后端验签不等 - if (!newSign.equals(sign)) { - response.setStatus(HttpStatus.OK.value()); - response.setContentType("application/json;charset=UTF-8"); - response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL))); - return; - } - PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); - if(partnerUserInfoVO != null){ - userStr = JSONObject.toJSONString(partnerUserInfoVO); - log.info("url:{}, userStr:{}", uri, userStr); - } - } - try { - PartnerUserHolder.setUser(userStr); - filterChain.doFilter(servletRequest, servletResponse); - } finally { - PartnerUserHolder.removeUser(); - MDC.clear(); - } +// MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID()); +// HttpServletResponse response = (HttpServletResponse) servletResponse; +// HttpServletRequest request = (HttpServletRequest) servletRequest; +// CustomHttpServletRequestWrapper wrapper = (CustomHttpServletRequestWrapper) request; +// String uri = request.getRequestURI(); +// String method = request.getMethod(); +// String userStr = ""; +// boolean isInWhiteList = excludePath(uri); +// log.info("url:{}", uri); +// if ( !isInWhiteList && !method.equals("OPTIONS")) { +// String params = ""; +// if("GET".equalsIgnoreCase(method)){ +// params = request.getQueryString(); +// }else if("POST".equalsIgnoreCase(method)){ +// params = wrapper.getBody(); +// } +// log.info("params:{}", params); +// String sign = request.getHeader("SIGN"); +// String nonce = request.getHeader("NONCE"); +// String timestamp = request.getHeader("TIMESTAMP"); +// String aesPhone = request.getHeader("PHONE"); +// String openid = request.getHeader("OPENID"); +// log.info("aesPhone:{}, signKey:{}", aesPhone, signKey); +// String phone = AESDecryptor.decrypt(aesPhone, signKey); +// String plaintextOpenid = AESDecryptor.decrypt(openid, signKey); +// String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid)); +// log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}", +// sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid); +// String signStr = timestamp + nonce + params + signKey + md5Value; +// String newSign = Sha1Utils.getSha1(signStr.getBytes()); +// log.info("signStr: {}, newSign: {}", signStr, newSign); +// // 前后端验签不等 +// if (!newSign.equals(sign)) { +// response.setStatus(HttpStatus.OK.value()); +// response.setContentType("application/json;charset=UTF-8"); +// response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL))); +// return; +// } +// PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); +// if(partnerUserInfoVO != null){ +// userStr = JSONObject.toJSONString(partnerUserInfoVO); +// log.info("url:{}, userStr:{}", uri, userStr); +// } +// } +// try { +// PartnerUserHolder.setUser(userStr); +// filterChain.doFilter(servletRequest, servletResponse); +// } finally { +// PartnerUserHolder.removeUser(); +// MDC.clear(); +// } } @Override diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java deleted file mode 100644 index 77e9cd611..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.content.ContentQueryDetailDto; -import com.cool.store.dto.content.ContentQueryListDto; -import com.cool.store.entity.HyContentInfoDO; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.ContentService; -import com.cool.store.vo.HyContentInfoVO; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("news") -@Api(tags = "动态") -@Slf4j -public class ContentController { - - @Autowired - private ContentService contentService; - - @PostMapping("/queryContentList") - @ApiOperation("查询动态列表") - public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = contentService.queryContentListToC(dto); - PageInfo page = new PageInfo<>(list); - return ResponseResult.success(page); - } - - @PostMapping("/detail") - @ApiOperation("动态详情") - public ResponseResult queryContentInfo(@RequestBody ContentQueryDetailDto dto) { - return ResponseResult.success(contentService.queryContentInfo(dto.getContentId())); - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java deleted file mode 100644 index 931f6d064..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.LoginUserInfo; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dto.exhibition.SignUpExhibitionDTO; -import com.cool.store.exception.ApiException; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.ExhibitionService; -import com.cool.store.vo.PartnerUserInfoVO; -import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; -import com.cool.store.vo.exhibition.PartnerExhibitionListVO; -import com.cool.store.vo.exhibition.SignUpExhibitionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/12/12 18:00 - * @Version 1.0 - */ -@RestController -@RequestMapping("exhibition") -@Api(tags = "会销") -@Slf4j -public class ExhibitionController { - - @Resource - ExhibitionService exhibitionService; - - @ApiOperation("报名会销") - @PostMapping("/signUpExhibition") - public ResponseResult signUpExhibition(@RequestBody SignUpExhibitionDTO dto) throws ApiException { - return ResponseResult.success(exhibitionService.signUpExhibition(dto,new LoginUserInfo())); - } - - @GetMapping(value = "/getExhibitionList") - @ApiOperation("会销组详情") - public ResponseResult getExhibitionGroupDetail(@RequestParam(required = false,value = "exhibitionGroupId") Integer exhibitionGroupId) { - return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId,Boolean.FALSE,Boolean.TRUE)); - } - - @GetMapping(value = "/getPartnerExhibitionList") - @ApiOperation("线索参加的会销列表") - public ResponseResult> getPartnerExhibitionList() { - PartnerUserInfoVO user = PartnerUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getPartnerExhibitionList(user.getPartnerLineId())); - } - - @GetMapping("/getExhibitionInfo") - @ApiOperation("线索参加的会销详情") - public ResponseResult getExhibitionInfo(@RequestParam(required = true, value = "exhibitionGroupId") Integer exhibitionGroupId) { - PartnerUserInfoVO user = PartnerUserHolder.getUser(); - PartnerExhibitionInfoVO exhibitionInfo = exhibitionService.getExhibitionInfo(exhibitionGroupId, user.getPartnerLineId()); - if (exhibitionInfo != null) { - exhibitionInfo.setParticipantName(user.getUsername()); - } - return ResponseResult.success(exhibitionInfo); - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/FeiShuController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/FeiShuController.java deleted file mode 100644 index 5184a8154..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/FeiShuController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.exception.ApiException; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.FeiShuService; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: young.yu - * @Date: 2023-06-16 13:06 - * @Description: - * @deprecated {@link InterviewController} - */ -@Api(tags = "飞书相关接口") -@RestController -@RequestMapping({"/feishu"}) -@Deprecated -public class FeiShuController { - - /** - * @deprecated {@link InterviewController#getFreeBusyList(GetFreeBusyListReq)} - */ - @Autowired - private FeiShuService feiShuService; - @PostMapping("/interviewer/freebusy/list") - @ApiOperation("查询日程忙闲信息") - @Deprecated - public ResponseResult getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException { - GetFreeBusyListVO getFreeBusyListVO= feiShuService.getFreeBusyList(request); - return ResponseResult.success(getFreeBusyListVO); - } -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java deleted file mode 100644 index d1c106123..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.dto.partner.EnterInterviewDto; -import com.cool.store.dto.partner.LineQueryInterviewDto; -import com.cool.store.dto.partner.PartnerGetPassLetterDetailDto; -import com.cool.store.exception.ApiException; -import com.cool.store.request.CreateAppointmentReq; -import com.cool.store.request.GetFreeBusyListReq; -import com.cool.store.request.ModifyInterviewTimeReq; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.InterviewService; -import com.cool.store.service.PartnerInterviewService; -import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.PartnerInterviewInfoVO; -import com.cool.store.vo.PartnerPassLetterDetailVO; -import com.cool.store.vo.interview.CreateAppointmentVO; -import com.cool.store.vo.interview.GetFreeBusyListVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@Api(tags = "加盟商资格面试") -@RestController -@RequestMapping("/interview") -@CrossOrigin -public class InterviewController { - - @Autowired - private PartnerInterviewService interviewService; - - @Autowired - private InterviewService interviewBaseService; - - - @PostMapping("/freebusy/list") - @ApiOperation("查询各预约时间段情况") - public ResponseResult getFreeBusyList(@RequestBody GetFreeBusyListReq request) throws ApiException { - GetFreeBusyListVO getFreeBusyListVO= interviewService.getFreeBusyList(request); - return ResponseResult.success(getFreeBusyListVO); - } - - @PostMapping("/queryByPartnerLineId") - @ApiOperation("根据线索id查询面试信息") - public ResponseResult queryByPartnerLineId(@RequestBody LineQueryInterviewDto dto) throws ApiException { - return ResponseResult.success(interviewService.queryByPartnerLineId(dto)); - } - - - @PostMapping("/enter") - @ApiOperation("进入面试间") - public ResponseResult enterInterviewRoom(@RequestBody EnterInterviewDto dto) throws ApiException { - return ResponseResult.success(interviewService.enterInterviewRoom(dto)); - } - - @PostMapping("/passLetter/detail") - @ApiOperation("通过函详情") - public ResponseResult passLetterDetail(@RequestBody PartnerGetPassLetterDetailDto dto) throws ApiException { - return ResponseResult.success(interviewService.passLetterDetail(dto.getInterviewPlanId())); - } - - @PostMapping("/appointment/submit") - @ApiOperation("预约面试") - public ResponseResult createAppointment(@RequestBody CreateAppointmentReq request) throws ApiException { - return ResponseResult.success(interviewService.createAppointment(request)); - } - - @PostMapping("/modifyInterviewTime") - @ApiOperation("修改面试时间") - public ResponseResult modifyInterviewTime(@RequestBody ModifyInterviewTimeReq request) throws ApiException { - interviewService.modifyInterviewTime(request); - return ResponseResult.success(); - } - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java deleted file mode 100644 index 7a8caa82f..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.dto.wx.MiniProgramLoginDTO; -import com.cool.store.request.MobileUpdateRequest; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.WechatMiniAppService; -import com.cool.store.vo.PartnerUserInfoVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -/** - * @author zhangchenbiao - * @FileName: MiniProgramAppController - * @Description: - * @date 2023-05-29 14:28 - */ - -@Api(tags = "微信小程序app接口") -@RestController -@RequestMapping({"/v1/partnerManage/miniProgram" }) -public class MiniProgramAppController { - - @Resource - private WechatMiniAppService wechatMiniAppService; - - @ApiOperation("小程序登录") - @PostMapping("/login") - public ResponseResult login(@RequestBody @Valid MiniProgramLoginDTO param) { - PartnerUserInfoVO userInfoVO = wechatMiniAppService.miniProgramLogin(param); - return ResponseResult.success(userInfoVO); - } - - @ApiOperation("获取手机号") - @GetMapping("/getUserPhoneNumber") - public ResponseResult getUserPhoneNumber(@RequestParam(value = "mobileCode",required = true)String mobileCode) { - return ResponseResult.success(wechatMiniAppService.getUserPhoneNumber(mobileCode)); - } - - @ApiOperation("更新手机号") - @PostMapping("/updateUserPhoneNumber") - public ResponseResult updateUserPhoneNumber(@RequestBody @Valid MobileUpdateRequest request) { - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(wechatMiniAppService.updateUserPhoneNumber(request, userInfoVO)); - } - - @ApiOperation("根据mobile和openId获取用户信息") - @GetMapping("/getUserInfo") - public ResponseResult getUserInfo(){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(userInfoVO); - } -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java deleted file mode 100644 index cd2b641af..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.response.ResponseResult; -import com.cool.store.service.OpenAreaService; -import com.cool.store.vo.OpenAreaTreeVO; -import com.cool.store.vo.OpenAreaVO; -import com.cool.store.vo.OpenProvinceVO; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/29 14:19 - * @Version 1.0 - */ -@RestController -@RequestMapping({"/v1/partnerManage/openArea" }) -@Slf4j -@Api(tags = "小程序开发区域城市") -public class OpenAreaController { - - - @Resource - OpenAreaService openAreaService; - - - @GetMapping(path = "/getOpenAreaList") - @ApiOperation("点击重点城市/可申请加盟省份/可预约加盟省份 子列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "parentId", value = "父区域ID", required = false), - @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false) - }) - public ResponseResult> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId, - @RequestParam(value = "type",required = false)String type){ - - return ResponseResult.success(openAreaService.getChildrenList(type,parentId)); - } - - - @GetMapping(path = "/areaApplyQuery") - @ApiOperation("区域申请搜索 树形结构") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false), - @ApiImplicitParam(name = "applyFlag", value = "可申请标识", required = false) - }) - public ResponseResult> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword, - @RequestParam(value = "applyFlag",required = false)Boolean applyFlag){ - List openAreaTreeVOS = openAreaService.searchOpenArea(keyword,applyFlag,Boolean.FALSE); - return ResponseResult.success(openAreaTreeVOS); - } - - - @GetMapping(path = "/getKeyOpenAreaList") - @ApiOperation("重点开放城市列表)") - public ResponseResult> getOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ - PageInfo openAreaVOPageInfo = openAreaService.queryKeyOpenAreaList(pageSize, pageNumber); - return ResponseResult.success(openAreaVOPageInfo); - } - - - - @GetMapping(path = "/getOpenProvince") - @ApiOperation("可申请加盟省份/可预约加盟省份") - public ResponseResult getOpenProvince(){ - return ResponseResult.success(openAreaService.getOpenProvince()); - } - - - - - - -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java deleted file mode 100644 index 675f79c72..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.cool.store.controller; - -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.common.utils.BinaryUtil; -import com.aliyun.oss.model.MatchMode; -import com.aliyun.oss.model.PolicyConditions; -import com.cool.store.response.ResponseResult; -import com.cool.store.vo.oss.OssUploadConfigVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.sql.Date; -import java.util.Objects; - -/** - * @author zhangchenbiao - * @FileName: OssClientController - * @Description: - * @date 2023-06-01 11:25 - */ -@RestController -@RequestMapping({"/oss"}) -@Slf4j -public class OssClientController { - - @Value("${oss.accessKeyId:null}") - private String accessKeyId; - @Value("${oss.accessKeySecret:null}") - private String accessKeySecret; - @Value("${oss.endpoint:null}") - private String endpoint; - @Value("${oss.bucket:null}") - private String bucket; - @Value("${cdn.url:null}") - private String cdnUrl; - @Value("${oss.file.dir:null}") - private String dir; - - @GetMapping("/getUploadFileConfig") - public ResponseResult getUploadFileConfig(){ - // host的格式为 bucketname.endpoint - String host = "https://" + bucket + "." + endpoint; - - OSS client = null; - try { - client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - long expireTime = 300; - long expireEndTime = System.currentTimeMillis() + expireTime * 1000; - Date expiration = new Date(expireEndTime); - PolicyConditions policyConds = new PolicyConditions(); - policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000); - policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir); - String postPolicy = client.generatePostPolicy(expiration, policyConds); - byte[] binaryData = postPolicy.getBytes("utf-8"); - String encodedPolicy = BinaryUtil.toBase64String(binaryData); - String signature = client.calculatePostSignature(postPolicy); - OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl); - return ResponseResult.success(result); - }catch (Exception e){ - log.info("exception", e); - }finally { - if(Objects.nonNull(client)){ - client.shutdown(); - } - } - return ResponseResult.success(); - } -} diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java deleted file mode 100644 index c5c89c763..000000000 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.cool.store.controller; - -import com.cool.store.constants.RedisConstant; -import com.cool.store.context.PartnerUserHolder; -import com.cool.store.entity.HyPartnerBaseInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.IDCardSideEnum; -import com.cool.store.enums.WorkflowStatusEnum; -import com.cool.store.exception.ApiException; -import com.cool.store.exception.ServiceException; -import com.cool.store.request.*; -import com.cool.store.response.ResponseResult; -import com.cool.store.service.*; -import com.cool.store.utils.RedisUtilPool; -import com.cool.store.vo.*; -import com.cool.store.vo.cuser.IdentityCardInfoVO; -import com.cool.store.vo.partner.PartnerUserBaseVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.text.MessageFormat; -import java.util.List; - -/** - * @Author suzhuhong - * @Date 2023/5/29 20:04 - * @Version 1.0 - */ -@RestController -@RequestMapping({"/v1/partnerManage/partner" }) -@Slf4j -@Api(tags = "加盟商信息") -public class PartnerController { - - @Resource - private PartnerUserInfoService partnerUserInfoService; - @Resource - private HyPartnerIntentInfoService hyPartnerIntentInfoService; - @Resource - private AliyunService aliyunService; - @Resource - private HyPartnerBaseInfoService hyPartnerBaseInfoService; - @Resource - private HyPartnerClerkService hyPartnerClerkService; - @Resource - private HyPartnerLineInfoService hyPartnerLineInfoService; - @Resource - private RedisUtilPool redisUtilPool; - - @PostMapping(path = "/applyBaseInfo") - @ApiOperation("提交加盟商基本信息") - public ResponseResult applyBaseInfo(@RequestBody PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException { - return ResponseResult.success(partnerUserInfoService.updatePartnerUserInfo(partnerUserInfoRequest)); - } - - @GetMapping(path = "/getSubmitIntentionApplyFlag") - @ApiOperation("获取提交意向申请标识 true 已提交 false 未提交") - public ResponseResult getSubmitIntentionApplyFlag(){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - PartnerBaseInfoVO partnerBaseInfoVO = hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), userInfoVO.getPartnerLineId()); - Boolean submitFlag = false; - if(partnerBaseInfoVO.getStatus() != null){ - submitFlag = partnerBaseInfoVO.getStatus() > Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()); - } - return ResponseResult.success(submitFlag); - } - - - @GetMapping(path = "/getLineByIdCard") - @ApiOperation("通过身份证号码查询线索") - @ApiImplicitParams({ - @ApiImplicitParam(name = "idCard", value = "身份证号码", required = false), - }) - public ResponseResult getByIdCard(@RequestParam(value = "idCard",required = false)String idCard){ - - HyPartnerBaseInfoDO baseInfoDO = hyPartnerBaseInfoService.getByIdCard(idCard); - return ResponseResult.success(baseInfoDO != null && baseInfoDO.getPartnerLineId() > 0L); - } - - - @GetMapping(path = "/changeBinding") - @ApiOperation("换绑微信") - @ApiImplicitParams({ - @ApiImplicitParam(name = "idCard", value = "身份证号码", required = false), - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult changeBinding(@RequestParam(value = "idCard",required = false)String idCard, - @RequestParam(value = "lineId",required = false)Long lineId){ - PartnerUserInfoVO currentUser = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerBaseInfoService.changeBinding(idCard, lineId, currentUser)); - } - - - @PostMapping(path = "/submitPartnerBaseInfo") - @ApiOperation("提交意向书基本信息") - public ResponseResult submitPartnerBaseInfo(@RequestBody PartnerBaseInfoRequest baseInfoRequest){ - //前提 未提交加盟申请 - //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 - PartnerUserInfoVO currentUser = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerBaseInfoService.submitPartnerBaseInfo(baseInfoRequest, currentUser)); - } - - @PostMapping(path = "/submitPartnerClerkInfo") - @ApiOperation("提交意向书店员信息") - public ResponseResult submitPartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ - - return ResponseResult.success(hyPartnerClerkService.submitPartnerClerkInfo(partnerClerkInfoRequest)); - } - - @PostMapping(path = "/submitPartnerIntentInfo") - @ApiOperation("提意向书意向信息/行业认知") - public ResponseResult submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest) throws ApiException { - return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest)); - } - - @PostMapping(path = "/submitWantShopInfo") - @ApiOperation("提意向书意向信息") - public ResponseResult submitWantShopInfo(@RequestBody PartnerWantShopInfoRequest request){ - return ResponseResult.success(hyPartnerIntentInfoService.submitWantShopInfo(request)); - } - - @PostMapping(path = "/submitIndustryCognitionInfo") - @ApiOperation("提意向书行业认知") - public ResponseResult submitIndustryCognitionInfo(@RequestBody IndustryCognitionInfoRequest request){ - return ResponseResult.success(hyPartnerIntentInfoService.submitIndustryCognitionInfo(request)); - } - - @PostMapping(path = "/changePartnerClerkInfo") - @ApiOperation("修改意向书店员信息") - public ResponseResult changePartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){ - return ResponseResult.success(hyPartnerClerkService.submitPartnerClerkInfo(partnerClerkInfoRequest)); - } - - @PostMapping(path = "/changePartnerIntentInfo") - @ApiOperation("修改意向书意向信息/行业认知") - public ResponseResult changePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest) throws ApiException { - - return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest)); - } - - @GetMapping(path = "/getPartnerLineBaseInfo") - @ApiOperation("查询加盟商线索详情(适用全部流程) 包括冷静期是否首次登录") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "C端用户基本信息ID", required = false), - }) - public ResponseResult getPartnerLinBaseInfo(@RequestParam(value = "partnerId",required = false)String partnerId){ - return ResponseResult.success(hyPartnerLineInfoService.getPartnerLinBaseInfo(partnerId)); - } - - @PostMapping(path = "/delCoolDownFirstLoginFlag") - @ApiOperation("删除冷静期是否首次登录缓存") - public ResponseResult delCoolDownFirstLoginFlag(@RequestBody CoolDownFirstLoginFlagDelRequest coolDownFirstLoginFlagDelRequest){ - String coolingPeriodFirstLoginCacheKey = MessageFormat.format(RedisConstant.COOLINGPERIOD_FIRSTLOGIN_KEY, coolDownFirstLoginFlagDelRequest.getLineId()); - redisUtilPool.delKey(coolingPeriodFirstLoginCacheKey); - return ResponseResult.success(true); - } - - - - @GetMapping(path = "/queryPartnerBaseInfo") - @ApiOperation("查看意向申请书——基本信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryPartnerBaseInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), lineId)); - } - - - @GetMapping(path = "/queryPartnerClerkInfo") - @ApiOperation("查看意向申请书-店员信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult> queryPartnerClerkInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerClerkService.queryPartnerClerkInfo(userInfoVO.getPartnerId(), lineId)); - } - - @GetMapping(path = "/queryPartnerIntentInfo") - @ApiOperation("查看意向申请书-意向信息/行业信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerIntentInfoService.queryPartnerIntentInfo(userInfoVO, lineId)); - } - - @GetMapping(path = "/queryWantShopInfo") - @ApiOperation("查看意向申请书-意向信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryWantShopInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerIntentInfoService.queryWantShopInfo(userInfoVO, lineId)); - } - - @GetMapping(path = "/queryIndustryCognitionInfo") - @ApiOperation("查看意向申请书-行业信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryIndustryCognitionInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); - return ResponseResult.success(hyPartnerIntentInfoService.queryIndustryCognitionInfo(userInfoVO, lineId)); - } - - @GetMapping(path = "/completeJoinNotice") - @ApiOperation("提交加盟须知") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false), - }) - public ResponseResult completeJoinNotice(@RequestParam(value = "partnerId",required = false)String partnerId){ - return ResponseResult.success(partnerUserInfoService.completeJoinNotice(partnerId)); - } - - - @GetMapping(path = "/queryJoinNotice") - @ApiOperation("查询是否填写加盟须知") - @ApiImplicitParams({ - @ApiImplicitParam(name = "partnerId", value = "加盟商ID", required = false), - }) - public ResponseResult queryJoinNotice(@RequestParam(value = "partnerId",required = false)String partnerId){ - return ResponseResult.success(partnerUserInfoService.queryJoinNotice(partnerId)); - } - - @GetMapping(path = "/checkGenerateNewLineId") - @ApiOperation("提交意向申请书之前——判断是否生成新线索") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult checkGenerateNewLineId(@RequestParam(value = "lineId",required = false)Long lineId) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.checkGenerateNewLineId(lineId)); - } - - - @GetMapping(path = "/getIdentityCardInfo") - @ApiOperation("根据身份证正面解析获取数据") - public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl, @RequestParam("side")IDCardSideEnum sideEnum){ - try { - IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, sideEnum); - return ResponseResult.success(identityCardInfo); - } catch (Exception e) { - throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL); - } - } - - @GetMapping(path = "/getPartnerInfo") - @ApiOperation("线索基本信息") - public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile, - @RequestParam(value = "exhibitionGroupId" )Integer exhibitionGroupId){ - return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,null,exhibitionGroupId)); - } - -} diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties index 04a4e67af..5569b2dd5 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties @@ -1,4 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202 -spring.cloud.nacos.config.server-addr=192.168.1.202 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties -spring.cloud.nacos.config.namespace=80efeafb-563c-4acf-a6dd-23c3ed2b849a \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties index a17d74480..35c720a74 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,11 @@ -spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +#spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +#spring.cloud.nacos.config.server-addr=120.92.151.10:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties -spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file