Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
7103fa9f
Commit
7103fa9f
authored
Apr 17, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 兼容互动记录延迟合并逻辑
parent
1cdb7159
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
InteractRecordMessageService.java
...service/content/message/InteractRecordMessageService.java
+1
-1
MaterialReportServiceTest.java
...age3-service/src/test/java/MaterialReportServiceTest.java
+2
-2
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java
View file @
7103fa9f
...
@@ -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
());
}
}
...
...
haoban-manage3-service/src/test/java/MaterialReportServiceTest.java
View file @
7103fa9f
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment