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
6cc4adcd
Commit
6cc4adcd
authored
Oct 16, 2020
by
吴博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [none] 更改出版社及资源数量
parent
1326a416
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
AppletUserBookcaseBizImpl.java
...cloud/book/applet/biz/impl/AppletUserBookcaseBizImpl.java
+12
-1
BookGroupBizImpl.java
...java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
+2
-2
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletUserBookcaseBizImpl.java
View file @
6cc4adcd
package
com
.
pcloud
.
book
.
applet
.
biz
.
impl
;
import
com.google.common.collect.Lists
;
import
com.google.gson.internal.
$Gson$Preconditions
;
import
com.pcloud.appcenter.assist.dto.AssistTempletDTO
;
import
com.pcloud.book.applet.biz.AppletNewsBiz
;
...
...
@@ -21,6 +22,8 @@ import com.pcloud.book.book.dao.BookRaysClassifyDao;
import
com.pcloud.book.book.entity.BookRaysClassify
;
import
com.pcloud.book.consumer.app.AssistTempletConsr
;
import
com.pcloud.book.consumer.common.ExportConsr
;
import
com.pcloud.book.consumer.user.AdviserConsr
;
import
com.pcloud.book.consumer.user.AgentConsr
;
import
com.pcloud.book.copyright.tools.ExcelUtil
;
import
com.pcloud.book.es.biz.ESBookAndAdviserBiz
;
import
com.pcloud.book.group.biz.BookGroupBiz
;
...
...
@@ -49,6 +52,7 @@ import com.pcloud.common.utils.ListUtils;
import
com.pcloud.common.utils.cache.redis.JedisClusterUtils
;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.MapUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -102,6 +106,8 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
private
BookAdviserBiz
bookAdviserBiz
;
@Autowired
private
ExportConsr
exportConsr
;
@Autowired
private
AdviserConsr
adviserConsr
;
@Override
public
void
addUserBook
(
AppletUserBookcase
appletUserBookcase
)
{
...
...
@@ -438,7 +444,12 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
if
(
userBookInfoByWechatUserId
==
null
){
return
new
AppletUserBookcaseDTO
();
}
if
(
StringUtil
.
isEmpty
(
userBookInfoByWechatUserId
.
getPublish
())
&&
null
!=
adviserId
)
{
Map
<
Long
,
AdviserBaseInfoDto
>
adviserId2AdviserInfoDtoMap
=
adviserConsr
.
getAdviserId2AdviserInfoDtoMap
(
Lists
.
newArrayList
(
adviserId
));
if
(
MapUtils
.
isNotEmpty
(
adviserId2AdviserInfoDtoMap
)
&&
null
!=
adviserId2AdviserInfoDtoMap
.
get
(
adviserId
))
{
userBookInfoByWechatUserId
.
setAgentName
(
adviserId2AdviserInfoDtoMap
.
get
(
adviserId
).
getAgentName
());
}
}
List
<
AppletUserBookcaseDTO
>
appletUserBookcaseDTOS
=
Collections
.
singletonList
(
userBookInfoByWechatUserId
);
fillTempletName
(
appletUserBookcaseDTOS
);
fillRightsSettingAndResourceCount
(
appletUserBookcaseDTOS
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
View file @
6cc4adcd
...
...
@@ -5253,9 +5253,9 @@ public class BookGroupBizImpl implements BookGroupBiz {
}
map
.
put
(
"isXIAORUI"
,
isXIAORUI
);
//资源数量
List
<
BookServeDTO
>
serveDTOList
=
this
.
getBookAndBookGroupServeIds
(
adviserId
,
bookId
,
channelId
);
/*
List<BookServeDTO> serveDTOList = this.getBookAndBookGroupServeIds(adviserId, bookId, channelId);
this.removeCanNotBuy(serveDTOList);
map
.
put
(
"resourceCount"
,
ListUtils
.
isEmpty
(
serveDTOList
)
?
0
:
serveDTOList
.
size
());
map.put("resourceCount", ListUtils.isEmpty(serveDTOList) ? 0 : serveDTOList.size());
*/
return
map
;
}
...
...
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