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

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

@@ -5,10 +5,14 @@ import com.cool.store.vo.PartnerBaseInfoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface JoinIntentionMapper {
 
     boolean insertOrUpdate(@Param("request") MemberQuestionDO request);
 
-    MemberQuestionDO getByLineId(@Param("lineId") Long lineId);
+    MemberQuestionDO     getByLineId(@Param("lineId") Long lineId);
+
+    List<MemberQuestionDO> getByLineIds(@Param("lineIds") List<Long> lineIds);
 }

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

@@ -169,14 +169,14 @@
   </select>
   <select id="getUpdateUserName" resultType="string">
     select name
-      from enterprise_user
-      where deleted = 0
+      from enterprise_user_${enterpriseId}
+      where active = 1
       and user_id = #{updateUserId}
   </select>
   <select id="getUpdateUserPhone" resultType="string">
     select mobile
-      from enterprise_user
-      where deleted = 0
+      from enterprise_user_${enterpriseId}
+      where active = 1
       and user_id = #{updateUserId}
   </select>
 

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

@@ -113,5 +113,17 @@
         and deleted = 0
     </select>
 
+    <select id="getByLineIds" resultType="com.cool.store.entity.MemberQuestionDO">
+        select
+        <include refid="Base_Column_List"/>
+        from xfsg_member_question_info
+        where deleted = 0
+        <if test="lineIds !=null and lineIds.size>0">
+            <foreach collection="lineIds" item="lineId" open="and line_id in (" close=")" separator=",">
+                #{lineId}
+            </foreach>
+        </if>
+    </select>
+
 
 </mapper>

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

@@ -34,6 +34,9 @@ public class BaseInfoVO {
     @ApiModelProperty("线索标签")
     private List<LabelBaseInfoVO> userPortraitList;
 
+    @ApiModelProperty("流程阶段:1意向加盟;2新店进展;")
+    private Integer workflowStage;
+
     private Integer workflowSubStage;
 
     @ApiModelProperty("子阶段状态")
@@ -53,6 +56,7 @@ public class BaseInfoVO {
         this.workflowSubStage = baseInfoVO.getWorkflowSubStage();
         this.wantShopAreaName = baseInfoVO.getWantShopAreaName();
         this.userPortraitList = baseInfoVO.getUserPortraitList();
+        this.workflowStage = baseInfoVO.getWorkflowStage();
         this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus();
     }
 

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

@@ -82,6 +82,9 @@ public class LineInfoVO {
     @ApiModelProperty("流程阶段:1意向加盟;2新店进展;")
     private Integer workflowStage;
 
+    @ApiModelProperty("加盟身份 1个人加盟 2企业加盟")
+    private Integer joinType;
+
     /**
      * 流程子阶段
      */

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

@@ -9,6 +9,7 @@ import com.cool.store.entity.*;
 import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.IntentAgreementMapper;
+import com.cool.store.mapper.JoinIntentionMapper;
 import com.cool.store.mapper.RegionMapper;
 import com.cool.store.request.*;
 import com.cool.store.service.*;
@@ -56,6 +57,8 @@ public class LineServiceImpl implements LineService {
     TransferLogService transferLogService;
     @Resource
     IntentAgreementMapper intentAgreementMapper;
+    @Resource
+    JoinIntentionMapper joinIntentionMapper;
 
     @Override
     public LineInfoVO getLineInfo(Long lineId) {
@@ -82,11 +85,16 @@ public class LineServiceImpl implements LineService {
             result.setLargeRegionId(bigRegionIdByAreaId);
             result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
         }
+
+        MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfo.getId());
         Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo));
         Map<Long, String>  wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(Arrays.asList(lineInfo.getWantShopAreaId()));
         BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(lineInfo, userPortraitMap, wantShopAreaMap);
         result.setWantShopAreaName(baseInfoVO.getWantShopAreaName());
         result.setUserPortraitList(baseInfoVO.getUserPortraitList());
+        if (memberQuestionDO != null){
+            result.setJoinType(memberQuestionDO.getJoinType());
+        }
         BeanUtil.copyProperties(lineInfo,result);
         return result;
     }