医健宝数推荐店铺

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreRecommendScrmController.java

@@ -90,7 +90,7 @@ public class FsStoreRecommendScrmController extends BaseController
     public TableDataInfo validList(FsStoreRecommendScrm fsStoreRecommendScrm)
     {
         startPage();
-        List<FsStoreRecommendScrm> list = fsStoreRecommendService.selectValidRecommendList(fsStoreRecommendScrm);
+        List<FsStoreRecommendScrmVo> list = fsStoreRecommendService.selectValidRecommendList(fsStoreRecommendScrm);
         return getDataTable(list);
     }
 

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreRecommendScrmMapper.java

@@ -35,7 +35,7 @@ public interface FsStoreRecommendScrmMapper
      * @param fsStoreRecommendScrm 店铺推荐
      * @return 店铺推荐集合
      */
-    public List<FsStoreRecommendScrm> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm);
+    public List<FsStoreRecommendScrmVo> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm);
 
     /**
      * 新增店铺推荐

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreRecommendScrmService.java

@@ -35,7 +35,7 @@ public interface IFsStoreRecommendScrmService
      * @param fsStoreRecommendScrm 店铺推荐
      * @return 店铺推荐集合
      */
-    public List<FsStoreRecommendScrm> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm);
+    public List<FsStoreRecommendScrmVo> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm);
 
     /**
      * 新增店铺推荐

fs-service/src/main/java/com/fs/hisStore/service/impl/IFsStoreRecommendScrmServiceImpl.java

@@ -53,7 +53,7 @@ public class IFsStoreRecommendScrmServiceImpl implements IFsStoreRecommendScrmSe
      * @return 店铺推荐集合
      */
     @Override
-    public List<FsStoreRecommendScrm> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm) {
+    public List<FsStoreRecommendScrmVo> selectValidRecommendList(FsStoreRecommendScrm fsStoreRecommendScrm) {
         return fsStoreRecommendScrmMapper.selectValidRecommendList(fsStoreRecommendScrm);
     }
 

fs-service/src/main/resources/mapper/hisStore/FsStoreRecommendScrmMapper.xml

@@ -49,15 +49,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         srs.create_time DESC
     </select>
 
-    <select id="selectValidRecommendList" parameterType="FsStoreRecommendScrm" resultMap="FsStoreRecommendScrmResult">
-        <include refid="selectFsStoreRecommendScrmVo"/>
+    <select id="selectValidRecommendList" resultType="com.fs.hisStore.vo.FsStoreRecommendScrmVo">
+        SELECT
+        srs.*,
+        ss.logo_url
+        FROM
+        fs_store_recommend_scrm srs
+        LEFT JOIN fs_store_scrm ss ON srs.store_id = ss.store_id
         <where>
-            status = 1
-            and (begin_time is null or begin_time &lt;= now())
-            and (end_time is null or end_time &gt;= now())
-            <if test="recommendType != null  and recommendType != ''"> and recommend_type = #{recommendType}</if>
+            srs.status = 1
+            and (srs.begin_time is null or srs.begin_time &lt;= now())
+            and (srs.end_time is null or srs.end_time &gt;= now())
+            <if test="recommendType != null  and recommendType != ''"> and srs.recommend_type = #{recommendType}</if>
         </where>
-        order by sort_order asc, weight desc, create_time desc
+        ORDER BY
+        srs.sort_order ASC,
+        srs.weight DESC,
+        srs.create_time DESC
     </select>
 
     <insert id="insertFsStoreRecommendScrm" parameterType="FsStoreRecommendScrm">

fs-user-app/src/main/java/com/fs/app/controller/store/StoreRecommendScrmController.java

@@ -89,7 +89,7 @@ public class StoreRecommendScrmController extends BaseController
     public TableDataInfo validList(FsStoreRecommendScrm fsStoreRecommendScrm)
     {
         startPage();
-        List<FsStoreRecommendScrm> list = fsStoreRecommendService.selectValidRecommendList(fsStoreRecommendScrm);
+        List<FsStoreRecommendScrmVo> list = fsStoreRecommendService.selectValidRecommendList(fsStoreRecommendScrm);
         return getDataTable(list);
     }
 }