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
f611af87
Commit
f611af87
authored
May 26, 2021
by
朱亚洁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:[1004824]RAYS码扫码后客户端支持展示二维码名称
parent
35feac20
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
0 deletions
+26
-0
QrcodeSceneConsr.java
...va/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java
+12
-0
ResourcePageBizImpl.java
...a/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
+5
-0
ResourcePageVO.java
...rc/main/java/com/pcloud/book/group/vo/ResourcePageVO.java
+9
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java
View file @
f611af87
...
@@ -585,4 +585,16 @@ public class QrcodeSceneConsr {
...
@@ -585,4 +585,16 @@ public class QrcodeSceneConsr {
}
}
return
new
ArrayList
<>();
return
new
ArrayList
<>();
}
}
public
Integer
getPushTextOpenStatus
(
Long
adviserId
)
{
if
(
null
==
adviserId
)
{
return
0
;
}
try
{
return
ResponseHandleUtil
.
parseResponse
(
qrcodeSceneService
.
getPushTextOpenStatus
(
adviserId
),
Integer
.
class
);
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
"调用getPushTextOpenStatus失败"
+
e
.
getMessage
(),
e
);
}
return
0
;
}
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
View file @
f611af87
...
@@ -1018,6 +1018,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -1018,6 +1018,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
ResourcePageCollect
collect
=
resourcePageCollectDao
.
getCollectRecordByUser
(
wechatUserId
,
resourcePageVO
.
getId
());
ResourcePageCollect
collect
=
resourcePageCollectDao
.
getCollectRecordByUser
(
wechatUserId
,
resourcePageVO
.
getId
());
resourcePageVO
.
setCollectState
(
null
==
collect
?
0
:
1
);
resourcePageVO
.
setCollectState
(
null
==
collect
?
0
:
1
);
}
}
if
(
null
!=
resourcePageVO
.
getAdviserId
())
{
resourcePageVO
.
setPushTextOpenStatus
(
qrcodeSceneConsr
.
getPushTextOpenStatus
(
resourcePageVO
.
getAdviserId
()));
}
return
resourcePageVO
;
return
resourcePageVO
;
}
}
...
@@ -1030,6 +1033,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -1030,6 +1033,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO
.
setBookId
(
bookGroupDTO
.
getBookId
());
resourcePageVO
.
setBookId
(
bookGroupDTO
.
getBookId
());
resourcePageVO
.
setAdviserId
(
bookGroupDTO
.
getCreateUser
());
resourcePageVO
.
setAdviserId
(
bookGroupDTO
.
getCreateUser
());
resourcePageVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
resourcePageVO
.
setChannelId
(
bookGroupDTO
.
getChannelId
());
resourcePageVO
.
setQrcodeName
(
bookGroupDTO
.
getGroupQrcodeName
());
resourcePageVO
.
setAgentName
(
agentConsr
.
getNameById
(
bookGroupDTO
.
getAgentId
()));
resourcePageVO
.
setAgentName
(
agentConsr
.
getNameById
(
bookGroupDTO
.
getAgentId
()));
BookDto
bookDto
=
bookBiz
.
getBaseById
(
bookGroupDTO
.
getBookId
());
BookDto
bookDto
=
bookBiz
.
getBaseById
(
bookGroupDTO
.
getBookId
());
if
(
null
!=
bookDto
)
{
if
(
null
!=
bookDto
)
{
...
@@ -1066,6 +1070,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
...
@@ -1066,6 +1070,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageVO
.
setChannelId
(
qrcodeSceneDto
.
getChannelPartyId
());
resourcePageVO
.
setChannelId
(
qrcodeSceneDto
.
getChannelPartyId
());
resourcePageVO
.
setBookImg
(
qrcodeSceneDto
.
getBook
().
getCoverImg
());
resourcePageVO
.
setBookImg
(
qrcodeSceneDto
.
getBook
().
getCoverImg
());
resourcePageVO
.
setBookName
(
qrcodeSceneDto
.
getBook
().
getBookName
());
resourcePageVO
.
setBookName
(
qrcodeSceneDto
.
getBook
().
getBookName
());
resourcePageVO
.
setQrcodeName
(
qrcodeSceneDto
.
getSceneName
());
Long
adviserId
=
qrcodeSceneDto
.
getCreatedByUserLogin
();
Long
adviserId
=
qrcodeSceneDto
.
getCreatedByUserLogin
();
Map
<
Long
,
AdviserBaseInfoDto
>
agentMap
=
adviserConsr
.
getAdviserId2AdviserInfoDtoMap
(
Arrays
.
asList
(
adviserId
));
Map
<
Long
,
AdviserBaseInfoDto
>
agentMap
=
adviserConsr
.
getAdviserId2AdviserInfoDtoMap
(
Arrays
.
asList
(
adviserId
));
if
(!
MapUtils
.
isEmpty
(
agentMap
))
{
if
(!
MapUtils
.
isEmpty
(
agentMap
))
{
...
...
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java
View file @
f611af87
...
@@ -70,4 +70,12 @@ public class ResourcePageVO extends BaseDto {
...
@@ -70,4 +70,12 @@ public class ResourcePageVO extends BaseDto {
* 自定义配置的图书封面
* 自定义配置的图书封面
*/
*/
private
String
bookCover
;
private
String
bookCover
;
/**
* 二维码名称
*/
private
String
qrcodeName
;
/**
* 扫码推送二维码名称权限状态
*/
private
Integer
pushTextOpenStatus
;
}
}
\ No newline at end of file
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