Commit 7103fa9f by songyinghui

feat: 兼容互动记录延迟合并逻辑

parent 1cdb7159
...@@ -60,7 +60,7 @@ public class InteractRecordMessageService { ...@@ -60,7 +60,7 @@ public class InteractRecordMessageService {
} }
} else { } else {
interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), recordKey); interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), recordKey);
if (interactRecordBO == null) { if (interactRecordBO == null && StringUtils.isNotBlank(context.getInteractRecordMessageBO().getMemberId())) {
// 通过unionId 再获取一下 // 通过unionId 再获取一下
interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), context.buildRecordKeyWithUnionId()); interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), context.buildRecordKeyWithUnionId());
} }
......
...@@ -60,8 +60,8 @@ public class MaterialReportServiceTest { ...@@ -60,8 +60,8 @@ public class MaterialReportServiceTest {
@Test @Test
public void handlerMaterialWeekReportTest() { public void handlerMaterialWeekReportTest() {
System.setProperty("gic.module.name", "haoban-manage3-service"); System.setProperty("gic.module.name", "haoban-manage3-service");
//materialReportService.handlerMaterialReport(eid, staffId, MaterialReportType.WEEK.getCode()); materialReportService.handlerMaterialReport("8a809083802bbf5201804af08b0d0095", "7ef8811007ac45f7a49e299509c8859a", MaterialReportType.WEEK.getCode());
materialReportService.handlerMaterialReport(eid, staffId, MaterialReportType.MONTH.getCode()); materialReportService.handlerMaterialReport("8a809083802bbf5201804af08b0d0095", "7ef8811007ac45f7a49e299509c8859a", MaterialReportType.MONTH.getCode());
} }
@Test @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment