From 36f760b1a039da26060c5ab2807a9c6a73f76b43 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 19 Sep 2023 10:02:13 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
index f7642ee..f94df2b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java
@@ -2,14 +2,17 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.NewsListDto;
+import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.entity.PlatformBanner;
+import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
import cc.mrbird.febs.mall.mapper.MallNewsCategoryMapper;
import cc.mrbird.febs.mall.mapper.MallNewsInfoMapper;
import cc.mrbird.febs.mall.mapper.PlatformBannerMapper;
import cc.mrbird.febs.mall.service.IApiMallNewsService;
import cc.mrbird.febs.mall.vo.NewsListVo;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,6 +34,7 @@
private final MallNewsCategoryMapper mallNewsCategoryMapper;
private final PlatformBannerMapper platformBannerMapper;
+ private final MallGoodsMapper mallGoodsMapper;
@Override
public List<MallNewsCategory> findNewsCategoryList() {
@@ -59,7 +63,22 @@
@Override
public FebsResponse findAllBanner() {
QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByAsc("is_top");
List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
+ if(CollUtil.isNotEmpty(paymentMethodList)){
+ for(PlatformBanner platformBanner : paymentMethodList){
+ if("1".equals(platformBanner.getIsJump()) &&
+ 1 == platformBanner.getIsInside()){
+ String jumpUrl = platformBanner.getJumpUrl();
+ QueryWrapper<MallGoods> queryWrapperGoods = new QueryWrapper<>();
+ queryWrapperGoods.eq("goods_no",jumpUrl);
+ List<MallGoods> goodsList = mallGoodsMapper.selectList(queryWrapperGoods);
+ if(CollUtil.isNotEmpty(goodsList)){
+ platformBanner.setGoodsId(goodsList.get(0).getId());
+ }
+ }
+ }
+ }
return new FebsResponse().success().data(paymentMethodList);
}
}
--
Gitblit v1.9.1