私海线索

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

@@ -302,9 +302,15 @@
       b.pass_reason as passReason,
      b.certify_file as certifyFile,
      b.pass_time as passTime,
-     b.pass_user_id as passUserId
+     b.pass_user_id as passUserId,
-    from hy_partner_line_info a left join hy_partner_base_info b
+    hpuinfo.live_area as liveArea,
-    on a.id = b.partner_line_id
+    hpuinfo.want_shop_area as wantShopArea,
+    hpuinfo.accept_adjust_type as acceptAdjustType,
+    hpuinfo.mobile as partnerUserPhone,
+    hpuinfo.username as partnerUserName
+    from hy_partner_line_info a
+    left join hy_partner_base_info b  on a.id = b.partner_line_id
+    LEFT JOIN hy_partner_user_info hpuinfo ON a.partner_id = hpuinfo.partner_id
     <where>
       <if test="lineId!=null">
         and a.id = #{lineId}
@@ -479,16 +485,16 @@
     <if test="acceptAdjustType!=null">
       AND hpuinfo.accept_adjust_type = #{acceptAdjustType}
     </if>
-    <if test="storeKeywordType!=null and storeKeywordType==storeCode">
+    <if test="storeKeywordType!=null and storeKeywordType=='storeCode'">
       AND hpuinfo.shop_code  like concat('%',#{storeKeyword},'%')
     </if>
-    <if test="storeKeywordType!=null and storeKeywordType==storeName">
+    <if test="storeKeywordType!=null and storeKeywordType=='storeName'">
       AND hpuinfo.shop_name  like concat('%',#{storeKeyword},'%')
     </if>
-    <if test="storeKeywordType!=null and storeKeywordType==partnerName">
+    <if test="storeKeywordType!=null and storeKeywordType=='partnerName'">
       AND hpuinfo.recommend_partner_name  like concat('%',#{storeKeyword},'%')
     </if>
-    <if test="storeKeywordType!=null and storeKeywordType==partnerMobile">
+    <if test="storeKeywordType!=null and storeKeywordType=='partnerMobile'">
       AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
     </if>
 <!--    <if test="userIdList!=null and userIdList.size>0">-->

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

@@ -64,4 +64,16 @@ public class PartnerLineInfoAndBaseInfoDTO {
     private String passCertifyFile;
 
     private Integer lineStatus;
+
+    @ApiModelProperty("常驻区域")
+    private String liveArea;
+
+    @ApiModelProperty("意向开店区域")
+    private String wantShopArea;
+
+    @ApiModelProperty("意向开店区域名称")
+    private String wantShopAreaName;
+
+    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
+    private Integer acceptAdjustType;
 }

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

@@ -68,4 +68,16 @@ public class PartnerLineInfoAndBaseInfoVO {
 
     @ApiModelProperty("通过证明")
     private List<String> passCertifyFile;
+
+    @ApiModelProperty("常驻区域")
+    private String liveArea;
+
+    @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/HyPartnerLineInfoServiceImpl.java

@@ -80,12 +80,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
         PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO);
-        HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerLineInfoAndBaseInfoVO.getPartnerUserId());
+
-        if (hyPartnerUserInfoDO!=null){
-            partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
-            partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
-        }
-        
         EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
         if (userInfo!=null){
             partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
@@ -94,6 +89,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(partnerLineInfoAndBaseInfoVO.getPartnerUserPhone());
             partnerLineInfoAndBaseInfoVO.setPhoneAddress(phoneNumberAttribute!=null?phoneNumberAttribute.getCity():"");
         }
+        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea()));
+        if (hyOpenAreaInfoDO!=null){
+            partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName());
+        }
         EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
         if (investmentManager!=null){
             partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(investmentManager.getName());
@@ -494,6 +493,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause());
         partnerLineInfoAndBaseInfoVO.setLineStatus(partnerLineInfoAndBaseInfoDTO.getLineStatus());
         partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(partnerLineInfoAndBaseInfoDTO.getInvestmentManagerPhone());
+        partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(partnerLineInfoAndBaseInfoDTO.getPartnerUserPhone());
+        partnerLineInfoAndBaseInfoVO.setPartnerUserName(partnerLineInfoAndBaseInfoDTO.getPartnerUserName());
+        partnerLineInfoAndBaseInfoVO.setAcceptAdjustType(partnerLineInfoAndBaseInfoDTO.getAcceptAdjustType());
+        partnerLineInfoAndBaseInfoVO.setWantShopArea(partnerLineInfoAndBaseInfoDTO.getWantShopArea());
+        partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea());
         if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
             partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
         }