wangxy 1 неделя назад
Родитель
Сommit
4a5b300a53

+ 7 - 0
fs-service/src/main/java/com/fs/hisStore/domain/FsStoreRecommendScrm.java

@@ -1,5 +1,6 @@
 package com.fs.hisStore.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -46,4 +47,10 @@ public class FsStoreRecommendScrm extends BaseEntity
     /** 推荐理由 */
     private String recommendReason;
 
+    /**
+     * 店铺id
+     */
+    @TableField(exist = false)
+    private String storeSeq;
+
 }

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

@@ -48,4 +48,14 @@ public class FsStoreRecommendScrmVo extends BaseEntity
      * 店铺图片
      * **/
     private String logoUrl;
+
+    /**
+     * 店铺id
+     */
+    private String storeSeq;
+
+    /**
+     * 商家id
+     */
+    private String merchantId;
 }

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

@@ -29,7 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsStoreRecommendScrmList" resultType="com.fs.hisStore.vo.FsStoreRecommendScrmVo">
         SELECT
         srs.*,
-        ss.logo_url
+        ss.logo_url,
+        ss.merchant_id merchantId,
+        ss.store_seq storeSeq
         FROM
         fs_store_recommend_scrm srs
         LEFT JOIN fs_store_scrm ss ON srs.store_id = ss.store_id
@@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="storeSeq != null and storeSeq != ''"> and ss.store_seq like concat('%', #{storeSeq}, '%')</if>
         </where>
         ORDER BY
         srs.sort_order ASC,