From 00a4e3cab6b4d038b2b5fbb45d816b57481bbe0f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 17 Jan 2025 15:29:23 +0800
Subject: [PATCH] refactor(mall): 修改会员密码重置功能和界面

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallNewsServiceImpl.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 6dc9cff..1805515 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
@@ -8,8 +8,8 @@
 import cc.mrbird.febs.mall.service.IApiMallNewsService;
 import cc.mrbird.febs.mall.vo.NewsListVo;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -60,16 +60,17 @@
 
     @Override
     public FebsResponse findAllBanner() {
-        QueryWrapper<PlatformBanner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc("is_top");
-        queryWrapper.orderByAsc("created_time");
-        List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(queryWrapper);
+        List<PlatformBanner> paymentMethodList = platformBannerMapper.selectList(
+                new LambdaQueryWrapper<PlatformBanner>()
+                        .orderByAsc(PlatformBanner::getIsTop)
+                        .orderByAsc(PlatformBanner::getCreatedTime)
+        );
         if(CollUtil.isNotEmpty(paymentMethodList)){
             paymentMethodList.forEach(item -> {
-                if("1".equals(item.getIsJump()) && 1 == item.getIsInside()){
+                if("1".equals(item.getIsJump()) && 1 == item.getIsInside() && StrUtil.isNotEmpty(item.getJumpUrl())){
                     String jumpUrl = item.getJumpUrl();
-                    MallActivity mallActivity = mallActivityMapper.selectById(
-                            new LambdaQueryWrapper<MallActivity>().eq(MallActivity::getId, Long.parseLong(jumpUrl)));
+                    MallActivity mallActivity = mallActivityMapper.selectById(Long.parseLong(jumpUrl));
+
                     item.setActivityId(mallActivity.getId());
                 }
             });

--
Gitblit v1.9.1