Merge branch 'feature/1006244' into 'master'

feat: [1006244] 应用大小图

See merge request rays/pcloud-book!1478

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java

@@ -520,4 +520,16 @@ public interface ResourcePageBiz {
      **/
     ResourcePageDTO getResourcePageByQrcode(Long sceneId, Long bookGroupId);
 
+    /**
+     * 本书服务页获取资源
+     * @param resourcePageId
+     * @param wechatUserId
+     * @param bookId
+     * @param adviserId
+     * @param channelId
+     * @param enableAdverting
+     * @param navigationId
+     * @return
+     */
+    List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4Wechat(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId, Integer enableAdverting, Long navigationId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -3271,4 +3271,32 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         return dto;
     }
 
+    @Override
+    public List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4Wechat(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId, Integer enableAdverting, Long navigationId) {
+        List<ResourceColumnAndServeVO> resourceColumnAndServeVOS = this.getColumnAndServeListByPageId(resourcePageId, wechatUserId, bookId, adviserId, channelId, enableAdverting, navigationId);
+        //填充自定义图片
+        if (ListUtils.isEmpty(resourceColumnAndServeVOS)) {
+            return new ArrayList<>();
+        }
+        List<ResourcePageItemVO> resourcePageItemVOList = new ArrayList<>();
+        resourceColumnAndServeVOS.stream().forEach(e -> {
+            if (!ListUtils.isEmpty(e.getItemVOList())) {
+                resourcePageItemVOList.addAll(e.getItemVOList());
+            }
+        });
+        if (ListUtils.isEmpty(resourcePageItemVOList)) {
+            return new ArrayList<>();
+        }
+        resourcePageItemVOList.stream().forEach(e -> {
+            if (!StringUtil.isEmpty(e.getSelfSmallPic())) {
+                e.setServePic(e.getSelfSmallPic());
+                e.setCoverImg(e.getSelfSmallPic());
+            }
+            if (!StringUtil.isEmpty(e.getSelfBigPic())) {
+                e.setTransverseImg(e.getSelfBigPic());
+            }
+        });
+        return resourceColumnAndServeVOS;
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageItem.java

@@ -5,6 +5,7 @@ import com.pcloud.common.entity.BaseEntity;
 import java.util.Date;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -72,4 +73,10 @@ public class ResourcePageItem extends BaseEntity {
      * 二维码公众号id
      */
     private Long accountSettingId;
+
+    @ApiModelProperty("自定义大图")
+    private String selfBigPic;
+
+    @ApiModelProperty("简介")
+    private String selfSmallPic;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java

@@ -103,7 +103,7 @@ public class ResourcePageFacade {
                                                                @RequestParam(value = "enableAdverting", required = false) Integer enableAdverting,
                                                                @RequestParam(value = "navigationId", required = false) Long navigationId){
         Long wechatUserId = Cookie.getId(userInfo,Cookie._WECHAT_USER_ID);
-        return new ResponseDto<>(resourcePageBiz.getColumnAndServeListByPageId(resourcePageId, wechatUserId, bookId, adviserId, channelId, enableAdverting, navigationId));
+        return new ResponseDto<>(resourcePageBiz.getColumnAndServeListByPageId4Wechat(resourcePageId, wechatUserId, bookId, adviserId, channelId, enableAdverting, navigationId));
     }
 
     @ApiOperation("客户端分页查栏目资源")

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageItemVO.java

@@ -123,4 +123,10 @@ public class ResourcePageItemVO extends BaseDto{
 
     @ApiModelProperty("简介")
     private String remark;
+
+    @ApiModelProperty("自定义大图")
+    private String selfBigPic;
+
+    @ApiModelProperty("简介")
+    private String selfSmallPic;
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageItemDao.xml

@@ -20,11 +20,14 @@
         <result property="qrcodeSource" column="qrcode_source" jdbcType="INTEGER"/>
         <result property="qrcodeShowType" column="qrcode_show_type" jdbcType="INTEGER"/>
         <result property="accountSettingId" column="account_setting_id" jdbcType="INTEGER"/>
+        <result property="selfBigPic" column="self_big_pic" jdbcType="VARCHAR"/>
+        <result property="selfSmallPic" column="self_small_pic" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
          id, resource_page_id, resource_page_column_id, serve_id, serve_type, link_url, type_code, seq_num, is_show,
-           guide_content, logo_url, create_time, qrcode_source, qrcode_show_type, account_setting_id
+           guide_content, logo_url, create_time, qrcode_source, qrcode_show_type, account_setting_id,
+            self_big_pic, self_small_pic
     </sql>
 
     <!--查询单个-->
@@ -39,21 +42,22 @@
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_item(resource_page_id, resource_page_column_id, serve_id, serve_type, link_url, type_code,
         seq_num, is_show, guide_content, logo_url, create_time, update_time, create_user, qrcode_source,
-        qrcode_show_type, account_setting_id)
+        qrcode_show_type, account_setting_id, self_big_pic, self_small_pic)
         values (#{resourcePageId}, #{resourcePageColumnId}, #{serveId}, #{serveType}, #{linkUrl}, #{typeCode},
          #{seqNum}, #{isShow}, #{guideContent}, #{logoUrl}, now(), now(), #{createUser}, #{qrcodeSource},
-         #{qrcodeShowType}, #{accountSettingId})
+         #{qrcodeShowType}, #{accountSettingId}, #{selfBigPic}, #{selfSmallPic})
     </insert>
 
     <insert id="batchInsert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_item(resource_page_id, resource_page_column_id, serve_id, serve_type,
         link_url, type_code, seq_num, is_show, guide_content, logo_url,
-        create_time, update_time, create_user, qrcode_source, qrcode_show_type, account_setting_id)
+        create_time, update_time, create_user, qrcode_source, qrcode_show_type, account_setting_id, self_big_pic, self_small_pic)
         values
         <foreach collection="list" separator="," index="index" item="item">
             (#{item.resourcePageId}, #{item.resourcePageColumnId}, #{item.serveId}, #{item.serveType},
             #{item.linkUrl}, #{item.typeCode}, #{item.seqNum}, #{item.isShow}, #{item.guideContent}, #{item.logoUrl},
-            now(), now(), #{item.createUser}, #{item.qrcodeSource}, #{item.qrcodeShowType}, #{item.accountSettingId})
+            now(), now(), #{item.createUser}, #{item.qrcodeSource}, #{item.qrcodeShowType}, #{item.accountSettingId},
+            #{item.selfBigPic}, #{item.selfSmallPic})
         </foreach>
     </insert>
 
@@ -77,6 +81,12 @@
                 link_url = #{linkUrl},
             </if>
                 update_time = now(),
+            <if test="selfBigPic != null and selfBigPic != ''">
+                self_big_pic = #{selfBigPic},
+            </if>
+            <if test="selfSmallPic != null and selfSmallPic != ''">
+                self_small_pic = #{selfSmallPic},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -99,7 +109,9 @@
             type_code typeCode,
             logo_url logoUrl,
             guide_content guideContent,
-            create_user createUser
+            create_user createUser,
+            self_big_pic selfBigPic,
+            self_small_pic selfSmallPic
         FROM
             resource_page_item
         WHERE
@@ -121,7 +133,9 @@
             create_user createUser,
             seq_num seqNum,
             qrcode_show_type qrcodeShowType,
-            account_setting_id accountSettingId
+            account_setting_id accountSettingId,
+            self_big_pic selfBigPic,
+            self_small_pic selfSmallPic
         FROM
             resource_page_item
         WHERE
@@ -345,7 +359,9 @@
         create_user createUser,
         seq_num seqNum,
         qrcode_show_type qrcodeShowType,
-        account_setting_id accountSettingId
+        account_setting_id accountSettingId,
+        self_big_pic selfBigPic,
+        self_small_pic selfSmallPic
         FROM
         resource_page_item
         WHERE