Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java

@@ -29,8 +29,8 @@ public enum OperateTypeEnum {
     REJECT_INTERVIEW("reject_interview", "合作资格面试-拒绝并结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON,REJECT_REAL_REASON, CERTIFY_FILE)),
     CREATE_QUALIFYVERIFY("create_qualifyverify", "合作资格面试-创建资格审核", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME,SUMMARY,QUALI_VERIFY_CONTENT)),
     USERINFO_UPDATE("userinfo_update", "修改（修改意向信息）", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_USERINFO_UPDATE, AFTER_USERINFO_UPDATE)),
-    INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
+    INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)),
-    INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
+    INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)),
     ADD_TAGS("add_tags", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
     ;
 

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyInterviewDAO.java

@@ -47,11 +47,11 @@ public class HyInterviewDAO {
 
     }
 
-    public  int updateLineId(Long newLineId,Long oldLineId){
+    public  int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){
         if (newLineId==null || Objects.isNull(oldLineId)){
             return 0;
         }
-        return interviewMapper.updateLineId(newLineId, oldLineId);
+        return interviewMapper.updateLineId(newPartnerId,newLineId, oldLineId);
     }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java

@@ -55,11 +55,11 @@ public class HyPartnerClerkDAO {
         return hyPartnerClerkMapper.listByPartnerIdAndLineId(partnerId, partnerLineId);
     }
 
-    public  int updateLineId(Long newLineId,Long oldLineId){
+    public  int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){
         if (newLineId==null || Objects.isNull(oldLineId)){
             return 0;
         }
-        return hyPartnerClerkMapper.updateLineId(newLineId, oldLineId);
+        return hyPartnerClerkMapper.updateLineId(newPartnerId,newLineId, oldLineId);
     }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java

@@ -62,11 +62,11 @@ public class HyPartnerIntentInfoDAO {
         return hyPartnerIntentInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId);
     }
 
-    public  int updateLineId(Long newLineId,Long oldLineId){
+    public  int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){
         if (newLineId==null || Objects.isNull(oldLineId)){
             return 0;
         }
-        return hyPartnerIntentInfoMapper.updateLineId(newLineId, oldLineId);
+        return hyPartnerIntentInfoMapper.updateLineId(newPartnerId,newLineId, oldLineId);
     }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerInterviewPlanDAO.java

@@ -106,10 +106,10 @@ public class HyPartnerInterviewPlanDAO {
     }
 
 
-    public  int updateLineId(Long newLineId,Long oldLineId){
+    public  int updateLineId(String newPartnerId,Long newLineId,Long oldLineId){
         if (newLineId==null || Objects.isNull(oldLineId)){
             return 0;
         }
-        return hyPartnerInterviewPlanMapper.updateLineId(newLineId, oldLineId);
+        return hyPartnerInterviewPlanMapper.updateLineId(newPartnerId,newLineId, oldLineId);
     }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java

@@ -39,7 +39,7 @@ public interface HyPartnerCertificationInfoMapper {
 
     HyPartnerCertificationInfoDO selectByPartnerLineId(@Param("partnerLineId") Long partnerLineId);
 
-    int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
+    int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
 
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java

@@ -39,6 +39,6 @@ public interface HyPartnerClerkMapper {
     List<HyPartnerClerkDO> listByPartnerIdAndLineId(@Param("partnerId") String partnerId,
                                           @Param("partnerLineId") Long partnerLineId);
 
-    int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
+    int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java

@@ -57,5 +57,5 @@ public interface HyPartnerIntentInfoMapper {
      * @param oldLineId
      * @return
      */
-     int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
+     int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java

@@ -109,6 +109,6 @@ public interface HyPartnerInterviewMapper {
      */
     Boolean hasVideoUrls(@Param("videoUrl") String videoUrl);
 
-    int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
+    int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java

@@ -170,7 +170,7 @@ public interface HyPartnerInterviewPlanMapper {
                                                           @Param("workflowStage") String workflowStage,
                                                           @Param("workflowStatus") String workflowStatus);
 
-    int updateLineId(@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
+    int updateLineId(@Param("newPartnerId") String newPartnerId, @Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId);
 
 
 }

coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml

@@ -142,7 +142,7 @@
 
   <update id="updateLineId">
     update hy_partner_interview
-    set partner_line_id = #{newLineId}
+    set partner_line_id = #{newLineId}  , partner_id = #{newPartnerId}
     where partner_line_id = #{oldLineId}
   </update>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml

@@ -143,7 +143,7 @@
 
   <update id="updateLineId">
     update hy_partner_clerk
-    set partner_line_id = #{newLineId}
+    set partner_line_id = #{newLineId} , partner_id = #{newPartnerId}
     where partner_line_id = #{oldLineId}
   </update>
 

coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml

@@ -299,7 +299,7 @@
 
   <update id="updateLineId">
     update hy_partner_intent_info
-    set partner_line_id = #{newLineId}
+    set partner_line_id = #{newLineId},partner_id = #{newPartnerId}
     where partner_line_id = #{oldLineId}
   </update>
 

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml

@@ -518,7 +518,7 @@
 
   <update id="updateLineId">
     update hy_partner_interview
-    set partner_line_id = #{newLineId}
+    set partner_line_id = #{newLineId} , partner_id = #{newPartnerId}
     where partner_line_id = #{oldLineId}
   </update>
 

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml

@@ -533,7 +533,7 @@
 
   <update id="updateLineId">
     update hy_partner_interview_plan
-    set partner_line_id = #{newLineId}
+    set partner_line_id = #{newLineId}  , partner_id = #{newPartnerId}
     where partner_line_id = #{oldLineId}
   </update>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml

@@ -593,10 +593,10 @@
 
   <!-- 根据面试计划 id 查询战区 id -->
   <select id="getAffiliationZoneIdByInterviewPlanId" resultType="java.lang.String">
-    SELECT affiliation_zone
+    SELECT want_shop_area
-      FROM hy_partner_line_info
+      FROM hy_partner_user_info
-      WHERE id = (
+      WHERE partner_id = (
-        SELECT partner_line_id
+        SELECT partner_id
           FROM hy_partner_interview_plan
           WHERE id = #{interviewPlanId}
       )

coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java

@@ -0,0 +1,89 @@
+package com.cool.store.dto.log;
+
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * @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 ClerkUpdate beforeClerkUpdate;
+    private ClerkUpdate 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;
+    }
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java

@@ -150,7 +150,7 @@ public interface HyPartnerLineInfoService {
      */
      String getAssignFollowUser(String partnerId,String type);
 
-    InterviewVO getInterviewInfo(Long lineId) throws ApiException;
+    InterviewVO getInterviewInfo(Long lineId,Boolean needDevelopmentDirector) throws ApiException;
 
     /**
      * 生成一条默认线索

coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java

@@ -68,12 +68,7 @@ public class CommonServiceImpl implements CommonService {
         } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) {
             return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "结束面试");
         }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_5.getCode())) {
-            HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
+            return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核");
-            String intentionContractNo = null;
-            if(partnerCertificationInfoDO != null){
-                intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo();
-            }
-            return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核 | "+intentionContractNo);
         }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_6.getCode())) {
             HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
             String intentionContractNo = null;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java

@@ -64,11 +64,6 @@ public class ContentServiceImpl implements ContentService {
      */
     @Override
     public void updateContent(ContentUpdateDto 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.setId(Long.parseLong(dto.getContentId()));

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java

@@ -208,16 +208,26 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()));
         //修改名称
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId);
-        if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername())){
+        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());
             hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
         }
         hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo);
-        hyPartnerIntentInfoDAO.updateLineId(newLindId,oldLineInfo.getId());
+        hyPartnerIntentInfoDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId());
-        hyPartnerClerkDAO.updateLineId(newLindId,oldLineInfo.getId());
+        hyPartnerClerkDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId());
-        hyPartnerInterviewPlanDAO.updateLineId(newLindId,oldLineInfo.getId());
+        hyPartnerInterviewPlanDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId());
-        hyInterviewDAO.updateLineId(newLindId,oldLineInfo.getId());
+        hyInterviewDAO.updateLineId(newPartnerId,newLindId,oldLineInfo.getId());
-        hyPartnerCertificationInfoMapper.updateLineId(newLindId,oldLineInfo.getId());
+        hyPartnerCertificationInfoMapper.updateLineId(newPartnerId,newLindId,oldLineInfo.getId());
+        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;
     }
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

@@ -6,10 +6,12 @@ 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.UserInfoUpdateDTO;
+import com.cool.store.dto.log.WantInfoUpdateDTO;
 import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
 import com.cool.store.entity.HyOpenAreaInfoDO;
 import com.cool.store.entity.HyPartnerIntentInfoDO;
@@ -38,6 +40,7 @@ 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;
@@ -72,6 +75,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
     HyPhoneLocationService hyPhoneLocationService;
     @Resource
     HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;
+    @Autowired
+    private LogService logService;
 
     @Override
     public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) {
@@ -186,14 +191,20 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
             redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS);
             return null;
         }
+        WantInfoUpdateDTO.IntentInfoUpdate beforeIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate();
+        WantInfoUpdateDTO.IntentInfoUpdate afterIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate();
+
         HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId());
         if(intentInfoDO == null){
             intentInfoDO = new HyPartnerIntentInfoDO();
             fillIntentInfo(intentInfoDO, request);
             hyPartnerIntentInfoDAO.insertSelective(intentInfoDO);
+            BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate);
         }else {
+            BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate);
             fillIntentInfo(intentInfoDO, request);
             hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO);
+            BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate);
         }
         redisUtilPool.delKey(cacheKey);
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId());
@@ -215,6 +226,12 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
                 hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
             }
         }
+        //记录日志
+        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.INTENT_INFO_UPDATE,log);
         return hyPartnerLineInfoDO.getLineStatus();
     }
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -674,11 +674,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     }
 
     @Override
-    public InterviewVO getInterviewInfo(Long lineId) throws ApiException {
+    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;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java

@@ -11,6 +11,7 @@ import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dao.EnterpriseUserDAO;
+import com.cool.store.dao.HyIntendDevMappingDAO;
 import com.cool.store.dao.HyInterviewDAO;
 import com.cool.store.dto.calendar.CreateCalendarEventDTO;
 import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
@@ -46,6 +47,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -107,6 +109,9 @@ public class InterviewServiceImpl implements InterviewService {
         return interviewList;
     }
 
+    @Resource
+    HyIntendDevMappingDAO hyIntendDevMappingDAO;
+
     @Override
     public InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException {
         String interviewPlanId = request.getInterviewPlanId();
@@ -135,12 +140,14 @@ public class InterviewServiceImpl implements InterviewService {
         //查询开发主管信息
         if (request.getNeedDevelopmentDirector() != null && request.getNeedDevelopmentDirector()) {
             //查询所属战区
-            String affiliationZoneId = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId);
+
-            if (affiliationZoneId == null) {
+            String wantShopArea = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId);
+            HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "dev");
+            if (hyIntendDevelopementMappingDO == null) {
                 return vo;
             }
             //查询开发主管
-            EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(Long.parseLong(affiliationZoneId));
+            EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(Long.parseLong(hyIntendDevelopementMappingDO.getMappingId()));
             vo.setDevelopmentDirector(development);
         }
         return vo;

coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java

@@ -302,7 +302,8 @@ public class DeskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
     })
-    public ResponseResult<InterviewVO> getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId) throws ApiException {
+    public ResponseResult<InterviewVO> getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId,
-        return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId));
+                                                                @RequestParam(value = "needDevelopmentDirector",required = false)Boolean needDevelopmentDirector) throws ApiException {
+        return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId,needDevelopmentDirector));
     }
 }