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

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

Browse Source
This commit is contained in:
苏竹红
2023-06-25 15:12:33 +08:00
parent 438038d5cd 4345fb05aa
commit a7b3c97cb8
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
View File

@@ -131,4 +131,8 @@ public interface HyPartnerInterviewPlanMapper {
*/ */
void closeInterviewRoom(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus); void closeInterviewRoom(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus);
/**
* 修改面试实际开始时间
*/
void updateActualStartTime(@Param("id") Long id, @Param("now") String now);
} }

10
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -254,7 +254,15 @@
</if> </if>
</where> </where>
</update> </update>
<select id="getCurrentDateInterviewCount" resultType="java.lang.Integer">
<!-- 修改面试实际开始时间 -->
<update id="updateActualStartTime">
update hy_partner_interview_plan
set actual_start_time = IF(actual_start_time is NULL, #{now}, actual_start_time)
where id = #{id}
</update>
<select id="getCurrentDateInterviewCount" resultType="java.lang.Integer">
select count(1) from hy_partner_interview_plan select count(1) from hy_partner_interview_plan
<where> <where>
<if test="userId!=null and userId!=''"> <if test="userId!=null and userId!=''">

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

@@ -542,7 +542,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType); Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType);
hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
if (flag){ if (flag){
hyPartnerLineInfoDO.setInvestmentManager("ou_7a6a19ae800afde783b0ec2dabaabf95"); String investmentManager = getAssignFollowUser(partnerId, "intent");
hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
} }
hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
} }

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
View File

@@ -255,16 +255,15 @@ public class InterviewServiceImpl implements InterviewService {
HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId()));
//3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date()); hyPartnerInterviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now());
//4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
if (dto.getUserType().equals(2)) { if (dto.getUserType().equals(2)) {
hyPartnerInterviewPlanDO.setIsPartnerInterview(1); hyPartnerInterviewPlanDO.setIsPartnerInterview(1);
hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
} }
//5. 修改房间状态为已开放 //5. 查询对应的面试官id、姓名及加盟商姓名
hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
//6. 查询对应的面试官id、姓名及加盟商姓名
EnterInterviewVO vo = hyPartnerInterviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); EnterInterviewVO vo = hyPartnerInterviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId());
//7. 生成 userSign //6. 生成 userSign
String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId());
vo.setUserSign(userSig); vo.setUserSign(userSig);
return vo; return vo;

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java
View File

@@ -83,16 +83,15 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId()));
//3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date()); interviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now());
//4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
if (dto.getUserType().equals(2)) { if (dto.getUserType().equals(2)) {
hyPartnerInterviewPlanDO.setIsPartnerInterview(1); hyPartnerInterviewPlanDO.setIsPartnerInterview(1);
interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
} }
//5. 修改房间状态为已开放 //5. 查询对应的面试官id、姓名及加盟商姓名
interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
//6. 查询对应的面试官id、姓名及加盟商姓名
EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId());
//7. 生成 userSign //6. 生成 userSign
String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId());
vo.setUserSign(userSig); vo.setUserSign(userSig);
return vo; return vo;