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

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

@@ -39,6 +39,14 @@ public class UserRegionMappingDAO {
         return userRegionMappingMapper.deleteUserRegion(regionId, dataSourceEnum.getCode(), excludeUserIds);
     }
 
+
+    public Integer deleteUserRegionByUserId(String userId, DataSourceEnum dataSourceEnum, List<String> excludeRegionIds){
+        if(StringUtils.isBlank(userId) || Objects.isNull(dataSourceEnum)){
+            return null;
+        }
+        return userRegionMappingMapper.deleteUserRegionByExcludeRegionIds(userId, dataSourceEnum.getCode(), excludeRegionIds);
+    }
+
     public Integer deleteRegionUserByExcludeRegionIds(List<String> excludeRegionIds){
         if(CollectionUtils.isEmpty(excludeRegionIds)){
             return null;

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

@@ -34,6 +34,15 @@ public interface UserRegionMappingMapper {
      */
     int deleteUserRegion(@Param("regionId") String regionId, @Param("type")Integer type, @Param("excludeUserIds") List<String> excludeUserIds);
 
+    /**
+     * 删除用户不存在的部门
+     * @param userId
+     * @param type
+     * @param excludeRegionIds
+     * @return
+     */
+    int deleteUserRegionByExcludeRegionIds(@Param("userId") String userId, @Param("type")Integer type, @Param("excludeRegionIds") List<String> excludeRegionIds);
+
     /**
      * 删除没有的部门映射关系
      * @param excludeRegionIds

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

@@ -387,6 +387,7 @@
            hpci.qualify_verify_id as qualifyVerifyId,
            hpci.intention_contract_no as intentionContractNo,
            hpll.workflow_stage as workflowStage,
+           hpll.line_status      as lineStatus,
            hpi.pass_time    as passTime,
            hpi.pass_reason  as passReason,
            hpi.recorder     as recorderId,

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

@@ -52,8 +52,8 @@
     </where>
   </select>
     <select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
-      SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile  as followmobile  FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
+      SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile  as followmobile ,d.channel_id as channelId FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
-        a.partner_id=b.partner_id    left join    enterprise_user  c on  b.investment_manager=c.user_id
+        a.partner_id=b.partner_id    left join    enterprise_user  c on  b.investment_manager=c.user_id LEFT join  hy_partner_user_channel d  on   b.user_channel_id=d.id
       WHERE  a.create_time BETWEEN #{selectTime}  and   #{now}  or
         a.update_time BETWEEN #{selectTime}  and   #{now}    order by  a.id  Limit  #{limit1},#{limit2}
     </select>

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

@@ -111,6 +111,13 @@
         </if>
     </update>
 
+    <update id="deleteUserRegionByExcludeRegionIds">
+        update user_region_mapping set deleted = 1 where user_id = #{userId} and type = #{type}
+        <if test="excludeRegionIds != null and excludeRegionIds.size() > 0">
+            and region_id not in <foreach collection="excludeRegionIds" separator="," open="(" close=")" item="regionId" >#{regionId}</foreach>
+        </if>
+    </update>
+
     <update id="deleteRegionUserByExcludeRegionIds">
         update user_region_mapping set deleted = 1 where region_id not in <foreach collection="excludeRegionIds" open="(" close=")" separator="," item="regionId">#{regionId}</foreach>
     </update>

coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java

@@ -16,4 +16,6 @@ public class SyncEcCustomerDO {
     private String followname;
 
     private String followmobile;
+
+    private Integer channelId;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java

@@ -25,9 +25,12 @@ public class InterviewVO {
     @ApiModelProperty(value = "线索id", required = true)
     private Long partnerLineId;
 
-    @ApiModelProperty(value = "线索状态")
+    @ApiModelProperty(value = "流程阶段")
     private Long workflowStage;
 
+    @ApiModelProperty(value = "线索状态")
+    private Long lineStatus;
+
     @ApiModelProperty("资质审核流程id")
     private String qualifyVerifyId;
 

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 {

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

@@ -187,6 +187,7 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
                     regionPathMap = regionList.stream().collect(Collectors.toMap(k->k.getRegionId(), v->v.getRegionPath()));
                     userRegionMappingDAO.batchInsertOrUpdateUserRegion(UserRegionMappingDO.convertSyncDO(departmentLists, userDetail.getUserId()));
                 }
+                userRegionMappingDAO.deleteUserRegionByUserId(userDetail.getUserId(), DataSourceEnum.SYNC, departmentLists);
                 String jobTitle = userDetail.getJobTitle();
                 if(StringUtils.isNotBlank(jobTitle)){
                     SysRoleDO role = sysRoleDAO.getRoleByName(jobTitle, DataSourceEnum.SYNC);

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());
+            if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
-            hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
-            hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+                hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
+            }
         }
         return hyPartnerLineInfoDO;
     }

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)) {

coolstore-partner-webb/src/main/resources/application-ab.properties

@@ -81,4 +81,4 @@ hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb
 hs.sms.templateCode = SMS_461530041
 
 
-ec.baseUrl=http://58.33.58.162:10019
+ec.baseUrl=https://oapi-gateway.shpr.top/basic

coolstore-partner-webb/src/main/resources/application-dev.properties

@@ -74,4 +74,4 @@ xxl.job.executor.logretentiondays = 3
 xxl.job.accessToken =
 
 
-ec.baseUrl=http://58.33.58.162:10019
+ec.baseUrl=https://oapi-gateway.shpr.top/basic

coolstore-partner-webb/src/main/resources/application-local.properties

@@ -83,4 +83,4 @@ xxl.job.executor.logpath = logs/xxl-job/jobhandler
 xxl.job.executor.logretentiondays = 30
 xxl.job.accessToken =
 
-ec.baseUrl=http://58.33.58.162:10019
+ec.baseUrl=http://127.0.0.1:8017