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
9ab040eb
Commit
9ab040eb
authored
Nov 24, 2020
by
田超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1003898' into 'master'
feat: [1003898] 小睿书扫码落地页改版 See merge request rays/pcloud-book!1049
parents
08142ebb
212bf1a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
BookGroupBizImpl.java
...java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
+8
-0
RightsSettingConstant.java
...d/book/rightsSetting/constants/RightsSettingConstant.java
+13
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
View file @
9ab040eb
package
com
.
pcloud
.
book
.
group
.
biz
.
impl
;
package
com
.
pcloud
.
book
.
group
.
biz
.
impl
;
import
cn.hutool.core.collection.CollUtil
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
...
@@ -5258,7 +5259,14 @@ public class BookGroupBizImpl implements BookGroupBiz {
...
@@ -5258,7 +5259,14 @@ public class BookGroupBizImpl implements BookGroupBiz {
}
}
//书刊分类对应的小睿分类
//书刊分类对应的小睿分类
BookAdviserDto
adviserDto
=
bookAdviserDao
.
getBase
(
bookId
,
channelId
,
adviserId
);
BookAdviserDto
adviserDto
=
bookAdviserDao
.
getBase
(
bookId
,
channelId
,
adviserId
);
map
.
put
(
"isK12"
,
Boolean
.
FALSE
);
if
(
null
!=
adviserDto
)
{
if
(
null
!=
adviserDto
)
{
// 新增判断是否K12分类
if
(
Objects
.
nonNull
(
adviserDto
.
getTempletId
()))
{
if
(
CollUtil
.
toList
(
RightsSettingConstant
.
K12_TEMPLATE_IDS
).
contains
(
adviserDto
.
getTempletId
()))
{
map
.
put
(
"isK12"
,
Boolean
.
TRUE
);
}
}
Long
raysClassifyId
=
bookRaysClassifyDao
.
getClassifyIdByBookTemplateId
(
adviserDto
.
getTempletId
());
Long
raysClassifyId
=
bookRaysClassifyDao
.
getClassifyIdByBookTemplateId
(
adviserDto
.
getTempletId
());
if
(
null
!=
raysClassifyId
)
{
if
(
null
!=
raysClassifyId
)
{
map
.
put
(
"raysClassifyId"
,
raysClassifyId
);
map
.
put
(
"raysClassifyId"
,
raysClassifyId
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/constants/RightsSettingConstant.java
View file @
9ab040eb
...
@@ -59,4 +59,17 @@ public class RightsSettingConstant {
...
@@ -59,4 +59,17 @@ public class RightsSettingConstant {
* 答案课程中专享社群引流
* 答案课程中专享社群引流
*/
*/
public
static
final
String
ANSWER_GROUP
=
CacheConstant
.
BOOK
+
"RIGHTS_SETTING:answer_group"
;
public
static
final
String
ANSWER_GROUP
=
CacheConstant
.
BOOK
+
"RIGHTS_SETTING:answer_group"
;
/**
* feat: [1003898] 小睿书扫码落地页改版
* K12 分类
* <p>
* 0: {assistTempletId: 48L, typeCode: "IMPORTED_HIGER", templetName: "K12同步教材教辅",…}
* 1: {assistTempletId: 59L, typeCode: "SPECIAL_SMALL", templetName: "K12教材教辅专项",…}
* 2: {assistTempletId: 46L, typeCode: "VACATION", templetName: "K12假期作业",…}
* 3: {assistTempletId: 40L, typeCode: "K12", templetName: "K12试卷",…}
* 4: {assistTempletId: 65L, typeCode: "TEACHING_NEWSPAPER", templetName: "K12报刊",…}
* </p>
*/
public
static
final
Long
[]
K12_TEMPLATE_IDS
=
{
48L
,
59L
,
46L
,
40L
,
65L
};
}
}
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