记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
c877b74e
Commit
c877b74e
authored
Sep 29, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整list遍历方式;
parent
8d29d834
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
14 deletions
+14
-14
CandyCouponCodeAdminController.java
...roller/zhengzai/candy/CandyCouponCodeAdminController.java
+1
-1
AdamRscController.java
.../liquidnet/service/adam/controller/AdamRscController.java
+1
-1
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+1
-1
CandyCouponServiceImpl.java
...et/service/candy/service/impl/CandyCouponServiceImpl.java
+1
-1
ChimeUserBiz.java
...in/java/com/liquidnet/service/chime/biz/ChimeUserBiz.java
+2
-2
TestDataUtils.java
.../java/com/liquidnet/service/chime/test/TestDataUtils.java
+1
-1
PlatformCandyUserCouponService.java
...rm/service/impl/candy/PlatformCandyUserCouponService.java
+7
-7
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java
View file @
c877b74e
...
@@ -158,7 +158,7 @@ public class CandyCouponCodeAdminController extends BaseController {
...
@@ -158,7 +158,7 @@ public class CandyCouponCodeAdminController extends BaseController {
List
<
CandyUserCouponBasicDto
>
vos
=
(
List
<
CandyUserCouponBasicDto
>)
redisUtil
.
get
(
uckey
);
List
<
CandyUserCouponBasicDto
>
vos
=
(
List
<
CandyUserCouponBasicDto
>)
redisUtil
.
get
(
uckey
);
if
(!
CollectionUtils
.
isEmpty
(
vos
))
{
if
(!
CollectionUtils
.
isEmpty
(
vos
))
{
CandyUserCouponBasicDto
userCouponBasicDto
=
vos
.
parallelS
tream
().
filter
(
v
->
v
.
getCouponId
().
equals
(
couponId
)).
findAny
().
orElse
(
null
);
CandyUserCouponBasicDto
userCouponBasicDto
=
vos
.
s
tream
().
filter
(
v
->
v
.
getCouponId
().
equals
(
couponId
)).
findAny
().
orElse
(
null
);
if
(
null
!=
userCouponBasicDto
&&
userCouponBasicDto
.
getState
()
==
1
)
{
if
(
null
!=
userCouponBasicDto
&&
userCouponBasicDto
.
getState
()
==
1
)
{
String
cckey
=
CandyRedisConst
.
BASIC_COUPON_CODE
.
concat
(
r
.
getCcode
());
String
cckey
=
CandyRedisConst
.
BASIC_COUPON_CODE
.
concat
(
r
.
getCcode
());
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java
View file @
c877b74e
...
@@ -103,7 +103,7 @@ public class AdamRscController {
...
@@ -103,7 +103,7 @@ public class AdamRscController {
}
}
try
{
try
{
List
<
String
>
uidList
=
req
.
getUidList
();
List
<
String
>
uidList
=
req
.
getUidList
();
uidList
.
parallelStream
().
forEach
(
r
->
{
uidList
.
forEach
(
r
->
{
AdamUserInfoVo
userInfoVo
=
adamRdmService
.
getUserInfoVoByUid
(
r
);
AdamUserInfoVo
userInfoVo
=
adamRdmService
.
getUserInfoVoByUid
(
r
);
if
(
null
!=
userInfoVo
)
{
if
(
null
!=
userInfoVo
)
{
list
.
add
(
AdamChimeUinfoDto
.
getNew
().
copy
(
userInfoVo
));
list
.
add
(
AdamChimeUinfoDto
.
getNew
().
copy
(
userInfoVo
));
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
c877b74e
...
@@ -612,7 +612,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -612,7 +612,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
if
(!
CollectionUtils
.
isEmpty
(
memberRightsCouponVoList
))
{
if
(!
CollectionUtils
.
isEmpty
(
memberRightsCouponVoList
))
{
// 该权益下关联券统计
// 该权益下关联券统计
Map
<
String
,
Long
>
rightsCouponCtMap
=
memberRightsCouponVoList
.
parallelS
tream
()
Map
<
String
,
Long
>
rightsCouponCtMap
=
memberRightsCouponVoList
.
s
tream
()
.
collect
(
Collectors
.
groupingBy
(
AdamMemberRightsCouponVo:
:
getCouponId
,
Collectors
.
counting
()));
.
collect
(
Collectors
.
groupingBy
(
AdamMemberRightsCouponVo:
:
getCouponId
,
Collectors
.
counting
()));
rightsCouponCtMap
.
forEach
((
couponId
,
num
)
->
{
rightsCouponCtMap
.
forEach
((
couponId
,
num
)
->
{
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java
View file @
c877b74e
...
@@ -95,7 +95,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -95,7 +95,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
}
List
<
CandyUserCouponBasicDto
>
dtoList
=
redisDataUtils
.
getCouponByUid
(
uid
,
userCreateTime
);
List
<
CandyUserCouponBasicDto
>
dtoList
=
redisDataUtils
.
getCouponByUid
(
uid
,
userCreateTime
);
if
(!
CollectionUtil
.
isEmpty
(
dtoList
))
{
if
(!
CollectionUtil
.
isEmpty
(
dtoList
))
{
Map
<
String
,
Long
>
mCouponCountMap
=
dtoList
.
parallelS
tream
()
Map
<
String
,
Long
>
mCouponCountMap
=
dtoList
.
s
tream
()
.
filter
(
r
->
(
r
.
getExclusive
()
==
1
&&
r
.
getState
()
==
1
))
.
filter
(
r
->
(
r
.
getExclusive
()
==
1
&&
r
.
getState
()
==
1
))
.
collect
(
Collectors
.
groupingBy
(
CandyUserCouponBasicDto:
:
getMcouponId
,
Collectors
.
counting
()));
.
collect
(
Collectors
.
groupingBy
(
CandyUserCouponBasicDto:
:
getMcouponId
,
Collectors
.
counting
()));
...
...
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/biz/ChimeUserBiz.java
View file @
c877b74e
...
@@ -82,7 +82,7 @@ public class ChimeUserBiz {
...
@@ -82,7 +82,7 @@ public class ChimeUserBiz {
}
}
List
<
ChimeUserTagsMappingVo
>
userTagList
=
new
ArrayList
<>();
List
<
ChimeUserTagsMappingVo
>
userTagList
=
new
ArrayList
<>();
//设置用户id
//设置用户id
userTagVoList
.
parallelStream
().
forEach
(
vo
->
{
userTagVoList
.
forEach
(
vo
->
{
ChimeUserTagsMappingVo
userTagsMappingVo
=
ChimeUserTagsMappingVo
.
getNew
();
ChimeUserTagsMappingVo
userTagsMappingVo
=
ChimeUserTagsMappingVo
.
getNew
();
userTagsMappingVo
.
setTagCode
(
vo
.
getVal
());
userTagsMappingVo
.
setTagCode
(
vo
.
getVal
());
userTagsMappingVo
.
setTagDesc
(
vo
.
getDesc
());
userTagsMappingVo
.
setTagDesc
(
vo
.
getDesc
());
...
@@ -111,7 +111,7 @@ public class ChimeUserBiz {
...
@@ -111,7 +111,7 @@ public class ChimeUserBiz {
// }
// }
// }
// }
// //设置用户id
// //设置用户id
// userTagVoList.
parallelStream().
forEach(vo -> {
// userTagVoList.forEach(vo -> {
// ChimeUserTagDto userTagDto = ChimeUserTagDto.getNew();
// ChimeUserTagDto userTagDto = ChimeUserTagDto.getNew();
// userTagDto.setTagCode(vo.getVal());
// userTagDto.setTagCode(vo.getVal());
// userTagDto.setTagDesc(vo.getDesc());
// userTagDto.setTagDesc(vo.getDesc());
...
...
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/test/java/com/liquidnet/service/chime/test/TestDataUtils.java
View file @
c877b74e
...
@@ -242,7 +242,7 @@ public class TestDataUtils {
...
@@ -242,7 +242,7 @@ public class TestDataUtils {
// reqDto.setTags("tags40,tags80");
// reqDto.setTags("tags40,tags80");
NewPageResult
<
ChimeUserInfoDto
>
pageInfo
=
chimePerformanceService
.
getUserListByCon
(
reqDto
);
NewPageResult
<
ChimeUserInfoDto
>
pageInfo
=
chimePerformanceService
.
getUserListByCon
(
reqDto
);
log
.
info
(
"总共获取总数pagecount:{}"
,
pageInfo
.
getList
().
size
());
log
.
info
(
"总共获取总数pagecount:{}"
,
pageInfo
.
getList
().
size
());
pageInfo
.
getList
().
parallelStream
().
forEach
(
dto
->
{
pageInfo
.
getList
().
forEach
(
dto
->
{
// System.out.println(dto.getUserId());
// System.out.println(dto.getUserId());
// System.out.println(JsonUtils.toJson(dto.getUserTags()));
// System.out.println(JsonUtils.toJson(dto.getUserTags()));
});
});
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java
View file @
c877b74e
...
@@ -74,15 +74,15 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
...
@@ -74,15 +74,15 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
List
<
CandyUserCouponBasicDto
>
basicDtoList
=
candyUserCouponMapper
.
selectMultiForUserCouponBasicDto
(
uid
);
List
<
CandyUserCouponBasicDto
>
basicDtoList
=
candyUserCouponMapper
.
selectMultiForUserCouponBasicDto
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
List
<
String
>
couponIdList
=
basicDtoList
.
parallelS
tream
().
map
(
CandyUserCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
List
<
String
>
couponIdList
=
basicDtoList
.
s
tream
().
map
(
CandyUserCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
List
<
CandyCouponRuleDto
>
couponRuleDtoList
=
candyCouponRuleMapper
.
selectListForCouponRuleDto
(
couponIdList
);
List
<
CandyCouponRuleDto
>
couponRuleDtoList
=
candyCouponRuleMapper
.
selectListForCouponRuleDto
(
couponIdList
);
Map
<
String
,
List
<
CandyCouponRuleDto
>>
couponRuleDtoListMap
=
couponRuleDtoList
.
parallelS
tream
().
collect
(
Collectors
.
groupingBy
(
CandyCouponRuleDto:
:
getCouponId
));
Map
<
String
,
List
<
CandyCouponRuleDto
>>
couponRuleDtoListMap
=
couponRuleDtoList
.
s
tream
().
collect
(
Collectors
.
groupingBy
(
CandyCouponRuleDto:
:
getCouponId
));
// Map<String, List<CandyUserCouponBasicDto>> basicDtoListMap = basicDtoList.
parallelS
tream().collect(Collectors.groupingBy(CandyUserCouponBasicDto::getCouponId));
// Map<String, List<CandyUserCouponBasicDto>> basicDtoListMap = basicDtoList.
s
tream().collect(Collectors.groupingBy(CandyUserCouponBasicDto::getCouponId));
basicDtoList
.
parallelStream
().
forEach
(
dto
->
{
basicDtoList
.
forEach
(
dto
->
{
dto
.
setUseRules
(
couponRuleDtoListMap
.
get
(
dto
.
getCouponId
()));
dto
.
setUseRules
(
couponRuleDtoListMap
.
get
(
dto
.
getCouponId
()));
});
});
...
@@ -94,13 +94,13 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
...
@@ -94,13 +94,13 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
public
List
<
CandyCommonCouponBasicDto
>
ccouponBasicDtoByUidProcessing
(
LocalDateTime
ucreatedAt
)
{
public
List
<
CandyCommonCouponBasicDto
>
ccouponBasicDtoByUidProcessing
(
LocalDateTime
ucreatedAt
)
{
List
<
CandyCommonCouponBasicDto
>
basicDtoList
=
candyCommonCouponMapper
.
selectMultiForCommonCouponBasicDto
(
ucreatedAt
);
List
<
CandyCommonCouponBasicDto
>
basicDtoList
=
candyCommonCouponMapper
.
selectMultiForCommonCouponBasicDto
(
ucreatedAt
);
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
List
<
String
>
couponIdList
=
basicDtoList
.
parallelS
tream
().
map
(
CandyCommonCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
List
<
String
>
couponIdList
=
basicDtoList
.
s
tream
().
map
(
CandyCommonCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
List
<
CandyCouponRuleDto
>
couponRuleDtoList
=
candyCouponRuleMapper
.
selectListForCouponRuleDto
(
couponIdList
);
List
<
CandyCouponRuleDto
>
couponRuleDtoList
=
candyCouponRuleMapper
.
selectListForCouponRuleDto
(
couponIdList
);
Map
<
String
,
List
<
CandyCouponRuleDto
>>
couponRuleDtoListMap
=
couponRuleDtoList
.
parallelS
tream
().
collect
(
Collectors
.
groupingBy
(
CandyCouponRuleDto:
:
getCouponId
));
Map
<
String
,
List
<
CandyCouponRuleDto
>>
couponRuleDtoListMap
=
couponRuleDtoList
.
s
tream
().
collect
(
Collectors
.
groupingBy
(
CandyCouponRuleDto:
:
getCouponId
));
basicDtoList
.
parallelStream
().
forEach
(
dto
->
{
basicDtoList
.
forEach
(
dto
->
{
dto
.
setUseRules
(
couponRuleDtoListMap
.
get
(
dto
.
getCouponId
()));
dto
.
setUseRules
(
couponRuleDtoListMap
.
get
(
dto
.
getCouponId
()));
});
});
...
...
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