Skip to content

M
midjourney-proxy
Commit 969d143c by 郑永强
Options

feat: [1004809] 轻工-开启世间食记

parent 3cc6fe99
Showing with 84 additions and 6 deletions
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java
......@@ -338,4 +338,10 @@ public interface ResourcePageBiz {
* @param channelIds
*/
Map<String, BookGroupServeCountDTO> mapRaysCodeServeCount(List<Long> adviserIds, List<Long> bookIds, List<Long> channelIds);
/**
* 获取所有开启“轻工-世纪食记”的书刊
* @return
*/
List<ResourcePageVO> getAllBook4OpenFood();
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
......@@ -227,6 +227,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
} else {
resourcePage.setStyle(updateResourcePageVO.getStyle());
resourcePage.setOpenRays(updateResourcePageVO.getOpenRays());
resourcePage.setOpenFood(updateResourcePageVO.getOpenFood());
resourcePage.setShowBook(updateResourcePageVO.getShowBook());
resourcePage.setBookCover(updateResourcePageVO.getBookCover());
//同步bookGroupId
......@@ -1123,6 +1124,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (!MapUtils.isEmpty(agentMap)) {
resourcePageVO.setAgentName(agentMap.get(adviserId).getAgentName());
}
AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(qrcodeSceneDto.getChannelPartyId());
if(accountSettingDto != null){
resourcePageVO.setAccountSettingId(accountSettingDto.getAccountSettingId());
}
}
//小程序
BookAppletScene bookAppletScene = bookAppletSceneDao.getBySceneId(sceneId);
......@@ -1131,6 +1136,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (null != resourcePage) {
resourcePageVO.setShowBook(resourcePage.getShowBook());
resourcePageVO.setOpenRays(resourcePage.getOpenRays());
resourcePageVO.setOpenFood(resourcePage.getOpenFood());
resourcePageVO.setStyle(resourcePage.getStyle());
resourcePageVO.setQrcodeUrl(resourcePage.getQrcodeUrl());
resourcePageVO.setId(resourcePage.getId());
......@@ -1704,4 +1710,26 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
}
return resourcePageDao.mapRaysCodeServeCount(adviserIds, bookIds, channelIds);
}
@Override
public List<ResourcePageVO> getAllBook4OpenFood() {
List<ResourcePageVO> resourcePageList = resourcePageDao.getAllBook4OpenFood();
if(CollUtil.isEmpty(resourcePageList)){
return CollUtil.toList();
}
List<Long> bookIds = resourcePageList.stream().map(x -> x.getBookId()).collect(Collectors.toList());
if(CollUtil.isEmpty(bookIds)){
return CollUtil.toList();
}
Map<Long, BookDto> mapBook = bookBiz.getListByIds(bookIds);
for (ResourcePageVO vo : resourcePageList) {
Long bookId = vo.getBookId();
BookDto bookDto = mapBook.get(bookId);
if(bookDto == null){
continue;
}
vo.setBookName(bookDto.getBookName());
vo.setBookImg(bookDto.getCoverImg());
}
return resourcePageList;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageDao.java
......@@ -3,6 +3,7 @@ package com.pcloud.book.group.dao;
import com.pcloud.book.group.dto.AddBookGroupServeDTO;
import com.pcloud.book.group.dto.BookGroupServeCountDTO;
import com.pcloud.book.group.entity.ResourcePage;
import com.pcloud.book.group.vo.ResourcePageVO;
import com.pcloud.common.core.dao.BaseDao;
import java.util.List;
......@@ -108,4 +109,6 @@ public interface ResourcePageDao extends BaseDao<ResourcePage>{
Boolean isOpenRaysBook(Long bookId, Long channelId, Long adviserId);
Map<String, BookGroupServeCountDTO> mapRaysCodeServeCount(List<Long> adviserIds, List<Long> bookIds, List<Long> channelIds);
List<ResourcePageVO> getAllBook4OpenFood();
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageDaoImpl.java
......@@ -4,6 +4,7 @@ import com.pcloud.book.group.dao.ResourcePageDao;
import com.pcloud.book.group.dto.AddBookGroupServeDTO;
import com.pcloud.book.group.dto.BookGroupServeCountDTO;
import com.pcloud.book.group.entity.ResourcePage;
import com.pcloud.book.group.vo.ResourcePageVO;
import com.pcloud.common.core.dao.BaseDaoImpl;
import com.pcloud.common.utils.ListUtils;
......@@ -124,4 +125,9 @@ public class ResourcePageDaoImpl extends BaseDaoImpl<ResourcePage> implements Re
return getSessionTemplate().selectMap(getStatement("mapRaysCodeServeCount"), map, "bookChannelAdviserId");
}
}
@Override
public List<ResourcePageVO> getAllBook4OpenFood() {
return getSessionTemplate().selectList(getStatement("getAllBook4OpenFood"));
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePage.java
......@@ -30,6 +30,10 @@ public class ResourcePage extends BaseEntity {
*/
private Integer openRays;
/**
* 是否开启世间食记
*/
private Integer openFood;
/**
* 创建人
*/
private Long createUser;
......
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java
......@@ -2,6 +2,7 @@ package com.pcloud.book.group.facade.impl;
import com.pcloud.book.group.biz.ResourcePageBiz;
import com.pcloud.book.group.entity.ResourcePageCollect;
import com.pcloud.book.group.vo.ResourcePageVO;
import com.pcloud.book.group.vo.UpdateResourceColumnVO;
import com.pcloud.book.group.vo.UpdateResourcePageVO;
import com.pcloud.channelcenter.qrcode.dto.BookSceneIdListDTO;
......@@ -231,4 +232,10 @@ public class ResourcePageFacade {
resourcePageBiz.addNewUserRecord(resourcePageCollect);
return new ResponseDto<>();
}
@ApiOperation("获取所有开启“轻工-世间食记”的书刊")
@GetMapping("getAllBook4OpenFood")
public ResponseDto<List<ResourcePageVO>> getAllBook4OpenFood(){
return new ResponseDto<>(resourcePageBiz.getAllBook4OpenFood());
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java
......@@ -31,6 +31,10 @@ public class ResourcePageVO extends BaseDto {
*/
private Integer openRays;
/**
* 是否开启世间食记
*/
private Integer openFood;
/**
* 书刊封面
*/
private String bookImg;
......@@ -58,6 +62,7 @@ public class ResourcePageVO extends BaseDto {
private Long bookId;
private Long channelId;
private Long adviserId;
private Long accountSettingId;
/**
* 收藏状态
......
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourcePageVO.java
......@@ -34,6 +34,10 @@ public class UpdateResourcePageVO {
*/
private Integer openRays;
/**
* 是否开启世间食记
*/
private Integer openFood;
/**
* 创建人
*/
private Long createUser;
......
pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml
......@@ -8,6 +8,7 @@
<result property="style" column="style" jdbcType="INTEGER"/>
<result property="showBook" column="show_book" jdbcType="INTEGER"/>
<result property="openRays" column="open_rays" jdbcType="INTEGER"/>
<result property="openFood" column="open_food" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
......@@ -21,7 +22,7 @@
</resultMap>
<sql id="Base_Column_List">
id, book_group_id, style, show_book, open_rays, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
id, book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
book_cover, book_id, channel_id, background_img
</sql>
......@@ -36,9 +37,9 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into book.resource_page(book_group_id, style, show_book, open_rays, create_time, update_time, create_user,
insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
qrcode_url, scene_id, book_cover, book_id, channel_id, background_img)
values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
#{bookId}, #{channelId}, #{backgroundImg})
</insert>
......@@ -55,6 +56,9 @@
<if test="openRays != null">
open_rays = #{openRays},
</if>
<if test="openFood != null">
open_food = #{openFood},
</if>
<if test="officialSceneId != null">
official_scene_id = #{officialSceneId},
</if>
......@@ -78,7 +82,7 @@
<select id="getByBookGroupId" parameterType="long" resultMap="ResourcePageMap">
select
id, book_group_id, style, show_book, open_rays, qrcode_url, official_scene_id, book_cover, book_id, channel_id, create_user,
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, official_scene_id, book_cover, book_id, channel_id, create_user,
background_img
from book.resource_page
where book_group_id = #{bookGroupId}
......@@ -93,6 +97,7 @@
p.show_book,
p.book_cover,
p.open_rays,
p.open_food,
p.scene_id,
p.background_img
FROM
......@@ -123,7 +128,7 @@
<select id="getBySceneId" parameterType="long" resultMap="ResourcePageMap">
select
id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id, book_cover,book_id, channel_id, create_user,
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover,book_id, channel_id, create_user,
background_img
from book.resource_page
where scene_id = #{sceneId}
......@@ -132,7 +137,7 @@
<select id="getPageByOfficialScene" parameterType="long" resultMap="ResourcePageMap">
select
id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id, book_cover
id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover
from book.resource_page
where official_scene_id = #{officialSceneId}
limit 1
......@@ -169,6 +174,7 @@
p.style,
p.show_book,
p.open_rays,
p.open_food,
p.qrcode_url,
p.scene_id,
p.book_cover,
......@@ -251,4 +257,13 @@
GROUP BY bg.book_id,bg.create_user,bg.channel_id
</select>
<select id="getAllBook4OpenFood" parameterType="map" resultType="com.pcloud.book.group.vo.ResourcePageVO">
SELECT id, book_id bookId, scene_id sceneId
FROM resource_page rp
WHERE rp.open_food = 1
AND book_id > 0
GROUP BY book_id
ORDER BY id
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment