线索信息与基本信息

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

@@ -293,6 +293,7 @@
       a.id as id,
       a.partner_id as partnerId,
       a.workflow_stage  as workflowStage,
+      a.lineId as lineStatus,
       a.workflow_status as workflowStatus,
       a.partner_id as partnerUserId,
       a.investment_manager as investmentManager,

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

@@ -62,4 +62,6 @@ public class PartnerLineInfoAndBaseInfoDTO {
 
     @ApiModelProperty("通过证明")
     private String passCertifyFile;
+
+    private Integer lineStatus;
 }

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

@@ -37,6 +37,9 @@ public class PartnerIntentInfoVO {
     @ApiModelProperty("意向开店区域")
     private String wantShopArea;
 
+    @ApiModelProperty("意向开店区域名称")
+    private String wantShopAreaName;
+
     @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
     private Integer acceptAdjustType;
 

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

@@ -6,6 +6,7 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.constants.RedisConstant;
 import com.cool.store.dao.*;
 import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
+import com.cool.store.entity.HyOpenAreaInfoDO;
 import com.cool.store.entity.HyPartnerIntentInfoDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.enums.ErrorCodeEnum;
@@ -52,6 +53,10 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
     HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO;
     @Resource
     private RedisUtilPool redisUtilPool;
+    @Resource
+    EnterpriseUserDAO enterpriseUserDAO;
+    @Resource
+    HyOpenAreaInfoDAO hyOpenAreaInfoDAO;
 
     @Override
     public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) {
@@ -104,8 +109,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         return Boolean.TRUE;
     }
 
-    @Resource
-    EnterpriseUserDAO enterpriseUserDAO;
     @Override
     public PartnerIntentInfoVO getPartnerIntentApplyDetail(Long lineId) {
         HyPartnerIntentInfoDO hyPartnerIntentInfoDO= hyPartnerIntentInfoDAO.selectByLineId(lineId);
@@ -113,7 +116,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
         partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
         partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
-        //todo su 手机号归属地 意向申请区域名称
+        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
+        partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName());
         return partnerIntentInfoVO;
     }
 

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

@@ -484,6 +484,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage());
         partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus());
         partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause());
+        partnerLineInfoAndBaseInfoVO.setLineStatus(partnerLineInfoAndBaseInfoDTO.getLineStatus());
+        partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(partnerLineInfoAndBaseInfoDTO.getInvestmentManagerPhone());
         if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
             partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
         }