From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 06 Jan 2025 17:16:57 +0800 Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法,支持分页和搜索 - 在 AdminActivityController 中添加 list 接口,返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板,根据活动状态控制按钮显示 --- src/main/java/cc/mrbird/febs/common/listener/RedisKeyExpirationListener.java | 54 +++++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/common/listener/RedisKeyExpirationListener.java b/src/main/java/cc/mrbird/febs/common/listener/RedisKeyExpirationListener.java index 737c005..1b11c40 100644 --- a/src/main/java/cc/mrbird/febs/common/listener/RedisKeyExpirationListener.java +++ b/src/main/java/cc/mrbird/febs/common/listener/RedisKeyExpirationListener.java @@ -1,26 +1,18 @@ package cc.mrbird.febs.common.listener; -import cc.mrbird.febs.common.enumerates.OrderStatusEnum; -import cc.mrbird.febs.common.utils.AppContants; -import cc.mrbird.febs.mall.entity.MallOrderInfo; import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper; -import cn.hutool.core.util.StrUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.listener.KeyExpirationEventMessageListener; import org.springframework.data.redis.listener.RedisMessageListenerContainer; -import org.springframework.stereotype.Component; - -import java.util.List; /** * @author wzy * @date 2021-04-16 **/ @Slf4j -@Component +//@Component public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener { public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) { @@ -32,27 +24,27 @@ @Override public void onMessage(Message message, byte[] pattern) { - String expireKey = message.toString(); - if (expireKey.startsWith(AppContants.REDIS_ORDER_OVERTIME_PREFIX)) { - List<String> split = StrUtil.split(expireKey, '_'); - if (split.size() < 4) { - log.error("自动取消订单失效:{}", expireKey); - return; - } - Long memberId = Long.valueOf(split.get(2)); - Long orderId = Long.valueOf(split.get(3)); - - MallOrderInfo orderInfo = mallOrderInfoMapper.selectOrderByMemberIdAndId(memberId, orderId); - if (orderInfo == null) { - log.error("自动取消订单参数错误:{}", expireKey); - return; - } - if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) { - log.info("自动取消订单:{},{}", memberId, orderId); - orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue()); - orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY); - mallOrderInfoMapper.updateById(orderInfo); - } - } +// String expireKey = message.toString(); +// if (expireKey.startsWith(AppContants.REDIS_ORDER_OVERTIME_PREFIX)) { +// List<String> split = StrUtil.split(expireKey, '_'); +// if (split.size() < 4) { +// log.error("自动取消订单失效:{}", expireKey); +// return; +// } +// Long memberId = Long.valueOf(split.get(2)); +// Long orderId = Long.valueOf(split.get(3)); +// +// MallOrderInfo orderInfo = mallOrderInfoMapper.selectOrderByMemberIdAndId(memberId, orderId); +// if (orderInfo == null) { +// log.error("自动取消订单参数错误:{}", expireKey); +// return; +// } +// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) { +// log.info("自动取消订单:{},{}", memberId, orderId); +// orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue()); +// orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY); +// mallOrderInfoMapper.updateById(orderInfo); +// } +// } } } -- Gitblit v1.9.1