suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #26 into master from cc_20260105_partner

Browse Source 
feat:测试

* cc_20260105_partner: (8 commits squashed)

  - feat:加盟商意向书字段调整

  - feat:意向审核

  - feat:加盟商意向申请

  - feat:新增其他备注

  - feat:返回信息缺失

  - feat:资质阶段审核完成才回成为加盟商

  - feat:大区查询阶段状态是6

  - feat:测试

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/26
This commit is contained in:
正新
2026-01-14 11:03:42 +00:00
parent 08845557fd
commit 82a49a03d2
16 changed files with 204 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
View File

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -72,7 +73,7 @@ public class LineInfoDAO {
return lineInfoMapper.updateByPrimaryKeySelective(param);
}
public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus,String userId) {
public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus,String userId,Boolean flag) {
if(Objects.isNull(workflowSubStageStatus)){
log.info("更新线索阶段，子阶段 和 子阶段状态不能同时为空");
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
@@ -85,8 +86,10 @@ public class LineInfoDAO {
if(StringUtils.isNotEmpty(userId)){
lineInfo.setUpdateUserId(userId);
}
//准加盟商
lineInfo.setJoinStatus(CommonConstants.ONE);
//资质审核阶段完成 才会到成为加盟商
if (flag){
lineInfo.setJoinStatus(CommonConstants.ONE);
}
lineInfo.setPartnerNum(RandomEightCharCodeUtils.getCode());
lineInfo.setWorkflowSubStageStatus(workflowSubStageStatus.getCode());
return lineInfoMapper.updateByPrimaryKeySelective(lineInfo);
@@ -119,11 +122,11 @@ public class LineInfoDAO {
return null;
}
public List<LineInfoDO> listByInvestmentManager(String investmentManagerUserId,List<Integer> subStageStatus,String keyword) {
if (StringUtils.isBlank(investmentManagerUserId)){
return null;
public List<LineInfoDO> listByInvestmentManager(String investmentManagerUserId,List<Integer> subStageStatus,String keyword,List<String> authRegionIds) {
if (StringUtils.isBlank(investmentManagerUserId)&&CollectionUtils.isEmpty(authRegionIds)){
return new ArrayList<>();
}
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword);
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword, authRegionIds);
return lineInfo;
}
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,List<Integer> pendingInterviewStatusList,

5
coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
View File

@@ -29,7 +29,10 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
* @param investmentManagerUserId
* @return
*/
List<LineInfoDO> listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List<Integer> codes,@Param("keyword")String keyword);
List<LineInfoDO> listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId,
@Param("codes") List<Integer> codes,
@Param("keyword")String keyword,
@Param("authRegionIds") List<String> authRegionIds);
/**
* 面试官待处理

5
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -366,6 +366,11 @@
<if test="keyword !=null and keyword !=''">
and (username like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%'))
</if>
<if test="authRegionIds !=null and authRegionIds.size>0">
<foreach collection="authRegionIds" item="regionId" open="and invest_region_id in (" close=")" separator=",">
#{regionId}
</foreach>
</if>
order by update_time desc
</select>

26
coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml
View File

@@ -40,6 +40,12 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="electronic_email" jdbcType="VARCHAR" property="electronicEmail" />
<result column="info_source" jdbcType="VARCHAR" property="infoSource" />
<result column="other_remark" jdbcType="VARCHAR" property="otherRemark" />
<result column="capital_strength" jdbcType="INTEGER" property="capitalStrength" />
<result column="has_retail_experience" jdbcType="INTEGER" property="hasRetailExperience" />
<result column="willing_station_duration" jdbcType="INTEGER" property="willingStationDuration" />
</resultMap>
<insert id="insertOrUpdate" keyProperty="id" parameterType="com.cool.store.entity.QualificationsInfoDO" useGeneratedKeys="true">
@@ -76,7 +82,12 @@
<if test="request.financialManagerName != null">financial_manager_name,</if>
<if test="request.financialManagerMobile != null">financial_manager_mobile,</if>
<if test="request.businessLicense != null">business_license,</if>
<if test="request.unifiedSocialCreditCode != null">unified_social_credit_code,</if>
<if test="request.electronicEmail != null">electronic_email,</if>
<if test="request.infoSource != null">info_source,</if>
<if test="request.otherRemark != null">other_remark,</if>
<if test="request.capitalStrength != null">capital_strength,</if>
<if test="request.hasRetailExperience != null">has_retail_experience,</if>
<if test="request.willingStationDuration != null">willing_station_duration,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="request.auditId != null">#{request.auditId},</if>
@@ -111,6 +122,12 @@
<if test="request.financialManagerMobile != null">#{request.financialManagerMobile},</if>
<if test="request.businessLicense != null">#{request.businessLicense},</if>
<if test="request.unifiedSocialCreditCode != null">#{request.unifiedSocialCreditCode},</if>
<if test="request.electronicEmail != null">#{request.electronicEmail},</if>
<if test="request.infoSource != null">#{request.infoSource},</if>
<if test="request.otherRemark != null">#{request.otherRemark},</if>
<if test="request.capitalStrength != null">#{request.capitalStrength},</if>
<if test="request.hasRetailExperience != null">#{request.hasRetailExperience},</if>
<if test="request.willingStationDuration != null">#{request.willingStationDuration},</if>
</trim>
ON DUPLICATE KEY UPDATE
<trim suffixOverrides=",">
@@ -146,6 +163,13 @@
<if test="request.financialManagerMobile != null">financial_manager_mobile = #{request.financialManagerMobile},</if>
<if test="request.businessLicense != null">business_license = #{request.businessLicense},</if>
<if test="request.unifiedSocialCreditCode != null">unified_social_credit_code = #{request.unifiedSocialCreditCode},</if>
<if test="request.electronicEmail != null">electronic_email = #{request.electronicEmail},</if>
<if test="request.infoSource != null">info_source = #{request.infoSource},</if>
<if test="request.otherRemark != null">other_remark = #{request.otherRemark},</if>
<if test="request.capitalStrength != null">capital_strength = #{request.capitalStrength},</if>
<if test="request.hasRetailExperience != null">has_retail_experience = #{request.hasRetailExperience},</if>
<if test="request.willingStationDuration != null">willing_station_duration = #{request.willingStationDuration},</if>
</trim>
</insert>