Merge remote-tracking branch 'origin/master'

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/vo/JnbKnowledgeBaseVO.java

@@ -95,4 +95,10 @@ public class JnbKnowledgeBaseVO {
      */
     @Excel(name = "创建人id")
     private String createId;
+
+    /**
+     * 是否付费(1:已付费；0:未付费)
+     */
+    @Excel(name = "是否付费(1:已付费；0:未付费)")
+    private String purchaseStatus;
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/impl/JnbQuotationsServiceImpl.java

@@ -141,9 +141,7 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
             announcement.setAnnouncementBody("您在" + data + "发起的行情信息已审核被拒绝，请查看");
             announcement.setValidityStartTime(new Date());
             announcement.setUserId(String.valueOf(id));
-            announcement.setCreateBy(SecurityUtils.getUserId(
-                    
-            ).toString());
+            announcement.setCreateBy(SecurityUtils.getUserId().toString());
             return announcement;
         }
     }

sooka-jnb/src/main/resources/mapper/knowledge/JnbKnowledgeBaseMapper.xml

@@ -139,14 +139,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             jkb.create_by,
             jkb.create_time,
             jkb.update_by,
-            jkb.update_time ,
-            GROUP_CONCAT(jkbi.id)       AS imgId,
-            GROUP_CONCAT(jkbi.img_url)  AS imgUrlList
+            jkb.update_time,
+            GROUP_CONCAT( jkbi.id ) AS imgId,
+            GROUP_CONCAT( jkbi.img_url ) AS imgUrlList,
+            CASE
+
+                WHEN jso.user_id IS NOT NULL THEN
+                    '1' ELSE '0'
+                END AS purchase_status
         FROM
             jnb_knowledge_base jkb
-                left join jnb_knowledge_base_img jkbi on jkb.id = jkbi.knowledge_id and jkbi.del_flag = 0
-        where jkb.del_flag = 0 and popular = 1
-        GROUP BY jkb.id
+                LEFT JOIN jnb_knowledge_base_img jkbi ON jkb.id = jkbi.knowledge_id
+                AND jkbi.del_flag = 0
+                LEFT JOIN jnb_score_operate jso ON jkb.id = jso.relevance_data_id and jso.user_id = jkb.create_id
+        WHERE
+            jkb.del_flag = 0 and popular = 1
+        GROUP BY
+            jkb.id
         order by create_time,watch_num,like_num desc
     </select>
 

sooka-jnb/src/main/resources/mapper/quotations/JnbQuotationsMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="area != null  and area != ''">and a.area = #{area}</if>
             <if test="type != null  and type != ''">and a.type = #{type}</if>
             and a.del_flag = 0
+            <if test="status != null  and status != ''">and a.status = #{status}</if>
         </where>
     </select>