From fa2633057330bc9605b4f920e870369ab661f4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 18 Jun 2023 20:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/WorkflowStatusEnum.java | 3 +- .../com/cool/store/dao/HyOpenAreaInfoDAO.java | 4 +- .../store/dao/HyPartnerIntentInfoDAO.java | 6 ++- .../store/dao/HyPartnerInterviewPlanDAO.java | 5 +- .../cool/store/dao/HyPartnerLineInfoDAO.java | 13 +++++ .../store/mapper/HyOpenAreaInfoMapper.java | 1 + .../mapper/HyPartnerIntentInfoMapper.java | 2 +- .../mapper/HyPartnerInterviewPlanMapper.java | 2 +- .../store/mapper/HyPartnerLineInfoMapper.java | 8 +++ .../resources/mapper/HyOpenAreaInfoMapper.xml | 3 ++ .../mapper/HyPartnerIntentInfoMapper.xml | 6 ++- .../mapper/HyPartnerInterviewPlanMapper.xml | 11 ++--- .../mapper/HyPartnerLineInfoMapper.xml | 9 ++++ .../dto/partner/InviteCodeDetailDTO.java | 21 ++++++++ .../store/entity/HyPartnerIntentInfoDO.java | 12 +++++ .../cool/store/vo/PartnerIntentInfoVO.java | 15 ++++++ .../com/cool/store/vo/PartnerLineInfoVO.java | 3 +- .../service/HyPartnerLineInfoService.java | 7 +++ .../cool/store/service/OpenAreaService.java | 2 +- .../store/service/PartnerUserInfoService.java | 3 ++ .../impl/EnterpriseUserServiceImpl.java | 2 +- .../impl/HyPartnerIntentInfoServiceImpl.java | 18 +++++-- .../HyPartnerInterviewPlanServiceImpl.java | 4 +- .../impl/HyPartnerLineInfoServiceImpl.java | 18 +++++++ .../service/impl/OpenAreaServiceImpl.java | 6 +-- .../impl/PartnerUserInfoServiceImpl.java | 15 ++++++ .../store/config/TokenValidateFilter.java | 2 +- .../cool/store/controller/DeskController.java | 49 ++++++++++++------- .../store/controller/OpenAreaController.java | 8 +-- 29 files changed, 208 insertions(+), 50 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/InviteCodeDetailDTO.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java index ee46c212b..e42781f6d 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStatusEnum.java @@ -15,7 +15,8 @@ public enum WorkflowStatusEnum { //预约面试阶段 RESERVATION_0("0","待预约"), RESERVATION_1("1","预约时间待审核"), - RESERVATION_7("7","到期未预约"), + RESERVATION_7("7","拒绝"), + RESERVATION_8("8","到期未预约"), //合格资格面试 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 index fe3464ca9..c2842a8f7 100644 --- 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 @@ -29,8 +29,8 @@ public class HyOpenAreaInfoDAO { return hyOpenAreaInfoMapper.queryKeyOpenArea(); } - public List queryByKeyword(String keyword,Boolean filterData){ - return hyOpenAreaInfoMapper.queryByKeyword(keyword,filterData); + public List queryByKeyword(String keyword,String areaStatus,Boolean filterData){ + return hyOpenAreaInfoMapper.queryByKeyword(keyword,areaStatus,filterData); } public List queryFirstLevel(){ 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 index c950a1fed..d52e0414e 100644 --- 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 @@ -8,6 +8,8 @@ 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.Objects; /** @@ -38,9 +40,9 @@ public class HyPartnerIntentInfoDAO { } - public PageInfo selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus){ + public List selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus){ if (StringUtils.isEmpty(userId)){ - return new PageInfo<>(); + return new ArrayList<>(); } return hyPartnerIntentInfoMapper.selectPartnerIntentApplyInfoList(userId,workflowStage,workflowStatus); } 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 index 5153b4a99..be2b11221 100644 --- 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 @@ -5,6 +5,7 @@ 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.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -74,9 +75,9 @@ public class HyPartnerInterviewPlanDAO { * @param workflowStatus * @return */ - public PageInfo getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){ + public List getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){ if (StringUtils.isEmpty(userId)){ - return new PageInfo(); + return Lists.newArrayList(); } return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 3696a7d68..270f9c160 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -6,6 +6,7 @@ import com.cool.store.dto.partner.StageCountDTO; import com.cool.store.dto.partner.*; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.mapper.HyPartnerLineInfoMapper; +import com.cool.store.vo.LineFollowHistoryVO; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; @@ -159,4 +160,16 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(lineIds); } + /** + * 查询根据历史 + * @param partnerId + * @return + */ + public List getLineFollowHistoryList(String partnerId){ + if (partnerId==null){ + return new ArrayList<>(); + } + return hyPartnerLineInfoMapper.getLineFollowHistoryList(partnerId); + } + } 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 index de3c881b2..854b9dfaf 100644 --- 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 @@ -40,6 +40,7 @@ public interface HyOpenAreaInfoMapper { * @return */ List queryByKeyword(@Param("keyword") String keyword, + @Param("areaStatus") String areaStatus, @Param("filterData") Boolean filterData); /** 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 index 711026290..e3ae379cf 100644 --- 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 @@ -37,7 +37,7 @@ public interface HyPartnerIntentInfoMapper { * @param workflowStatus * @return */ - PageInfo selectPartnerIntentApplyInfoList(@Param("userId") String userId, + List selectPartnerIntentApplyInfoList(@Param("userId") String userId, @Param("workflowStage") String workflowStage , @Param("workflowStatus") String workflowStatus); 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 index 1fd495385..f2494db46 100644 --- 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 @@ -69,7 +69,7 @@ public interface HyPartnerInterviewPlanMapper { * @param workflowStatus * @return */ - PageInfo getPartnerInterviewInfoList(@Param("userId") String userId, + List getPartnerInterviewInfoList(@Param("userId") String userId, @Param("workflowStage") String workflowStage , @Param("workflowStatus") String workflowStatus); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 1221c21cc..2b5cf795b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -5,6 +5,7 @@ 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.vo.LineFollowHistoryVO; import com.github.pagehelper.PageInfo; import org.apache.ibatis.annotations.Param; @@ -178,4 +179,11 @@ public interface HyPartnerLineInfoMapper { * @return */ List getHyPartnerLineInfoListByIds(@Param("lineIds") List lineIds); + + /** + * 跟进历史 及删除状态为1的线索 + * @param partnerId + * @return + */ + List getLineFollowHistoryList(String partnerId); } \ 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 index 523cb2e69..f13518de0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -189,6 +189,9 @@ and area_path like concat('%',#{keyword},'%') + + and area_status = #{areaStatus} + and province_city_flag = 1 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index dbb61371e..c1da9edb2 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -25,12 +25,16 @@ + + + + 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, - create_time, update_time + create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file select - sum(if(interview_date=#{currentDate},1,0)) as currentDayInterviewCount, - sum(if(start_time>#{startTime} and #{endTime},1,0)) as lastSevenDayInterviewCount + ifnull(sum(if(interview_date=#{currentDate},1,0)),0) as currentDayInterviewCount, + ifnull(sum(if(start_time>#{startTime} and #{endTime},1,0)),0) as lastSevenDayInterviewCount FROM hy_partner_interview_plan where interviewer = #{userId} + and application_approved = 0 @@ -229,11 +231,8 @@ and a.interviewer = #{userId} - - and a.workflow_stage= #{workflowStage} - - and a.workflow_status = #{workflowStatus} + and a.status = #{workflowStatus} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 292d75413..87872511e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -264,6 +264,7 @@ + + + \ No newline at end of file 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 new file mode 100644 index 000000000..c1ff3e496 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/InviteCodeDetailDTO.java @@ -0,0 +1,21 @@ +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/entity/HyPartnerIntentInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java index 6d1d2f7e8..60632d06e 100644 --- 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 @@ -86,4 +86,16 @@ public class HyPartnerIntentInfoDO implements Serializable { @ApiModelProperty("更新时间") private Date updateTime; + + @ApiModelProperty("通过原因") + private String passCause; + + @ApiModelProperty("通过时间") + private Date passTime; + + @ApiModelProperty("通过人ID") + private String passUser; + + @ApiModelProperty("通过证明") + private String passCertifyFile; } \ No newline at end of file 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 index 42b1ddf1e..da05c0b5d 100644 --- 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 @@ -88,4 +88,19 @@ public class PartnerIntentInfoVO { @ApiModelProperty("创建时间") private Date createTime; + @ApiModelProperty("通过原因") + private String passCause; + + @ApiModelProperty("通过时间") + private Date passTime; + + @ApiModelProperty("通过人名称") + private String passUserName; + + @ApiModelProperty("通过人ID") + private String passUserId; + + @ApiModelProperty("通过证明") + private String passCertifyFile; + } 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 index 4d730cc64..d78dece53 100644 --- 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 @@ -17,7 +17,8 @@ import java.util.Date; public class PartnerLineInfoVO { @ApiModelProperty("") - private Long id; + private Long lineId; + @ApiModelProperty("hy_partner_user_info.partner_id") private String partnerId; 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 93da5e217..e89522b4e 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 @@ -106,5 +106,12 @@ public interface HyPartnerLineInfoService { PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId); + /** + * 跟进历史 + * @param partnerId + * @return + */ + List getLineFollowHistory(String partnerId); + } 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 index 7f497aa28..5ac2be270 100644 --- 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 @@ -21,7 +21,7 @@ public interface OpenAreaService { * @param keyword * @return */ - List queryByKeyword(String keyword,Boolean flag); + List queryByKeyword(String keyword,String areaStatus,Boolean flag); /** 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 index 6a0e51d28..92666ef45 100644 --- 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 @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.entity.HyPartnerUserInfoDO; +import com.cool.store.vo.InviteCodeDetailVO; public interface PartnerUserInfoService { @@ -9,4 +10,6 @@ public interface PartnerUserInfoService { Boolean queryJoinNotice(String partnerId); Boolean completeJoinNotice(String partnerId); + + InviteCodeDetailVO selectInviteCodeDetail(String partnerId); } 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 fd897c898..f362583ed 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 @@ -53,7 +53,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { List regionIds = userRegionMappingDAO.getRegionIdsByUserId(userId); //所有绑定了战区的组织机构 - List list = zoneService.queryAllBingZoneRegionList("intend"); + List list = zoneService.queryAllBingZoneRegionList("intent"); HashSet regionList = new HashSet<>(); regionIds.forEach(x->{ if (list.contains(x)){ 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 index 1df676b54..bb6684601 100644 --- 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 @@ -3,11 +3,9 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import cn.hutool.core.bean.BeanUtil; import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyPartnerBaseInfoDAO; -import com.cool.store.dao.HyPartnerIntentInfoDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dao.*; import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; +import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.HyPartnerIntentInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; @@ -61,7 +59,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic workflowStatus = WorkflowStatusEnum.INTERVIEW_5.getCode(); } PageHelper.startPage(pageNumber,pageSize); - PageInfo partnerIntentApplyInfo = hyPartnerIntentInfoDAO.selectPartnerIntentApplyInfoList(userId, WorkflowStageEnum.INTENT.getCode(), workflowStatus); + PageInfo partnerIntentApplyInfo = new PageInfo(hyPartnerIntentInfoDAO.selectPartnerIntentApplyInfoList(userId, WorkflowStageEnum.INTENT.getCode(), workflowStatus)); if (partnerIntentApplyInfo==null){ return new PageInfo<>(); } @@ -101,6 +99,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic return Boolean.TRUE; } + @Resource + EnterpriseUserDAO enterpriseUserDAO; @Override public PartnerIntentInfoVO getPartnerIntentApplyDetail(Long lineId) { HyPartnerIntentInfoDO hyPartnerIntentInfoDO= hyPartnerIntentInfoDAO.selectByLineId(lineId); @@ -108,6 +108,10 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId()); partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername()); partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile()); + EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(hyPartnerIntentInfoDO.getPassUser()); + if (userInfo!=null){ + partnerIntentInfoVO.setPassUserName(userInfo.getName()); + } //todo su 手机号归属地 意向申请区域名称 return partnerIntentInfoVO; } @@ -210,6 +214,10 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand()); partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength()); partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove()); + partnerIntentInfoVO.setPassCause(hyPartnerIntentInfoDO.getPassCause()); + partnerIntentInfoVO.setPassCertifyFile(hyPartnerIntentInfoDO.getPassCertifyFile()); + partnerIntentInfoVO.setPassUserId(hyPartnerIntentInfoDO.getPassUser()); + partnerIntentInfoVO.setPassTime(hyPartnerIntentInfoDO.getPassTime()); 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 index 63d6a3f16..7a6146c3a 100644 --- 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 @@ -77,7 +77,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan } PageHelper.startPage(pageNumber,pageSize); //查询预约面试列表 - PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus); + PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.RESERVATION.getCode(), workflowStatus)); List list = partnerInterviewInfoList.getList(); if (CollectionUtils.isEmpty(list)){ return partnerInterviewInfoList; @@ -113,7 +113,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan PageHelper.startPage(pageNumber,pageSize); //查询预约面试列表 - PageInfo partnerInterviewInfoList = hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus); + PageInfo partnerInterviewInfoList = new PageInfo(hyPartnerInterviewPlanDAO.getPartnerInterviewInfoList(userId, WorkflowStageEnum.INTERVIEW.getCode(),workflowStatus)); List list = partnerInterviewInfoList.getList(); if (CollectionUtils.isEmpty(list)){ return partnerInterviewInfoList; 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 d48672826..385f487d8 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 @@ -95,6 +95,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { list.stream().forEach(x->{ PartnerLineInfoVO partnerLineInfoVO = new PartnerLineInfoVO(); BeanUtils.copyProperties(x,partnerLineInfoVO); + partnerLineInfoVO.setLineId(x.getId()); result.add(partnerLineInfoVO); }); hyPartnerLineInfoDOPageInfo.setList(result); @@ -309,6 +310,23 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { 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.getRejectPublicReason()); + lineFollowHistoryVO.setCloseTime(x.getCloseTime()); + lineFollowHistoryVO.setStartTime(x.getCreateTime()); + result.add(lineFollowHistoryVO); + }); + return result; + } + /** * convertPartnerBlackListDTOToVo * @param partnerBlackListDTO 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 index 9fe1cc7aa..630eb232c 100644 --- 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 @@ -32,13 +32,13 @@ public class OpenAreaServiceImpl implements OpenAreaService { @Override - public List queryByKeyword(String keyword,Boolean flag) { + 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,flag); + List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,areaStatus,flag); Set longSet = hyOpenAreaInfoDOS.stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toSet()); List result = new ArrayList<>(); @@ -66,7 +66,7 @@ public class OpenAreaServiceImpl implements OpenAreaService { Map longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); //查询关键字下所有的数据 原始的数据 - List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,flag); + List hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,null,flag); Map hyMap = hyOpenAreaInfoDOS.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x)); 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 index 8365b31d9..1670d3348 100644 --- 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 @@ -6,6 +6,7 @@ import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.service.PartnerUserInfoService; +import com.cool.store.vo.InviteCodeDetailVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,4 +39,18 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { 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.getRecommendPartnerName()); + inviteCodeDetailVO.setPartnerPhone(hyPartnerUserInfoDO.getRecommendPartnerMobile()); + inviteCodeDetailVO.setStoreName(hyPartnerUserInfoDO.getShopName()); + return inviteCodeDetailVO; + } } 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 aeb9c1d94..aea8cc37a 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 @@ -78,7 +78,7 @@ public class TokenValidateFilter implements Filter { String userStr = ""; LoginUserInfo currentUser = null; boolean isInWhiteList = excludePath(uri); - String accessToken = reqs.getHeader("accessToken"); + String accessToken = "1cd17699b7dc1f64161485c2d365e0e0"; String key = "access_token:" + accessToken; if(StringUtils.isNotBlank(accessToken)){ userStr = redisUtilPool.getString(key); 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 index 7ff45733f..7df9e25c7 100644 --- 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 @@ -1,6 +1,7 @@ package com.cool.store.controller; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dto.calendar.UserCalendarsEventDTO; import com.cool.store.enums.LineStatusEnum; import com.cool.store.exception.ApiException; @@ -43,6 +44,8 @@ public class DeskController { private ISVHttpRequest isvHttpRequest; @Resource EnterpriseUserService enterpriseUserService; + @Resource + PartnerUserInfoService partnerUserInfoService; @GetMapping(path = "/interviewSchedule") @@ -68,7 +71,7 @@ public class DeskController { @GetMapping(path = "/getUserCalendarsEvents") @ApiOperation("飞书日程信息") public ResponseResult> getUserCalendarsEvents(@RequestParam(value = "startTime",required = true) Long startTime, - @RequestParam(value = "endTime",required = true) Long endTime) throws ApiException { + @RequestParam(value = "endTime",required = true) Long endTime) throws ApiException { String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime)); @@ -79,7 +82,7 @@ public class DeskController { @GetMapping(path = "/queryStageCount") @ApiOperation("招商经理视角====各阶段待处理待跟进数量") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + @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)); @@ -93,10 +96,10 @@ public class DeskController { } - @PostMapping(path = "/queryIntentApplyList") + @GetMapping(path = "/queryIntentApplyList") @ApiOperation("招商经理视角===意向申请审核列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + @ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false), @ApiImplicitParam(name = "pageNumber", value = "1", required = false), @ApiImplicitParam(name = "pageSize", value = "10", required = false), }) @@ -108,7 +111,7 @@ public class DeskController { } - @PostMapping(path = "/querySubscribeInterviewTimeList") + @GetMapping(path = "/querySubscribeInterviewTimeList") @ApiOperation("招商经理视角===预约面试时间 列表") public ResponseResult> querySubscribeInterviewTimeList(@RequestParam(value = "type",required = false)String type, @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @@ -118,10 +121,10 @@ public class DeskController { return ResponseResult.success(hyPartnerInterviewPlanService.getPartnerInterviewInfoList(userId,type,pageSize,pageNumber)); } - @PostMapping(path = "/queryQualifiedInterviewList") + @GetMapping(path = "/queryQualifiedInterviewList") @ApiOperation("招商经理视角===合格资格面试 列表") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-Pending 待跟进-follow", required = false), + @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, @@ -156,10 +159,8 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), }) - public ResponseResult getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)Long partnerId){ - - - return ResponseResult.success(); + public ResponseResult getInviteCodeDetail(@RequestParam(value = "partnerId",required = false)String partnerId){ + return ResponseResult.success(partnerUserInfoService.selectInviteCodeDetail(partnerId)); } @@ -168,10 +169,8 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "partnerId", value = "partnerId", required = false), }) - public ResponseResult> getFollowHistory(@RequestParam(value = "partnerId",required = false)Long partnerId){ - - - return ResponseResult.success(); + public ResponseResult> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId){ + return ResponseResult.success(hyPartnerLineInfoService.getLineFollowHistory(partnerId)); } @@ -207,8 +206,7 @@ public class DeskController { @PostMapping(path = "/queryPublicSeqLineList") @ApiOperation("公海列表") public ResponseResult> queryPublicSeaLineList(@RequestBody LineRequest LineRequest){ - - return ResponseResult.success(); + return ResponseResult.success(hyPartnerLineInfoService.publicSeaLineList(CurrentUserHolder.getUserId(),LineRequest)); } @@ -248,6 +246,23 @@ public class DeskController { return ResponseResult.success(hyPartnerLineInfoService.closeOrPassFollow(CurrentUserHolder.getUserId(),closeFollowRequest)); } + + @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)); + } + + @PostMapping(path = "/updatePartnerIntentInfo") + @ApiOperation("修改加盟商意向信息/行业认知") + public ResponseResult updatePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest)); + } + @PostMapping(path = "/changeIntentInfo") @ApiOperation("员工端变更C端用户意向信息") public ResponseResult changeIntentInfo( @RequestBody BaseUserInfoRequest baseUserInfoRequest){ 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 index f9c1a7e09..876cf2e81 100644 --- 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 @@ -28,10 +28,12 @@ public class OpenAreaController { @GetMapping(path = "/getOpenAreaTree") @ApiOperation("开放城市树-搜索城市 到第二节点") @ApiImplicitParams({ - @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false) + @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){ - return ResponseResult.success(openAreaService.queryByKeyword(keyword,Boolean.TRUE)); + 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)); }