医健宝，店铺不显示处理

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

@@ -8,6 +8,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.hisStore.domain.FsStoreRecommendScrm;
 import com.fs.hisStore.service.IFsStoreRecommendScrmService;
+import com.fs.hisStore.vo.FsStoreRecommendScrmVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -35,7 +36,7 @@ public class FsStoreRecommendScrmController extends BaseController
     public TableDataInfo list(FsStoreRecommendScrm fsStoreRecommendScrm)
     {
         startPage();
-        List<FsStoreRecommendScrm> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
+        List<FsStoreRecommendScrmVo> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
         return getDataTable(list);
     }
 
@@ -101,8 +102,8 @@ public class FsStoreRecommendScrmController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsStoreRecommendScrm fsStoreRecommendScrm)
         {
-        List<FsStoreRecommendScrm> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
-        ExcelUtil<FsStoreRecommendScrm> util = new ExcelUtil<>(FsStoreRecommendScrm.class);
+        List<FsStoreRecommendScrmVo> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
+        ExcelUtil<FsStoreRecommendScrmVo> util = new ExcelUtil<>(FsStoreRecommendScrmVo.class);
         return util.exportExcel(list, "店铺推荐数据");
     }
 }

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

@@ -1,6 +1,8 @@
 package com.fs.hisStore.mapper;
 
 import com.fs.hisStore.domain.FsStoreRecommendScrm;
+import com.fs.hisStore.vo.FsStoreRecommendScrmVo;
+
 import java.util.List;
 
 /**
@@ -25,7 +27,7 @@ public interface FsStoreRecommendScrmMapper
      * @param fsStoreRecommendScrm 店铺推荐
      * @return 店铺推荐集合
      */
-    public List<FsStoreRecommendScrm> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm);
+    public List<FsStoreRecommendScrmVo> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm);
 
     /**
      * 查询有效的推荐店铺列表(根据时间、状态等条件)

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

@@ -1,6 +1,8 @@
 package com.fs.hisStore.service;
 
 import com.fs.hisStore.domain.FsStoreRecommendScrm;
+import com.fs.hisStore.vo.FsStoreRecommendScrmVo;
+
 import java.util.List;
 
 /**
@@ -25,7 +27,7 @@ public interface IFsStoreRecommendScrmService
      * @param fsStoreRecommendScrm 店铺推荐
      * @return 店铺推荐集合
      */
-    public List<FsStoreRecommendScrm> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm);
+    public List<FsStoreRecommendScrmVo> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm);
 
     /**
      * 查询有效的推荐店铺列表(根据时间、状态等条件)

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

@@ -5,6 +5,7 @@ import com.fs.common.utils.DateUtils;
 import com.fs.hisStore.domain.FsStoreRecommendScrm;
 import com.fs.hisStore.mapper.FsStoreRecommendScrmMapper;
 import com.fs.hisStore.service.IFsStoreRecommendScrmService;
+import com.fs.hisStore.vo.FsStoreRecommendScrmVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +42,7 @@ public class IFsStoreRecommendScrmServiceImpl implements IFsStoreRecommendScrmSe
      * @return 店铺推荐
      */
     @Override
-    public List<FsStoreRecommendScrm> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm) {
+    public List<FsStoreRecommendScrmVo> selectFsStoreRecommendScrmList(FsStoreRecommendScrm fsStoreRecommendScrm) {
         return fsStoreRecommendScrmMapper.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
     }
 

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreRecommendScrmVo.java

@@ -0,0 +1,51 @@
+package com.fs.hisStore.vo;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 店铺推荐对象 fs_store_recommend_scrm
+ *
+ * @author fs
+ * @date 2023-06-15
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class FsStoreRecommendScrmVo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 店铺ID */
+    private Long storeId;
+
+    /** 店铺名称 */
+    @Excel(name = "店铺名称")
+    private String storeName;
+
+    /** 排序值，数值越小越靠前 */
+    @Excel(name = "排序值")
+    private Integer sortOrder;
+
+    /** 推荐类型(HOT热门,NEW新品,GENERAL普通推荐) */
+    private String recommendType;
+
+    /** 状态(0禁用,1启用) */
+    @Excel(name = "状态", readConverterExp = "0=禁用,1=启用")
+    private Integer status;
+
+    /** 权重值，用于综合排序 */
+    private Integer weight;
+
+    /** 推荐理由 */
+    private String recommendReason;
+
+    /**
+     * 店铺图片
+     * **/
+    private String logoUrl;
+}

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

@@ -26,19 +26,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, store_id, store_name, sort_order, begin_time, end_time, recommend_type, status, weight, recommend_reason, create_by, create_time, update_by, update_time, remark from fs_store_recommend_scrm
     </sql>
 
-    <select id="selectFsStoreRecommendScrmList" parameterType="FsStoreRecommendScrm" resultMap="FsStoreRecommendScrmResult">
-        <include refid="selectFsStoreRecommendScrmVo"/>
+    <select id="selectFsStoreRecommendScrmList" 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>
-            <if test="storeId != null "> and store_id = #{storeId}</if>
-            <if test="storeName != null  and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
-            <if test="sortOrder != null "> and sort_order = #{sortOrder}</if>
-            <if test="beginTime != null "> and begin_time &gt;= #{beginTime}</if>
-            <if test="endTime != null "> and end_time &lt;= #{endTime}</if>
-            <if test="recommendType != null  and recommendType != ''"> and recommend_type = #{recommendType}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="weight != null "> and weight = #{weight}</if>
+            <if test="storeId != null "> and srs.store_id = #{storeId}</if>
+            <if test="storeName != null  and storeName != ''"> and srs.store_name like concat('%', #{storeName}, '%')</if>
+            <if test="sortOrder != null "> and srs.sort_order = #{sortOrder}</if>
+            <if test="beginTime != null "> and srs.begin_time &gt;= #{beginTime}</if>
+            <if test="endTime != null "> and srs.end_time &lt;= #{endTime}</if>
+            <if test="recommendType != null  and recommendType != ''"> and srs.recommend_type = #{recommendType}</if>
+            <if test="status != null "> and srs.status = #{status}</if>
+            <if test="weight != null "> and srs.weight = #{weight}</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>
 
     <select id="selectValidRecommendList" parameterType="FsStoreRecommendScrm" resultMap="FsStoreRecommendScrmResult">

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

@@ -7,6 +7,7 @@ import com.fs.common.annotation.Log;
 import com.fs.common.enums.BusinessType;
 import com.fs.hisStore.domain.FsStoreRecommendScrm;
 import com.fs.hisStore.service.IFsStoreRecommendScrmService;
+import com.fs.hisStore.vo.FsStoreRecommendScrmVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -34,7 +35,7 @@ public class StoreRecommendScrmController extends BaseController
     public TableDataInfo list(FsStoreRecommendScrm fsStoreRecommendScrm)
     {
         startPage();
-        List<FsStoreRecommendScrm> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
+        List<FsStoreRecommendScrmVo> list = fsStoreRecommendService.selectFsStoreRecommendScrmList(fsStoreRecommendScrm);
         return getDataTable(list);
     }