Merge branch 'feature/1003899' into 'master'

feat: [1003899] 资讯评估价

See merge request rays/pcloud-book!1053

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletNewsDTO.java

@@ -151,4 +151,10 @@ public class AppletNewsDTO extends BaseDto {
 
     @ApiModelProperty("评估价")
     private String appraisalPrice;
+
+    @ApiModelProperty("评估价类型  0 文字  1 图片")
+    private Integer appraisalType;
+
+    @ApiModelProperty("评估价图片")
+    private String appraisalImg;
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/entity/AppletNews.java

@@ -118,4 +118,10 @@ public class AppletNews extends BaseTempletClassify {
 
     @ApiModelProperty("评估价")
     private String appraisalPrice;
+
+    @ApiModelProperty("评估价类型  0 文字  1 图片")
+    private Integer appraisalType;
+
+    @ApiModelProperty("评估价图片")
+    private String appraisalImg;
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -1397,6 +1397,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             items.add(RightsNowItem.builder().serveId(appletNews.getId()).serveName(appletNews.getNewsName()).serveType(RightsServeTypeEnum.NEWS.name())
                     .serveTypeName("资讯").servePic(appletNews.getPic1()).type(type).jumpType(appletNews.getJumpType())
                     .jumpUrl(appletNews.getJumpUrl()).newsType(appletNews.getType()).crossedPrice(appletNews.getCrossedPrice()).
+                                    appraisalType(appletNews.getAppraisalType()).appraisalImg(appletNews.getAppraisalImg()).
                             appraisalPrice(appletNews.getAppraisalPrice()).browseCount(browseCount).build());
         }
     }
@@ -1624,6 +1625,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         item.setUrlNumber(appletNewsDTO.getUrlNumber());
                         item.setCrossedPrice(appletNewsDTO.getCrossedPrice());
                         item.setAppraisalPrice(appletNewsDTO.getAppraisalPrice());
+                        item.setAppraisalType(appletNewsDTO.getAppraisalType());
+                        item.setAppraisalImg(appletNewsDTO.getAppraisalImg());
                         item.setBrowseCount(appletNewsDTO.getBrowseCount());
                     }
                 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsNowItem.java

@@ -129,4 +129,10 @@ public class RightsNowItem extends BaseEntity {
 
     @ApiModelProperty("应用/资讯/作品图片-大图")
     private String transverseImg;
+
+    @ApiModelProperty("评估价类型  0 文字  1 图片")
+    private Integer appraisalType;
+
+    @ApiModelProperty("评估价图片")
+    private String appraisalImg;
 }

pcloud-service-book/src/main/resources/mapper/applet/AppletNews.xml

@@ -36,6 +36,8 @@
     <result column="agent_id" property="agentId" jdbcType="BIGINT" />
     <result column="crossed_price" property="crossedPrice" jdbcType="VARCHAR" />
     <result column="appraisal_price" property="appraisalPrice" jdbcType="VARCHAR" />
+    <result column="appraisal_type" property="appraisalType" jdbcType="TINYINT" />
+    <result column="appraisal_img" property="appraisalImg" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -43,7 +45,9 @@
      pic1, pic2, pic3, news.content, show_state, news.create_time, news.update_time, news.first_classify, news.second_classify, news.grade_label_id, news.subject_label_id, news.rights_classify_id,
      news.jump_type, news.jump_url, news.url_number, news.custom_tag_id, news.show_source, news.show_link,news.business_card_id,news.business_card_type,news.business_card_isOpen,city_code,agent_id,
     crossed_price,
-    appraisal_price
+    appraisal_price,
+    appraisal_type,
+    appraisal_img
   </sql>
     <sql id="sql_news">
       m.id,
@@ -80,7 +84,9 @@
      pic1, pic2, pic3, content, show_state, create_time, update_time , first_classify, second_classify, grade_label_id, subject_label_id, rights_classify_id,
      jump_type, jump_url,url_number, custom_tag_id, show_source, show_link,business_card_id,business_card_type,business_card_isOpen,city_code, agent_id,
     crossed_price,
-    appraisal_price
+    appraisal_price,
+    appraisal_type,
+    appraisal_img
       )
     values (
       #{newsName}, #{source}, #{newsClassifyId}, #{proLabelId}, #{depLabelId}, #{purLabelId}, #{type}, #{digest},
@@ -88,7 +94,9 @@
       #{gradeLabelId,jdbcType=BIGINT}, #{subjectLabelId,jdbcType=BIGINT}, #{rightsClassifyId,jdbcType=BIGINT},
       #{jumpType}, #{jumpUrl}, #{urlNumber}, #{customTagId}, #{showSource}, #{showLink}, #{businessCardId}, #{businessCardType}, #{businessCardIsOpen}, #{cityCode}, #{agentId},
       #{crossedPrice},
-      #{appraisalPrice}
+      #{appraisalPrice},
+      #{appraisalType},
+      #{appraisalImg}
       )
   </insert>
 
@@ -147,6 +155,12 @@
       <if test="appraisalPrice != null">
           appraisal_price = #{appraisalPrice},
       </if>
+      <if test="appraisalType != null">
+          appraisal_type = #{appraisalType},
+      </if>
+      <if test="appraisalImg != null">
+          appraisal_img = #{appraisalImg},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -342,7 +356,9 @@
         n.show_source showSource,
         n.show_link showLink,
         n.crossed_price crossedPrice,
-        n.appraisal_price appraisalPrice
+        n.appraisal_price appraisalPrice,
+        n.appraisal_type appraisalType,
+        n.appraisal_img appraisalImg
         FROM applet_news n
         LEFT JOIN applet_news_category category on n.id = category.applet_news_id
         WHERE 1=1
@@ -568,7 +584,9 @@
         n.show_source showSource,
         n.show_link showLink,
         n.crossed_price crossedPrice,
-        n.appraisal_price appraisalPrice
+        n.appraisal_price appraisalPrice,
+        n.appraisal_type appraisalType,
+        n.appraisal_img appraisalImg
         FROM applet_news n
         LEFT JOIN applet_news_classify c ON n.news_classify_id=c.id
         LEFT JOIN rights_setting_classify d ON n.rights_classify_id = d.id
@@ -638,6 +656,8 @@
     n.show_link showLink,
     n.crossed_price crossedPrice,
     n.appraisal_price appraisalPrice,
+      n.appraisal_type appraisalType,
+      n.appraisal_img appraisalImg,
     count(n.id) browseCount
     FROM applet_news n
     left join
@@ -680,7 +700,9 @@
     n.show_source showSource,
     n.show_link showLink,
     n.crossed_price crossedPrice,
-    n.appraisal_price appraisalPrice
+    n.appraisal_price appraisalPrice,
+    n.appraisal_type appraisalType,
+    n.appraisal_img appraisalImg
     FROM applet_news n
     LEFT JOIN applet_news_classify c ON n.news_classify_id=c.id
     WHERE n.show_state = 1 and n.is_delete = 0
@@ -807,7 +829,9 @@
         n.show_source showSource,
         n.show_link showLink,
         n.crossed_price crossedPrice,
-        n.appraisal_price appraisalPrice
+        n.appraisal_price appraisalPrice,
+        n.appraisal_type appraisalType,
+        n.appraisal_img appraisalImg
         FROM applet_news n
         LEFT JOIN applet_news_category category on n.id = category.applet_news_id
         WHERE 1=1
@@ -866,7 +890,9 @@
       n.show_link showLink,
       n.city_code cityCode,
       n.crossed_price crossedPrice,
-      n.appraisal_price appraisalPrice
+      n.appraisal_price appraisalPrice,
+      n.appraisal_type appraisalType,
+      n.appraisal_img appraisalImg
     FROM
       applet_news n
         LEFT JOIN rights_setting_item_detail d ON d.serve_id = n.id
@@ -968,7 +994,9 @@
         n.city_code cityCode,
         n.show_link showLink,
         n.crossed_price crossedPrice,
-        n.appraisal_price appraisalPrice
+        n.appraisal_price appraisalPrice,
+        n.appraisal_type appraisalType,
+        n.appraisal_img appraisalImg
         FROM applet_news n
         WHERE n.show_state = 1 and n.is_delete = 0
         AND n.city_code = #{cityId}
@@ -1016,6 +1044,8 @@
         n.is_delete  isDelete,
         n.crossed_price crossedPrice,
         n.appraisal_price appraisalPrice,
+        n.appraisal_type appraisalType,
+        n.appraisal_img appraisalImg,
         count(n.id) browseCount
         FROM applet_news n
         left join

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingItemMapper.xml

@@ -250,7 +250,9 @@
             c.show_source AS showSource,
             c.show_link AS showLink,
             c.crossed_price crossedPrice,
-            c.appraisal_price appraisalPrice
+            c.appraisal_price appraisalPrice,
+            c.appraisal_type appraisalType,
+            c.appraisal_img appraisalImg
         FROM
             rights_setting_item a
             LEFT JOIN rights_setting_item_detail b ON a.id = b.rights_setting_item_id