feat: 商情门户背景图自适应调整

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/front/FrontArticleController.java

@@ -45,6 +45,7 @@ public class FrontArticleController {
     })
     @GetMapping("helpList")
     public JsonResult<List<FrontArticleCategoryVO>> helpList(HttpServletRequest request, Integer cateSize, Integer articleSize) {
+        String webSite = WebUtil.getWebSite(request);
         PagerInfo pager = new PagerInfo(cateSize, 1);
         PagerInfo articlePager = null;
         if (!StringUtil.isNullOrZero(articleSize)) {
@@ -53,6 +54,7 @@ public class FrontArticleController {
         ArticleCategoryExample example = new ArticleCategoryExample();
         example.setWebSite(WebUtil.getWebSite(request));
         example.setIsShow(ArticleConst.STATE_YES);
+        example.setWebSite(webSite);
         example.setOrderBy("sort asc, create_time desc");
         List<ArticleCategory> list = articleCategoryModel.getArticleCategoryList(example, pager);
         List<FrontArticleCategoryVO> vos = new ArrayList<>();
@@ -62,6 +64,7 @@ public class FrontArticleController {
                 //查询文章列表
                 ArticleExample articleExample = new ArticleExample();
                 articleExample.setCategoryId(articleCategory.getCategoryId());
+                articleExample.setWebSite(webSite);
                 articleExample.setState(ArticleConst.STATE_YES);
                 articleExample.setOrderBy("sort asc, create_time desc");
                 List<Article> articleList = articleModel.getArticleList(articleExample, articlePager);
@@ -85,9 +88,11 @@ public class FrontArticleController {
     })
     @GetMapping("articleList")
     public JsonResult<List<ArticleVO>> articleList(HttpServletRequest request, Integer categoryId, Integer size) {
+        String webSite = WebUtil.getWebSite(request);
         PagerInfo pager = new PagerInfo(size, 1);
         ArticleExample example = new ArticleExample();
         example.setCategoryId(categoryId);
+        example.setWebSite(webSite);
         example.setState(ArticleConst.STATE_YES);
         example.setOrderBy("sort asc, create_time desc");
         List<Article> list = articleModel.getArticleList(example, pager);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerStoreController.java

@@ -472,6 +472,7 @@ public class SellerStoreController extends BaseController {
                 store.setStoreGradeName(storeSiteInfo.getStoreGradeName());
                 store.setStoreExpireTime(storeSiteInfo.getStoreExpireTime());
                 store.setStoreLogo(storeSiteInfo.getStoreLogo());
+                store.setStoreBannerPc(storeSiteInfo.getStoreBannerPc());
                 store.setBusinessState(storeSiteInfo.getBusinessState());
             }
         }

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/StoreBindCategoryReadMapper.xml

@@ -88,10 +88,10 @@
         <if test="example.goodsCategoryId3 != null">
           AND `goods_category_id3` = #{example.goodsCategoryId3}
         </if>
-        <if test="example.storeNameLike != null and example.webSite=='1'">
+        <if test="example.storeNameLike != null and example.webSite==1">
           AND `store_id` in (select `store_id` from `store` where `store_name` like concat('%',#{example.storeNameLike},'%'))
         </if>
-        <if test="example.storeNameLike != null and example.webSite=='2'">
+        <if test="example.storeNameLike != null and example.webSite==2">
           AND `store_id` in (select `store_id` from `store_name` where `store_name` like concat('%',#{example.storeNameLike},'%') and `web_site` = #{example.webSite})
         </if>
       </trim>