From d1f0e4748e554be979cf97a31ab104bc461799ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 20 Jun 2023 11:47:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BF=99=E9=97=B2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../mapper/HyPartnerInterviewMapper.java | 2 +- .../mapper/HyPartnerInterviewMapper.xml | 126 +++++++++--------- .../store/request/GetFreeBusyListReq.java | 6 +- .../store/service/impl/FeiShuServiceImpl.java | 18 ++- .../service/impl/InterviewServiceImpl.java | 13 +- 6 files changed, 91 insertions(+), 76 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 535d2f7ea..e227d8ecc 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -61,7 +61,7 @@ public enum ErrorCodeEnum { INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null), DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null), INTERVIEW_NOT_EXIST(1021103, "面试信息不存在！", null), - INTERVIEW_AND_PARTNER_ID_IS_NULL(1021104, "加盟商用户ID和面试官ID不能同时为空！", null), + INTERVIEW_AND_PARTNER_ID_IS_NULL(1021104, "加盟商用户ID&线索ID和面试官ID不能同时为空！", null), INTERVIEW_PLAN_IS_NULL(1021105, "未查询到相关面试安排！", null), DATE_PARAMS_IS_ERROR(1021106, "日期参数错误！", null), INTERVIEW_PLAN_NOT_EXIST(1021107, "面试计划不存在！", null), 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 index 5b60798b3..ef22c78aa 100644 --- 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 @@ -18,7 +18,7 @@ public interface HyPartnerInterviewMapper { * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null * dateTime:2023-06-09 05:51 */ - int insertSelective(HyPartnerInterviewDO record); + int insertSelective(@Param("record") HyPartnerInterviewDO record); /** * diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 584bebc81..7d0e1fd1b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -54,133 +54,133 @@ 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_file_url, - + expiry_date, - + latest_log_message, - + pass_reason, - + certify_file, - + create_time, - + update_time, - + approve_time, - + partner_enter_time, - + interviewer_enter_time, - - #{status}, + + #{record.status}, - - #{partnerLineId}, + + #{record.partnerLineId}, - - #{interviewPlanId}, + + #{record.interviewPlanId}, - - #{partnerId}, + + #{record.partnerId}, - - #{deadline}, + + #{record.deadline}, - - #{interviewer}, + + #{record.interviewer}, - - #{recorder}, + + #{record.recorder}, - - #{processInfo}, + + #{record.processInfo}, - - #{recordTime}, + + #{record.recordTime}, - - #{summary}, + + #{record.summary}, - - #{authCode}, + + #{record.authCode}, - - #{passFileUrl}, + + #{record.passFileUrl}, - - #{expiryDate}, + + #{record.expiryDate}, - - #{latestLogMessage}, + + #{record.latestLogMessage}, - - #{passReason}, + + #{record.passReason}, - - #{certifyFile}, + + #{record.certifyFile}, - - #{createTime}, + + #{record.createTime}, - - #{updateTime}, + + #{record.updateTime}, - - #{approveTime}, + + #{record.approveTime}, - - #{partnerEnterTime}, + + #{record.partnerEnterTime}, - - #{interviewerEnterTime}, + + #{record.interviewerEnterTime}, 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 index c1245ea8a..32e13925e 100644 --- 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 @@ -16,8 +16,10 @@ public class GetFreeBusyListReq { private String startDate; @ApiModelProperty("结束时间") private String endDate; - @ApiModelProperty("加盟商用户ID") + @ApiModelProperty("线索id(C端使用)") + private String lineId; + @ApiModelProperty("加盟商用户ID（C端使用，与面试官id两个字段中必传一个,该字段传值时，线索id必传）") private String partnerId; - @ApiModelProperty("面试官ID(如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)") + @ApiModelProperty("面试官ID(B端使用,如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)") private String interviewerId; } 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 index 30ef5c972..1a9363f4f 100644 --- 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 @@ -4,11 +4,13 @@ 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.vo.interview.CalendarInfo; @@ -36,6 +38,9 @@ public class FeiShuServiceImpl implements FeiShuService { @Autowired private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper; + @Autowired + private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + @Override public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) throws ApiException { GetFreeBusyListVO freeBusyListVO = new GetFreeBusyListVO(); @@ -43,21 +48,24 @@ public class FeiShuServiceImpl implements FeiShuService { String endDate = request.getEndDate();//结束日期 String partnerId = request.getPartnerId();//加盟商用户ID String interviewerId = request.getInterviewerId();//面试官ID + String lineId = request.getLineId();//线索id //如果加盟商用户ID为空且面试官ID为空，返回错误信息 - if (StringUtils.isEmpty(partnerId) && StringUtils.isEmpty(interviewerId)) { + 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.isEmpty(interviewerId)) { + if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) { //根据加盟商用户ID查询面试官ID HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); hyPartnerInterviewPlanDO.setPartnerId(partnerId); List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - //如果查询结果为空，返回错误信息 + //如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准 if (CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) { - throw new ServiceException(ErrorCodeEnum.INTERVIEW_PLAN_IS_NULL); + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(lineId)); + interviewerId = hyPartnerLineInfoDO.getInvestmentManager(); + }else { + interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer(); } - interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer(); } long startTime = 0L; long endTime = 0L; 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 index 6348b591d..03d894d4b 100644 --- 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 @@ -207,6 +207,7 @@ public class InterviewServiceImpl implements InterviewService { } @Override + @Transactional public CreateAppointmentVO createAppointment(CreateAppointmentReq request) { CreateAppointmentVO vo = new CreateAppointmentVO(); //1.创建面试计划 @@ -226,14 +227,18 @@ public class InterviewServiceImpl implements InterviewService { record.setRoomId(StringUtil.generateRoomId(startBookingTime)); record.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); record.setDeleted(false); - long interviewPlanId = hyPartnerInterviewPlanMapper.insertSelective(record); - vo.setInterviewPlanId(String.valueOf(interviewPlanId)); + hyPartnerInterviewPlanMapper.insertSelective(record); + + HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); + hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); + +// vo.setInterviewPlanId(String.valueOf(interviewPlanId)); //2.创建面试信息 HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO(); - hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); - hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); +// hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId); hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); + hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); hyPartnerInterviewDO.setInterviewer(request.getInterviewerId()); hyPartnerInterviewDO.setCreateTime(new Date()); hyPartnerInterviewDO.setUpdateTime(new Date()); From 34f25bb62d60696f4d98f42fd42330d7a0f1eb00 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 20 Jun 2023 13:43:26 +0800 Subject: [PATCH 2/5] update --- .../com/cool/store/dao/EnterpriseUserDAO.java | 7 ++++ .../store/mapper/EnterpriseUserMapper.java | 6 ++++ .../resources/mapper/EnterpriseUserMapper.xml | 9 ++++++ .../request/IntentAreaSettingRequest.java | 2 +- .../store/vo/EnterpriseUserSingleInfoVO.java | 21 ++++++++++++ .../store/service/EnterpriseUserService.java | 7 ++++ .../impl/EnterpriseUserServiceImpl.java | 32 ++++++++++++------- .../store/service/impl/ZoneServiceImpl.java | 2 +- .../cool/store/controller/TestController.java | 10 ++++++ .../main/resources/application-dev.properties | 2 +- .../main/resources/application-hd.properties | 2 +- .../resources/application-test.properties | 2 +- .../main/resources/application-dev.properties | 2 +- .../resources/application-local.properties | 2 +- 14 files changed, 88 insertions(+), 18 deletions(-) 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 index c2b568388..4b9736dfd 100644 --- 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 @@ -83,4 +83,11 @@ public class EnterpriseUserDAO { } return enterpriseUserMapper.getUserListByDeptLeader(regionId); } + + public List getUserListByDeptLeaders(List regionIds){ + if(CollectionUtils.isEmpty(regionIds)){ + return Lists.newArrayList(); + } + return enterpriseUserMapper.getUserListByDeptLeaders(regionIds); + } } \ 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 index 81a4bd25b..3360d9b63 100644 --- 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 @@ -77,4 +77,10 @@ public interface EnterpriseUserMapper { */ List getUserListByDeptLeader(String regionId); + /** + * 根据开发经理获取用户列表 + * @param regionIds + * @return + */ + List getUserListByDeptLeaders(@Param("regionIds") List regionIds); } \ 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 index 05e6c11b8..95d7dedc8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -288,4 +288,13 @@ + + \ No newline at end of file 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 index 12c80bfce..4009e80c5 100644 --- 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 @@ -22,7 +22,7 @@ public class IntentAreaSettingRequest { @ApiModelProperty("战区名称") private String zoneName; @ApiModelProperty("组织机构ID集合") - private List orgIdList; + private List orgIdList; @ApiModelProperty("开放区域id集合") private List openAreaIdList; } 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 index e08f6e3cd..7c3eb8b56 100644 --- 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 @@ -1,6 +1,12 @@ 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.ArrayList; +import java.util.List; /** * @Author suzhuhong @@ -15,4 +21,19 @@ public class EnterpriseUserSingleInfoVO { private String userName; private String mobile; + + public static List convertVO(List userList){ + if(CollectionUtils.isEmpty(userList)){ + return Lists.newArrayList(); + } + List resultList = new ArrayList<>(); + for (EnterpriseUserDO enterpriseUser : userList) { + EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO(); + result.setUserId(enterpriseUser.getUserId()); + result.setUserName(enterpriseUser.getName()); + result.setMobile(enterpriseUser.getMobile()); + resultList.add(result); + } + return resultList; + } } 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 index 675b05ba2..8d5d0addf 100644 --- 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 @@ -35,4 +35,11 @@ public interface EnterpriseUserService { List getDevelopmentDirectorList(String wantShopArea); + /** + * 根据意向区域获取开发主管 + * @param zoneId + * @return + */ + EnterpriseUserDO getDevelopmentByZoneId(Long zoneId); + } 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 index f30d0cd05..135dcf49a 100644 --- 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 @@ -13,6 +13,7 @@ import com.cool.store.service.ZoneService; import com.cool.store.vo.EnterpriseUserSingleInfoVO; 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.*; @@ -82,15 +83,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { if (CommonConstants.TRANSFER.equals(type)){ enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.TRUE); } - List enterpriseUserSingleInfoVOS = new ArrayList<>(); - enterpriseUserDOS.forEach(x->{ - EnterpriseUserSingleInfoVO enterpriseUserSingleInfoVO = new EnterpriseUserSingleInfoVO(); - enterpriseUserSingleInfoVO.setUserId(x.getUserId()); - enterpriseUserSingleInfoVO.setUserName(x.getName()); - enterpriseUserSingleInfoVO.setMobile(x.getMobile()); - enterpriseUserSingleInfoVOS.add(enterpriseUserSingleInfoVO); - }); - return enterpriseUserSingleInfoVOS; + return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS); } @Override @@ -125,7 +118,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { result.setInvestmentUserIds(userList); } //开发区域 - List developementList = zoneInfoList.stream().filter(o -> "developement".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); + List developementList = zoneInfoList.stream().filter(o -> "dev".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(developementList)){ //获取负责的区域 developementList.retainAll(subRegionIds); @@ -138,6 +131,23 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { @Override public List getDevelopmentDirectorList(String wantShopArea) { - return null; + 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/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java index 42dc570d7..d114200ef 100644 --- 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 @@ -86,7 +86,7 @@ public class ZoneServiceImpl implements ZoneService { hyIntendDevZoneInfoDO.setId(intentAreaSettingRequest.getId()); hyIntendDevZoneInfoDO.setZoneName(intentAreaSettingRequest.getZoneName()); hyIntendDevZoneInfoDO.setUpdateUserId(userId); - hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):""); + hyIntendDevZoneInfoDO.setAssociatedRegionId(CollectionUtils.isNotEmpty(intentAreaSettingRequest.getOrgIdList())?JSONObject.toJSONString(intentAreaSettingRequest.getOrgIdList()):null); hyIntendDevZoneInfoDAO.updateByPrimaryKeySelective(hyIntendDevZoneInfoDO); //添加战区映射的意向区域 hyIntendDevMappingDAO.deleteByOpenAreaIds(intentAreaSettingRequest.getOpenAreaIdList(),intentAreaSettingRequest.getType()); 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 index 81bdfcdbb..62ec2a36c 100644 --- 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 @@ -229,4 +229,14 @@ public class TestController { 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)); + } + } diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index a37f56937..563263bcf 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index 0ca8ebeba..50f132839 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://hdstore-isv.coolcollege.cn +isv.domain = https://hdstore-isv.coolcollege.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index d06b97aa7..d8a746a27 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://tstore-isv.coolcollege.cn +isv.domain = https://tstore-isv.coolcollege.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index 4e69aa17c..295a2a312 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index e7808e80e..059473d6b 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -36,7 +36,7 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 From 33e90cf542ce58be2a491832f36e80395dcd8637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Tue, 20 Jun 2023 14:06:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 1 + .../mapper/HyPartnerInterviewMapper.xml | 18 +++++++++----- .../mapper/HyPartnerInterviewPlanMapper.xml | 7 ++++++ .../entity/HyPartnerInterviewPlanDO.java | 3 +++ .../cool/store/service/InterviewService.java | 2 +- .../service/impl/InterviewServiceImpl.java | 24 +++++++++++++------ .../store/controller/InterviewController.java | 4 ++-- 7 files changed, 43 insertions(+), 16 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index df99ce566..4e8573fe9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -69,6 +69,7 @@ public enum ErrorCodeEnum { CREATE_CALENDAR_EVENT_FAIL(1021109, "创建面试安排失败！", null), FEISHU_UPDATE_SCHEDULE_ERROR(1021110, "修改面试安排失败！", null), INTERVIEW_STATUS_ERROR(1021111, "面试状态错误！", null), + INTERVIEW_PLAN_ALREADY_EXIST(1021112, "面试计划已存在，请勿重复申请！", null), SIGN_FAIL(600000, "验签失败", null), GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null), NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null), diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index c5dd07b03..ef8ff2273 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -14,8 +14,8 @@ - - + + @@ -87,8 +87,11 @@ auth_code, - - pass_file_url, + + pass_pdf_url, + + + pass_image_url, expiry_date, @@ -152,8 +155,11 @@ #{record.authCode}, - - #{record.passFileUrl}, + + #{record.passPdfUrl}, + + + #{record.passImageUrl}, #{record.expiryDate}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 4f8569509..ab58eb601 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -9,6 +9,7 @@ + @@ -74,6 +75,9 @@ update_time, + + application_approved, + @@ -121,6 +125,9 @@ #{record.updateTime}, + + #{record.applicationApproved}, + 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 index 018cff038..3358ec262 100644 --- 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 @@ -66,6 +66,9 @@ public class HyPartnerInterviewPlanDO implements Serializable { @ApiModelProperty("更新时间") private Date updateTime; + @ApiModelProperty("预约是否通过审核：0.未审核1.通过审核") + private Integer applicationApproved; + @ApiModelProperty("飞书日历id") private String feishuCalendarId; 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 index 2d387e950..6e343168e 100644 --- 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 @@ -54,7 +54,7 @@ public interface InterviewService { * @param request * @return */ - CreateAppointmentVO createAppointment(CreateAppointmentReq request); + CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException; /** * 同意面试预约 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 index 03d894d4b..9b12d5b38 100644 --- 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 @@ -28,11 +28,11 @@ import com.cool.store.vo.EnterpriseUserBaseInfoVO; import com.cool.store.vo.interview.CreateAppointmentVO; 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.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.Arrays; @@ -208,7 +208,13 @@ public class InterviewServiceImpl implements InterviewService { @Override @Transactional - public CreateAppointmentVO createAppointment(CreateAppointmentReq request) { + public CreateAppointmentVO createAppointment(CreateAppointmentReq request) throws ApiException { + HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); + hyPartnerInterviewPlanDO.setPartnerLineId(request.getPartnerLineId()); + List hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); + if(CollectionUtils.isNotEmpty(hyPartnerInterviewPlanDOS)){ + throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_ALREADY_EXIST); + } CreateAppointmentVO vo = new CreateAppointmentVO(); //1.创建面试计划 HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); @@ -227,16 +233,19 @@ public class InterviewServiceImpl implements InterviewService { record.setRoomId(StringUtil.generateRoomId(startBookingTime)); record.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode()); record.setDeleted(false); + record.setApplicationApproved(0); hyPartnerInterviewPlanMapper.insertSelective(record); - HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); - hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO); - -// vo.setInterviewPlanId(String.valueOf(interviewPlanId)); + 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.setInterviewPlanId(interviewPlanId); hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId()); hyPartnerInterviewDO.setPartnerId(request.getPartnerId()); hyPartnerInterviewDO.setInterviewer(request.getInterviewerId()); @@ -250,6 +259,7 @@ public class InterviewServiceImpl implements InterviewService { @Override public void approveAppointment(ApproveAppointmentReq request) throws ApiException { + //查询面试计划信息 InterviewVO interviewVO = hyPartnerInterviewPlanMapper.getInterviewInfo(request.getInterviewPlanId()); //如果面试计划不存在，抛出异常 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 index 179b48ccf..546837d9e 100644 --- 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 @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "加盟商资格面试") @RestController -@RequestMapping("interview") +@RequestMapping("/interview") public class InterviewController { @Autowired @@ -47,7 +47,7 @@ public class InterviewController { @PostMapping("/appointment/submit") @ApiOperation("预约面试") - public ResponseResult createAppointment(@RequestBody CreateAppointmentReq request) { + public ResponseResult createAppointment(@RequestBody CreateAppointmentReq request) throws ApiException { return ResponseResult.success(interviewBaseService.createAppointment(request)); } From 3d98a4741e2159540255f08398699c3bdaf88c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 14:10:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyOpenAreaInfoMapper.xml | 3 +++ .../service/HyPartnerLineInfoService.java | 8 +++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 23 +++++++++++++++---- .../cool/store/config/SignValidateFilter.java | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index 86a29174f..7136184a1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -194,6 +194,9 @@ and area_path like concat('%',#{keyword},'%') + + and (area_status = 'open' or area_status = 'keyOpen') + and area_status = #{areaStatus} 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 index c87756b88..9cee7f480 100644 --- 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 @@ -130,6 +130,14 @@ public interface HyPartnerLineInfoService { */ Boolean assignFollowUser(Long lineId); + /** + * 线索状态 + * @param wantShopAreaId + * @param acceptAdjustType + * @return + */ + Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType); + 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 index 5b2e4f596..434e90380 100644 --- 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 @@ -395,21 +395,34 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return Boolean.FALSE; } HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); - HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); + + Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType()); + 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(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(acceptAdjustType)){ return Boolean.FALSE; } //全国调剂 默认分配呗 有啥好说的 - if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ return Boolean.TRUE; } //省内调剂 有重点或者开放的 分配 - if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ Integer apply = hyOpenAreaInfoDAO.getChildrenCount("apply", hyOpenAreaInfoDO.getId()); if (apply>CommonConstants.ZERO){ return Boolean.TRUE; @@ -417,7 +430,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return Boolean.FALSE; } //市内调剂 不分配 - if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){ + if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){ return Boolean.FALSE; } } 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 46a60bc72..94a526258 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 @@ -51,7 +51,7 @@ public class SignValidateFilter implements Filter { "/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**", "/partner/mini/program/oss/getUploadFileConfig", "/partner/mini/program/v1/partnerManage/partner/getIdentityCardInfo", - "/**/swagger*/**", "/**/webjars/**"); + "/**/swagger*/**", "/**/webjars/**","/partner/mini/program/v1/partnerManage/openArea/areaApplyQuery"); /** From 5731e874f17a0cb72498cb7550c01e2f52622095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 14:37:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=88=98=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyIntendDevMappingDAO.java | 7 ++++++ .../HyIntendDevelopementMappingMapper.java | 2 ++ .../HyIntendDevelopementMappingMapper.xml | 15 ++++++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 24 +++++++++---------- .../store/service/impl/ZoneServiceImpl.java | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) 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 index bbd32f119..c6dd4c626 100644 --- 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 @@ -52,6 +52,13 @@ public class HyIntendDevMappingDAO { return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList); } + public List selectByOpenAreaMappingIdList(List idList){ + if (CollectionUtils.isEmpty(idList)){ + return new ArrayList<>(); + } + return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList); + } + public int batchInsert(List recordList){ if (CollectionUtils.isEmpty(recordList)){ 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 index 11e58073d..ad61c250b 100644 --- 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 @@ -54,4 +54,6 @@ public interface HyIntendDevelopementMappingMapper { * @return */ List selectByMappingIdList(@Param("mappingIdList") List mappingIdList); + + List selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List openAreaMappingIdList); } \ 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 index e3f763f7f..d81c6823d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -130,4 +130,19 @@ + + + \ No newline at end of file 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 index 434e90380..f24fe9f51 100644 --- 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 @@ -247,20 +247,20 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @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); - } +// 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); +// } PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize()); PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), - lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds)); + lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null)); List list = publicSeaLineList.getList(); if (CollectionUtils.isEmpty(list)){ 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 index d114200ef..743a956a2 100644 --- 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 @@ -202,7 +202,7 @@ public class ZoneServiceImpl implements ZoneService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //查询已经绑定战区的 意向区域 - List list = hyIntendDevMappingDAO.selectByMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); + List list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); List openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList()); List hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdList); Map areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName));