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
a1ad5d2b
Commit
a1ad5d2b
authored
Mar 22, 2021
by
郑勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1004450] ERP设置权限查看数据,GMV,扫码量,bookid
parent
9d6e0300
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
4 deletions
+50
-4
BookDto.java
...-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
+13
-0
BookAdviserBizImpl.java
...ava/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
+13
-4
BookBizImpl.java
.../main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
+7
-0
TradeConsr.java
.../main/java/com/pcloud/book/consumer/trade/TradeConsr.java
+17
-0
No files found.
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
View file @
a1ad5d2b
...
@@ -791,6 +791,19 @@ public class BookDto extends BaseDto {
...
@@ -791,6 +791,19 @@ public class BookDto extends BaseDto {
*/
*/
private
Boolean
xiaoRuiEducation
;
private
Boolean
xiaoRuiEducation
;
/**
* 书刊销售额
*/
private
BigDecimal
bookGmv
;
public
BigDecimal
getBookGmv
()
{
return
bookGmv
;
}
public
void
setBookGmv
(
BigDecimal
bookGmv
)
{
this
.
bookGmv
=
bookGmv
;
}
public
Boolean
getXiaoRuiEducation
()
{
public
Boolean
getXiaoRuiEducation
()
{
return
xiaoRuiEducation
;
return
xiaoRuiEducation
;
}
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
View file @
a1ad5d2b
...
@@ -1497,10 +1497,19 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
...
@@ -1497,10 +1497,19 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
bookDataStatisticsDTO
.
setAdviserId
(
bookGroupDTO
.
getCreateUser
());
bookDataStatisticsDTO
.
setAdviserId
(
bookGroupDTO
.
getCreateUser
());
bookDataStatisticsDTO
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookDataStatisticsDTO
.
setBookId
(
bookGroupDTO
.
getBookId
());
bookDataStatisticsDTO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
bookDataStatisticsDTO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
if
(
groupUserCountDTO
!=
null
){
bookDataStatisticsDTO
.
setScanCount
(
0L
);
bookDataStatisticsDTO
.
setScanCount
(
groupUserCountDTO
.
getCount
().
longValue
());
bookDataStatisticsDTO
.
setUserCount
(
0L
);
bookDataStatisticsDTO
.
setUserCount
(
groupUserCountDTO
.
getUserCount
().
longValue
());
if
(
groupUserCountDTO
!=
null
){
}
bookDataStatisticsDTO
.
setScanCount
(
groupUserCountDTO
.
getCount
().
longValue
());
bookDataStatisticsDTO
.
setUserCount
(
groupUserCountDTO
.
getUserCount
().
longValue
());
}
if
(
resultMap
.
containsKey
(
bookDataStatisticsDTO
.
getBookChannelAdviserId
())){
BookDataStatisticsDTO
bookDataStatisticsDTO1
=
resultMap
.
get
(
bookDataStatisticsDTO
.
getBookChannelAdviserId
());
if
(
null
!=
bookDataStatisticsDTO1
){
bookDataStatisticsDTO
.
setScanCount
(
bookDataStatisticsDTO1
.
getScanCount
()
+
bookDataStatisticsDTO
.
getScanCount
());
bookDataStatisticsDTO
.
setUserCount
(
bookDataStatisticsDTO1
.
getUserCount
()
+
bookDataStatisticsDTO
.
getUserCount
());
}
}
bookDataStatisticsDTO
.
setBookCategory
(
JoinGroupTypeEnum
.
getBookTypeName
(
bookGroupDTO
.
getJoinGroupType
()));
bookDataStatisticsDTO
.
setBookCategory
(
JoinGroupTypeEnum
.
getBookTypeName
(
bookGroupDTO
.
getJoinGroupType
()));
bookDataStatisticsDTO
.
setJoinGroupType
(
bookGroupDTO
.
getJoinGroupType
());
bookDataStatisticsDTO
.
setJoinGroupType
(
bookGroupDTO
.
getJoinGroupType
());
/*if(rightsMap.containsKey(bookGroupDTO.getBookId())){
/*if(rightsMap.containsKey(bookGroupDTO.getBookId())){
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
View file @
a1ad5d2b
...
@@ -52,6 +52,7 @@ import com.pcloud.book.consumer.label.LabelConsr;
...
@@ -52,6 +52,7 @@ import com.pcloud.book.consumer.label.LabelConsr;
import
com.pcloud.book.consumer.message.MessageConsr
;
import
com.pcloud.book.consumer.message.MessageConsr
;
import
com.pcloud.book.consumer.raystask.MainLineConsr
;
import
com.pcloud.book.consumer.raystask.MainLineConsr
;
import
com.pcloud.book.consumer.resource.ProductConsr
;
import
com.pcloud.book.consumer.resource.ProductConsr
;
import
com.pcloud.book.consumer.trade.TradeConsr
;
import
com.pcloud.book.consumer.user.*
;
import
com.pcloud.book.consumer.user.*
;
import
com.pcloud.book.consumer.wechat.WechatConsr
;
import
com.pcloud.book.consumer.wechat.WechatConsr
;
import
com.pcloud.book.copyright.biz.BookAuthInfoBiz
;
import
com.pcloud.book.copyright.biz.BookAuthInfoBiz
;
...
@@ -264,6 +265,8 @@ public class BookBizImpl implements BookBiz {
...
@@ -264,6 +265,8 @@ public class BookBizImpl implements BookBiz {
@Autowired
@Autowired
private
SceneRecordService
sceneRecordService
;
private
SceneRecordService
sceneRecordService
;
@Autowired
private
TradeConsr
tradeConsr
;
/**
/**
* 创建书籍,同时建立与编辑的推广关系
* 创建书籍,同时建立与编辑的推广关系
*/
*/
...
@@ -807,6 +810,7 @@ public class BookBizImpl implements BookBiz {
...
@@ -807,6 +810,7 @@ public class BookBizImpl implements BookBiz {
paramMap
.
put
(
"adviserIds"
,
bookDetailDTO
.
getAdviserIds
());
paramMap
.
put
(
"adviserIds"
,
bookDetailDTO
.
getAdviserIds
());
List
<
BookDto
>
bookDtos
=
bookDao
.
listBookGroupByBookIds
(
bookDetailDTO
.
getBookIds
(),
bookDetailDTO
.
getChannelIds
(),
bookDetailDTO
.
getAdviserIds
());
List
<
BookDto
>
bookDtos
=
bookDao
.
listBookGroupByBookIds
(
bookDetailDTO
.
getBookIds
(),
bookDetailDTO
.
getChannelIds
(),
bookDetailDTO
.
getAdviserIds
());
List
<
Long
>
xiaoRuiEducation
=
channelConsr
.
isXiaoRuiEducation
(
bookDetailDTO
.
getBookIds
());
List
<
Long
>
xiaoRuiEducation
=
channelConsr
.
isXiaoRuiEducation
(
bookDetailDTO
.
getBookIds
());
Map
<
Long
,
BigDecimal
>
booksGmv
=
tradeConsr
.
getBooksGmv
(
bookDetailDTO
.
getBookIds
());
if
(!
ListUtils
.
isEmpty
(
bookDtos
))
{
if
(!
ListUtils
.
isEmpty
(
bookDtos
))
{
for
(
BookDto
bookDto
:
bookDtos
)
{
for
(
BookDto
bookDto
:
bookDtos
)
{
bookDto
.
setXiaoRuiEducation
(
false
);
bookDto
.
setXiaoRuiEducation
(
false
);
...
@@ -814,6 +818,9 @@ public class BookBizImpl implements BookBiz {
...
@@ -814,6 +818,9 @@ public class BookBizImpl implements BookBiz {
if
(
CollUtil
.
isNotEmpty
(
xiaoRuiEducation
)
&&
xiaoRuiEducation
.
contains
(
bookDto
.
getBookId
())){
if
(
CollUtil
.
isNotEmpty
(
xiaoRuiEducation
)
&&
xiaoRuiEducation
.
contains
(
bookDto
.
getBookId
())){
bookDto
.
setXiaoRuiEducation
(
true
);
bookDto
.
setXiaoRuiEducation
(
true
);
}
}
if
(
CollUtil
.
isNotEmpty
(
booksGmv
)
&&
booksGmv
.
containsKey
(
bookDto
.
getBookId
())){
bookDto
.
setBookGmv
(
booksGmv
.
get
(
bookDto
.
getBookId
()));
}
}
}
}
}
}
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/consumer/trade/TradeConsr.java
View file @
a1ad5d2b
...
@@ -312,4 +312,21 @@ public class TradeConsr {
...
@@ -312,4 +312,21 @@ public class TradeConsr {
}
}
return
new
HashMap
<>();
return
new
HashMap
<>();
}
}
/**
* 获取书刊销售额
* @param bookIds
* @return
*/
public
Map
<
Long
,
BigDecimal
>
getBooksGmv
(
List
<
Long
>
bookIds
)
{
if
(
CollUtil
.
isEmpty
(
bookIds
))
{
return
new
HashMap
<>();
}
try
{
return
ResponseHandleUtil
.
parseMap
(
orderFormService
.
getBooksGmv
(
bookIds
),
Long
.
class
,
BigDecimal
.
class
);
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
"查询书刊销售额失败.[getBooksGmv]:{}"
,
e
.
getMessage
(),
e
);
}
return
new
HashMap
<>();
}
}
}
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