From 1ead623010507720622993a150686d9da1c38a52 Mon Sep 17 00:00:00 2001 From: pserimal Date: Sun, 25 Jun 2023 14:22:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E9=97=B4=E6=96=B9=E6=B3=95=E5=B0=86=E4=BF=AE=E6=94=B9=E9=9D=A2?= =?UTF-8?q?=E8=AF=95=E5=AE=9E=E9=99=85=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mapper/HyPartnerInterviewPlanMapper.java | 4 ++++ .../resources/mapper/HyPartnerInterviewPlanMapper.xml | 10 +++++++++- .../cool/store/service/impl/InterviewServiceImpl.java | 2 +- .../service/impl/PartnerInterviewServiceImpl.java | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index 6fddf15da..45d95b56f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -131,4 +131,8 @@ public interface HyPartnerInterviewPlanMapper { */ void closeInterviewRoom(@Param("record") HyPartnerInterviewPlanDO record,@Param("roomStatus")Integer roomStatus); + /** + * 修改面试实际开始时间 + */ + void updateActualStartTime(@Param("id") Long id, @Param("now") String now); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index c17dcbae9..c6094163e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -254,7 +254,15 @@ - select count(1) from hy_partner_interview_plan diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index af7650d4e..e532470f5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -255,7 +255,7 @@ public class InterviewServiceImpl implements InterviewService { HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 - hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date()); + hyPartnerInterviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now()); //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 if (dto.getUserType().equals(2)) { hyPartnerInterviewPlanDO.setIsPartnerInterview(1); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index 13dbfc8c7..24e518113 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -83,6 +83,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO(); hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 + interviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now()); hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date()); //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 if (dto.getUserType().equals(2)) { From 94078f51d27e8d9e331d7262a29148e8f1bdc59f Mon Sep 17 00:00:00 2001 From: pserimal Date: Sun, 25 Jun 2023 14:33:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E9=97=B4=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9=E9=9D=A2=E8=AF=95?= =?UTF-8?q?=E8=AE=A1=E5=88=92bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/InterviewServiceImpl.java | 7 +++---- .../store/service/impl/PartnerInterviewServiceImpl.java | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index e532470f5..f810c92f6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -259,12 +259,11 @@ public class InterviewServiceImpl implements InterviewService { //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 if (dto.getUserType().equals(2)) { hyPartnerInterviewPlanDO.setIsPartnerInterview(1); + hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); } - //5. 修改房间状态为已开放 - hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); - //6. 查询对应的面试官id、姓名及加盟商姓名 + //5. 查询对应的面试官id、姓名及加盟商姓名 EnterInterviewVO vo = hyPartnerInterviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); - //7. 生成 userSign + //6. 生成 userSign String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); vo.setUserSign(userSig); return vo; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index 24e518113..18284b7eb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -84,16 +84,14 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId())); //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 interviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now()); - hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date()); //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 if (dto.getUserType().equals(2)) { hyPartnerInterviewPlanDO.setIsPartnerInterview(1); + interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); } - //5. 修改房间状态为已开放 - interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO); - //6. 查询对应的面试官id、姓名及加盟商姓名 + //5. 查询对应的面试官id、姓名及加盟商姓名 EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId()); - //7. 生成 userSign + //6. 生成 userSign String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); vo.setUserSign(userSig); return vo; From 3e4d451805fa84e46f6e4904433267ecc032dae2 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Sun, 25 Jun 2023 15:02:29 +0800 Subject: [PATCH 3/3] investmentManager --- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 78fd0bf0b..f93f261a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -542,7 +542,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Boolean flag = this.assignFollowUser(hyPartnerLineInfoDO.getPartnerId(), wantShopArea, acceptAdjustType); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); if (flag){ - hyPartnerLineInfoDO.setInvestmentManager("ou_7a6a19ae800afde783b0ec2dabaabf95"); + String investmentManager = getAssignFollowUser(partnerId, "intent"); + hyPartnerLineInfoDO.setInvestmentManager(investmentManager); } hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO); }