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

2023-06-29 17:03:34 +08:00
parent 563321d5b8 ab9e8ee2ca
commit 7a5497a7f2
19 changed files with 140 additions and 15 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java
@@ -4,6 +4,7 @@ import com.cool.store.dto.content.ContentAddDto;
 import com.cool.store.dto.content.ContentQueryListDto;
 import com.cool.store.dto.content.ContentUpdateDto;
 import com.cool.store.entity.HyContentInfoDO;
+import com.cool.store.exception.ApiException;
 import com.cool.store.vo.HyContentInfoVO;

 import java.util.List;
@@ -15,7 +16,7 @@ public interface ContentService {
     * @param dto
     * @return contentId 新增动态id
     */
-    String addNews(ContentAddDto dto);
+    String addNews(ContentAddDto dto) throws ApiException;

    /**
     * 删除动态
@@ -41,4 +42,9 @@ public interface ContentService {
     */
    HyContentInfoDO queryContentInfo(String contentId);

+    /**
+     * 标题是否重复
+     */
+    Boolean queryTitles(String title);
+
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java
@@ -1,13 +1,18 @@
 package com.cool.store.service.impl;

 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.constants.RedisConstant;
 import com.cool.store.dao.ContentDAO;
 import com.cool.store.dto.content.ContentAddDto;
 import com.cool.store.dto.content.ContentQueryListDto;
 import com.cool.store.dto.content.ContentUpdateDto;
 import com.cool.store.entity.HyContentInfoDO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.exception.ApiException;
 import com.cool.store.mapper.HyContentInfoMapper;
 import com.cool.store.service.ContentService;
+import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.vo.HyContentInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,13 +28,21 @@ public class ContentServiceImpl implements ContentService {
    @Autowired
    private HyContentInfoMapper contentInfoMapper;

+    @Autowired
+    private RedisUtilPool redisUtilPool;
+
    /**
     *
     * @param dto
     * @return contentId 新增动态id
     */
    @Override
-    public String addNews(ContentAddDto dto) {
+    public String addNews(ContentAddDto dto) throws ApiException {
+        //增加不允许重复标题的逻辑
+        Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle());
+        if (isDuplicated) {
+            throw new ApiException(ErrorCodeEnum.DATA_CONVERT_ERROR);
+        }
        HyContentInfoDO hyContentInfoDO = new HyContentInfoDO();
        BeanUtil.copyProperties(dto, hyContentInfoDO);
        hyContentInfoDO.setUpdateUserId(dto.getCreateUserId());
@@ -62,7 +75,7 @@ public class ContentServiceImpl implements ContentService {
     */
    @Override
    public List<HyContentInfoVO> queryContentList(ContentQueryListDto dto) {
-        return contentInfoMapper.queryContentList(dto);
+        return contentInfoMapper.queryContentListForB(dto);
    }

    /**
@@ -75,4 +88,18 @@ public class ContentServiceImpl implements ContentService {
        return contentInfoMapper.queryContentInfo(contentId);
    }

+    /**
+     * 标题是否重复
+     */
+    @Override
+    public Boolean queryTitles(String title) {
+        List<String> titles = (List<String>) JSONObject.parseObject(redisUtilPool.getString(RedisConstant.CONTENT_TITLES), List.class);
+        if (titles != null && titles.size() != 0) {
+            return titles.contains(title);
+        }
+        titles = contentInfoMapper.queryTitles();
+        redisUtilPool.setString(RedisConstant.CONTENT_TITLES, JSONObject.toJSONString(titles), 60);
+        return titles.contains(title);
+    }
+
 }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
@@ -167,6 +167,9 @@ public class EcSyncServiceImpl implements EcSyncService {
                if (StringUtil.isEmpty(partnerLine.getInvestmentManager())) {
                    if (StringUtil.isNotEmpty(resultLine.getInvestmentManager())) {
                        resultLine.setId(partnerLine.getId()).setUpdateTime(new Date());
+                        //沪姨合伙人线索存在黑名单，EC该线索分配跟进人同步到沪姨合伙人但线索状态不变，还存在黑名单中
+                        resultLine.setLineStatus(partnerLine.getLineStatus().intValue()==LineStatusEnum.BLACKLIST.getCode().intValue()
+                                ?LineStatusEnum.BLACKLIST.getCode():resultLine.getLineStatus());
                        hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine);
                    }
                }else {
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -194,8 +194,9 @@ public class FlowServiceImpl implements FlowService {
        //更新面试状态
        interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_5);
        hyPartnerInterviewDO.setUpdateTime(new Date());
-        //获取当前操作人
+        //注意将 hyPartnerInterviewDO 的 status 设置为 null，否则又会修改回 4
        hyPartnerInterviewDO.setStatus(null);
+        //获取当前操作人并添加面试总结/记录信息
        LoginUserInfo operator = CurrentUserHolder.getUser();
        hyPartnerInterviewDO.setRecorder(operator.getUserId());
        hyPartnerInterviewDO.setRecordTime(new Date());
--- 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
@@ -655,9 +655,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
            hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
            hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
        }else {
-            hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
-            hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
-            hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+            if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
+                hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
+                hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+            }
        }
        return hyPartnerLineInfoDO;
    }
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
@@ -109,7 +109,7 @@ public class InterviewWorkFlowService extends WorkFlowBaseService {
        }
        Integer status = interviewInfo.getStatus();
        Date now = new Date();
-        if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) ||
+        if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()) ||
                (interviewInfo.getRoomStatus()!=null && String.valueOf(RoomStatus.OPEN.getCode()).equals(interviewInfo.getRoomStatus())) ||
                (DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0
                && DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) {