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

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

@@ -63,8 +63,11 @@ public class EnterpriseUserDAO {
         return enterpriseUserMapper.deleteUserByUserId(userId);
     }
 
-    public List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(List<String> regionIds, String keyword, boolean isLeader){
+    public List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(List<String> regionIds, String keyword, List<String> leaderRegionIds){
-        return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, isLeader);
+        if(CollectionUtils.isEmpty(regionIds)){
+            return Lists.newArrayList();
+        }
+        return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, leaderRegionIds);
     }
 
     public boolean isExistDeptUser(String regionId){

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

@@ -57,10 +57,10 @@ public interface EnterpriseUserMapper {
      * 根据关键字搜索部门下的用户
      * @param regionIds
      * @param keyword
-     * @param isLeader
+     * @param leaderRegionIds
      * @return
      */
-    List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword, @Param("isLeader") boolean isLeader);
+    List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword, @Param("leaderRegionIds") List<String> leaderRegionIds);
 
     /**
      * 获取部门用户数

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

@@ -269,14 +269,12 @@
             enterprise_user
         <where>
             deleted = 0
-            <if test="regionIds != null and regionIds.size()>0">
+            and <foreach collection="regionIds" item="regionId" separator=" or " open="(" close=")">user_region_ids like concat('%', #{regionId}, '%')</foreach>
-                and <foreach collection="regionIds" item="regionId" separator="or" open="(" close=")"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
-            </if>
             <if test="keyword != null">
                 and (name like concat("%", #{keyword}, "%") or mobile like concat("%", #{keyword}, "%"))
             </if>
-            <if test="isLeader!= null and isLeader">
+            <if test="leaderRegionIds != null and leaderRegionIds.size()>0">
-                and is_leader = 1 and leader_dept_ids in <foreach collection="regionIds" item="regionId" separator="," open="(" close=")">#{regionId}</foreach>
+                and <foreach collection="leaderRegionIds" item="regionId" separator=" or " open="(" close=")">user_region_ids like concat('%', #{regionId}, '%')</foreach>
             </if>
         </where>
     </select>

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

@@ -85,6 +85,24 @@
       <if test="record.updateTime != null">
         update_time,
       </if>
+      <if test="record.shopCode != null">
+        shop_code,
+      </if>
+      <if test="record.shopName != null">
+        shop_name,
+      </if>
+      <if test="record.shopId != null">
+        shop_id,
+      </if>
+      <if test="record.recommendPartnerId != null">
+        recommend_partner_id,
+      </if>
+      <if test="record.recommendPartnerName != null">
+        recommend_partner_name,
+      </if>
+      <if test="record.recommendPartnerMobile != null">
+        recommend_partner_mobile,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="record.partnerId != null">
@@ -117,6 +135,24 @@
       <if test="record.updateTime != null">
         #{record.updateTime},
       </if>
+      <if test="record.shopCode != null">
+        #{record.shopCode},
+      </if>
+      <if test="record.shopName != null">
+        #{record.shopName},
+      </if>
+      <if test="record.shopId != null">
+        #{record.shopId},
+      </if>
+      <if test="record.recommendPartnerId != null">
+        #{record.recommendPartnerId},
+      </if>
+      <if test="record.recommendPartnerName != null">
+        #{record.recommendPartnerName},
+      </if>
+      <if test="record.recommendPartnerMobile != null">
+        #{record.recommendPartnerMobile},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective">
@@ -152,6 +188,24 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime},
       </if>
+      <if test="record.shopCode != null">
+        shop_code = #{record.shopCode},
+      </if>
+      <if test="record.shopName != null">
+        shop_name = #{record.shopName},
+      </if>
+      <if test="record.shopId != null">
+        shop_id = #{record.shopId},
+      </if>
+      <if test="record.recommendPartnerId != null">
+        recommend_partner_id = #{record.recommendPartnerId},
+      </if>
+      <if test="record.recommendPartnerName != null">
+        recommend_partner_name = #{record.recommendPartnerName},
+      </if>
+      <if test="record.recommendPartnerMobile != null">
+        recommend_partner_mobile = #{record.recommendPartnerMobile},
+      </if>
     </set>
     where id = #{record.id}
   </update>

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

@@ -19,4 +19,7 @@ public class ApplyBaseInfoVO {
     @ApiModelProperty("所选省内是否含有开放城市")
     private Boolean provinceHasOpenArea;
 
+    @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
+    private Integer lineStatus;
+
 }

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

@@ -32,7 +32,7 @@ public class EnterpriseUserSingleInfoVO {
         for (EnterpriseUserDO enterpriseUser : userList) {
             String userId = enterpriseUser.getUserId();
             boolean isContains = userIdMap.containsKey(userId);
-            if(isContains){
+            if(!isContains){
                 EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO();
                 result.setUserId(userId);
                 result.setUserName(enterpriseUser.getName());

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

@@ -72,7 +72,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService {
         List<EnterpriseUserDO> enterpriseUserDOS = new ArrayList<>();
         if (CommonConstants.ALLOCATION.equals(type)){
             if (userInfo.getIsLeader()){
-                 enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.TRUE);
+                 enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class));
             }
             if (CollectionUtils.isNotEmpty(regionList)){
                 //只有招商经理本人
@@ -81,7 +81,7 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService {
         }
         //转交 所有的招商经理
         if (CommonConstants.TRANSFER.equals(type)){
-            enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, Boolean.FALSE);
+            enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(regionList), keyword, null);
         }
         return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS);
     }

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

@@ -16,11 +16,13 @@ import com.cool.store.vo.ApplyBaseInfoVO;
 import com.cool.store.vo.InviteCodeDetailVO;
 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;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -103,6 +105,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         if (CollectionUtils.isNotEmpty(hyOpenAreaInfoDOS)) {
             applyBaseInfoVO.setProvinceHasOpenArea(true);
         }
+        applyBaseInfoVO.setLineStatus(hyPartnerLineInfoDO.getLineStatus());
         return applyBaseInfoVO;
     }
 
@@ -111,7 +114,9 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile());
         hyPartnerUserInfoDO.setLiveArea(partnerUserInfoRequest.getLiveArea());
         hyPartnerUserInfoDO.setWantShopArea(partnerUserInfoRequest.getWantShopArea());
-        hyPartnerUserInfoDO.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType());
+        if (!Objects.isNull(partnerUserInfoRequest.getAcceptAdjustType())){
+            hyPartnerUserInfoDO.setAcceptAdjustType(partnerUserInfoRequest.getAcceptAdjustType());
+        }
         hyPartnerUserInfoDO.setInviteCode(partnerUserInfoRequest.getInviteCode());
         hyPartnerUserInfoDO.setShopCode(partnerUserInfoRequest.getShopCode());
         hyPartnerUserInfoDO.setShopName(partnerUserInfoRequest.getShopName());

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

@@ -2,7 +2,6 @@ package com.cool.store.service.impl.workflow;
 
 import com.cool.store.enums.WorkflowStageEnum;
 import com.cool.store.request.CloseFollowRequest;
-import com.cool.store.service.impl.WorkFlowServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -2,7 +2,6 @@ package com.cool.store.service.impl.workflow;
 
 import com.cool.store.enums.WorkflowStageEnum;
 import com.cool.store.request.CloseFollowRequest;
-import com.cool.store.service.impl.WorkFlowServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;