Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
b848c184
Commit
b848c184
authored
Jun 09, 2020
by
吴博
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wb_feat_1002944' into 'master'
bug 1002944 修复长期权益存储 See merge request rays/pcloud-book!760
parents
408abef4
0822fae4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
RightsSettingBizImpl.java
...oud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
+6
-7
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
View file @
b848c184
...
...
@@ -323,15 +323,14 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
if
(
ListUtils
.
isEmpty
(
list
))
{
return
;
}
Map
<
String
,
Long
>
mapRightsSettingItem
=
list
.
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getUuid
(),
x
->
x
.
getId
()));
// 处理
周
权益子对象列表数据
List
<
RightsSettingItemDetail
>
week
ItemDetails
=
this
.
buildRightsSettingItemDetailList
(
rightsSetting
.
getRightsSetting
Week
Items
(),
mapRightsSettingItem
);
// 整合
周
权益的子项列表数据
// 处理
长期
权益子对象列表数据
List
<
RightsSettingItemDetail
>
longTerm
ItemDetails
=
this
.
buildRightsSettingItemDetailList
(
rightsSetting
.
getRightsSetting
LongTerm
Items
(),
mapRightsSettingItem
);
// 整合
长期
权益的子项列表数据
List
<
RightsSettingItemDetail
>
saveItemDetails
=
Lists
.
newArrayList
();
if
(!
ListUtils
.
isEmpty
(
week
ItemDetails
))
{
saveItemDetails
.
addAll
(
week
ItemDetails
);
if
(!
ListUtils
.
isEmpty
(
longTerm
ItemDetails
))
{
saveItemDetails
.
addAll
(
longTerm
ItemDetails
);
}
// 存储子项列表数据
rightsSettingItemDetailDao
.
insert
(
saveItemDetails
);
...
...
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