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

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

@@ -0,0 +1,22 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author wxp
+ * @Date 2023/6/25 9:49
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class ApplyBaseInfoVO {
+
+    @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和")
+    private String selectAreaStatus;
+
+    @ApiModelProperty("所选省内是否含有开放城市")
+    private Boolean provinceHasOpenArea;
+
+}

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

@@ -2,6 +2,7 @@ package com.cool.store.service;
 
 import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.request.PartnerUserInfoRequest;
+import com.cool.store.vo.ApplyBaseInfoVO;
 import com.cool.store.vo.InviteCodeDetailVO;
 
 public interface PartnerUserInfoService {
@@ -14,6 +15,6 @@ public interface PartnerUserInfoService {
 
     InviteCodeDetailVO selectInviteCodeDetail(String partnerId);
 
-    String updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest);
+    ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest);
 
 }

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

@@ -433,6 +433,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType);
             return lineStatus;
         }
+        //如果意向区域没有绑定战区 不分配招商经理
+        HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "intent");
+        if (hyIntendDevelopementMappingDO==null){
+            return Boolean.FALSE;
+        }
         //如果是私海线索 不需要重新分配招商经理  或者跟进次数大于1
         if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){
             return Boolean.FALSE;
@@ -487,11 +492,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         //意向区域
         String wantShopArea = hyPartnerUserInfoDO.getWantShopArea();
         EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
-        // TODO: 2023/6/21 如果意向区域没有绑定战区 分配给谁
+        //查询意向区域绑定的组织架构 没有绑定战区 分配空
-        //查询意向区域绑定的组织架构
         HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea),type);
         if (hyIntendDevelopementMappingDO==null){
-            throw new ServiceException(ErrorCodeEnum.INTENT_AREA_NOT_BING_ZONE);
+           return "";
         }
         List<String> result  = new ArrayList<>();
         if (hyIntendDevelopementMappingDO!=null){

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

@@ -11,11 +11,14 @@ import com.cool.store.request.PartnerUserInfoRequest;
 import com.cool.store.service.HyPartnerBaseInfoService;
 import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.service.PartnerUserInfoService;
+import com.cool.store.vo.ApplyBaseInfoVO;
 import com.cool.store.vo.InviteCodeDetailVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
@@ -72,11 +75,12 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
     }
 
     @Override
-    public String updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) {
+    public ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) {
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(partnerUserInfoRequest.getPartnerId()));
         if (hyPartnerUserInfoDO == null){
             throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST);
         }
+        ApplyBaseInfoVO applyBaseInfoVO = new ApplyBaseInfoVO();
         hyPartnerUserInfoDO.setUsername(partnerUserInfoRequest.getUsername());
         hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile());
         hyPartnerUserInfoDO.setLiveArea(partnerUserInfoRequest.getLiveArea());
@@ -95,6 +99,17 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         // 生成一条意向基本信息
         hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId());
         HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea()));
-        return hyOpenAreaInfoDO != null ? hyOpenAreaInfoDO.getAreaStatus() : "";
+        List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = null;
+        if(hyOpenAreaInfoDO != null){
+            applyBaseInfoVO.setSelectAreaStatus(hyOpenAreaInfoDO.getAreaStatus());
+            String areaPath = hyOpenAreaInfoDO.getAreaPath();
+            String province = areaPath.substring(0, areaPath.indexOf("/", areaPath.indexOf("/") + 1));
+            hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(province, true, null, true);
+         }
+        applyBaseInfoVO.setProvinceHasOpenArea(false);
+        if (CollectionUtils.isNotEmpty(hyOpenAreaInfoDOS)) {
+            applyBaseInfoVO.setProvinceHasOpenArea(true);
+        }
+        return applyBaseInfoVO;
     }
 }

coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java

@@ -52,7 +52,7 @@ public class PartnerController {
 
     @PostMapping(path = "/applyBaseInfo")
     @ApiOperation("提交加盟商基本信息")
-    public ResponseResult<String> applyBaseInfo(@RequestBody PartnerUserInfoRequest partnerUserInfoRequest){
+    public ResponseResult<ApplyBaseInfoVO> applyBaseInfo(@RequestBody PartnerUserInfoRequest partnerUserInfoRequest){
         return ResponseResult.success(partnerUserInfoService.updatePartnerUserInfo(partnerUserInfoRequest));
     }