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
1f342684
Commit
1f342684
authored
Jul 17, 2020
by
吴博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1003186] 本书立享权益客户端样式问题
parent
807a2fb1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
AppletNewsDTO.java
...c/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java
+2
-1
RightsSettingBizImpl.java
...oud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
+6
-1
RightsNowItem.java
...a/com/pcloud/book/rightsSetting/entity/RightsNowItem.java
+10
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java
View file @
1f342684
...
@@ -97,7 +97,8 @@ public class AppletNewsDTO extends BaseDto {
...
@@ -97,7 +97,8 @@ public class AppletNewsDTO extends BaseDto {
private
Integer
showLink
;
private
Integer
showLink
;
@ApiModelProperty
(
"浏览量pv"
)
@ApiModelProperty
(
"浏览量pv"
)
private
Integer
browseCount
;
private
Integer
browseCount
;
@ApiModelProperty
(
"选取的服务"
)
@ApiModelProperty
(
"选取的服务"
)
List
<
AppletNewsServeDTO
>
appletNewsServeList
;
List
<
AppletNewsServeDTO
>
appletNewsServeList
;
@ApiModelProperty
(
"文章版式(1多图文2单图文3纯图片4纯文本)"
)
private
Integer
newsType
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
View file @
1f342684
...
@@ -832,6 +832,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
...
@@ -832,6 +832,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
if
(
appletNewsDTO
==
null
)
{
if
(
appletNewsDTO
==
null
)
{
continue
;
continue
;
}
}
appletNewsDTO
.
setNewsType
(
appletNewsDTO
.
getType
());
rightsSettingItem
.
getAppletNewsDTOS
().
add
(
appletNewsDTO
);
rightsSettingItem
.
getAppletNewsDTOS
().
add
(
appletNewsDTO
);
}
}
}
else
if
(!
ListUtils
.
isEmpty
(
itemDetailList
)
&&
RightsServeTypeEnum
.
PLAN
.
name
()
}
else
if
(!
ListUtils
.
isEmpty
(
itemDetailList
)
&&
RightsServeTypeEnum
.
PLAN
.
name
()
...
@@ -1219,12 +1220,17 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
...
@@ -1219,12 +1220,17 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
item
.
setSource
(
appletNewsDTO
.
getSource
());
item
.
setSource
(
appletNewsDTO
.
getSource
());
// item的type字段跟appletNewsDTO的type字段有些冲突,前端会根据type来展示不同的样式
// item的type字段跟appletNewsDTO的type字段有些冲突,前端会根据type来展示不同的样式
//item.setType(appletNewsDTO.getType());
//item.setType(appletNewsDTO.getType());
item
.
setNewsType
(
appletNewsDTO
.
getType
());
item
.
setServeId
(
appletNewsDTO
.
getId
());
item
.
setServeId
(
appletNewsDTO
.
getId
());
item
.
setServePic
(
appletNewsDTO
.
getPic1
());
item
.
setServePic
(
appletNewsDTO
.
getPic1
());
item
.
setServeName
(
appletNewsDTO
.
getNewsName
());
item
.
setServeName
(
appletNewsDTO
.
getNewsName
());
item
.
setServeTypeName
(
"资讯"
);
item
.
setServeTypeName
(
"资讯"
);
item
.
setJumpType
(
appletNewsDTO
.
getJumpType
());
item
.
setJumpType
(
appletNewsDTO
.
getJumpType
());
item
.
setJumpUrl
(
appletNewsDTO
.
getJumpUrl
());
item
.
setJumpUrl
(
appletNewsDTO
.
getJumpUrl
());
item
.
setPic1
(
appletNewsDTO
.
getPic1
());
item
.
setPic2
(
appletNewsDTO
.
getPic2
());
item
.
setPic3
(
appletNewsDTO
.
getPic3
());
item
.
setDigest
(
appletNewsDTO
.
getDigest
());
}
}
}
}
}
}
...
@@ -1783,7 +1789,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
...
@@ -1783,7 +1789,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
groupActivity4AppletDTOList
=
pcloudGroupActivityBiz
.
getTishBookSchoolListWrap
(
baseTempletClassify
,
top
);
groupActivity4AppletDTOList
=
pcloudGroupActivityBiz
.
getTishBookSchoolListWrap
(
baseTempletClassify
,
top
);
}
}
}
}
if
(
ListUtils
.
isEmpty
(
groupActivity4AppletDTOList
))
{
if
(
ListUtils
.
isEmpty
(
groupActivity4AppletDTOList
))
{
// 如果书刊没拿到群,则通过权益分类拿群
// 如果书刊没拿到群,则通过权益分类拿群
RightsSetting
rightsSetting
=
rightsSettingDAO
.
selectByPrimaryKey
(
rightsSettingId
);
RightsSetting
rightsSetting
=
rightsSettingDAO
.
selectByPrimaryKey
(
rightsSettingId
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsNowItem.java
View file @
1f342684
...
@@ -97,5 +97,15 @@ public class RightsNowItem extends BaseEntity {
...
@@ -97,5 +97,15 @@ public class RightsNowItem extends BaseEntity {
private
BigDecimal
price
;
private
BigDecimal
price
;
@ApiModelProperty
(
"群类型 2:编辑端群"
)
@ApiModelProperty
(
"群类型 2:编辑端群"
)
private
String
groupType
;
private
String
groupType
;
@ApiModelProperty
(
"文章版式(1多图文2单图文3纯图片4纯文本)"
)
private
Integer
newsType
;
@ApiModelProperty
(
"预览图片1"
)
private
String
pic1
;
@ApiModelProperty
(
"预览图片2"
)
private
String
pic2
;
@ApiModelProperty
(
"预览图片3"
)
private
String
pic3
;
@ApiModelProperty
(
"内容摘要"
)
private
String
digest
;
}
}
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