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
8ce1d154
Commit
8ce1d154
authored
Apr 27, 2020
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去重
parent
848fb1a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
DealSyncOperationApiServiceImpl.java
...ice/service/out/impl/DealSyncOperationApiServiceImpl.java
+8
-5
SyncDealContoller.java
...m/gic/haoban/manage/web/controller/SyncDealContoller.java
+1
-0
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
View file @
8ce1d154
...
@@ -41,10 +41,7 @@ import org.slf4j.LoggerFactory;
...
@@ -41,10 +41,7 @@ import org.slf4j.LoggerFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashSet
;
import
java.util.*
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -285,7 +282,13 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
...
@@ -285,7 +282,13 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
eidListMap
.
forEach
((
k
,
v
)
->
{
eidListMap
.
forEach
((
k
,
v
)
->
{
//获取所有分组列表
//获取所有分组列表
List
<
StoreGroupDTO
>
groupDTOList
=
storeGroupService
.
listStoreGroupAndChildren
(
v
.
toArray
(
new
String
[]{}),
k
);
List
<
StoreGroupDTO
>
groupDTOList
=
storeGroupService
.
listStoreGroupAndChildren
(
v
.
toArray
(
new
String
[]{}),
k
);
List
<
TabHaobanPreDealLog
>
dealList
=
groupDTOList
.
stream
().
map
(
storeGroupDTO
->
{
List
<
String
>
hasKey
=
new
ArrayList
<>();
List
<
TabHaobanPreDealLog
>
dealList
=
groupDTOList
.
stream
().
filter
(
dto
->{
if
(
hasKey
.
contains
(
dto
.
getStoreGroupId
()))
{
return
false
;
}
return
true
;
}).
map
(
storeGroupDTO
->
{
TabHaobanPreDealLog
dealLog
=
new
TabHaobanPreDealLog
();
TabHaobanPreDealLog
dealLog
=
new
TabHaobanPreDealLog
();
dealLog
.
setDataId
(
storeGroupDTO
.
getStoreGroupId
());
dealLog
.
setDataId
(
storeGroupDTO
.
getStoreGroupId
());
if
(
pMap
.
containsKey
(
storeGroupDTO
.
getStoreGroupId
()))
{
if
(
pMap
.
containsKey
(
storeGroupDTO
.
getStoreGroupId
()))
{
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java
View file @
8ce1d154
...
@@ -67,6 +67,7 @@ public class SyncDealContoller extends WebBaseController {
...
@@ -67,6 +67,7 @@ public class SyncDealContoller extends WebBaseController {
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
logger
.
info
(
"login:{}"
,
JSONObject
.
toJSONString
(
login
));
logger
.
info
(
"login:{}"
,
JSONObject
.
toJSONString
(
login
));
logger
.
info
(
"data:{}"
,
JSONObject
.
toJSONString
(
qo
));
String
taskLock
=
dealSyncOperationApiService
.
getTaskLock
(
wxEnterpriseId
);
String
taskLock
=
dealSyncOperationApiService
.
getTaskLock
(
wxEnterpriseId
);
if
(
null
!=
taskLock
)
{
if
(
null
!=
taskLock
)
{
...
...
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