From 85f6036ad23c66b97bc7c253f4d04c762fe2fde3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 11:43:45 +0800
Subject: [PATCH] feat(activity): 优化活动列表展示和状态管理
---
src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
index 1ca5061..a84321d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -201,13 +201,14 @@
List<MallActivity> mallActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<MallActivity>()
.select(MallActivity::getId, MallActivity::getName)
- .eq(MallActivity::getState, YesOrNoOrIngEnum.YES.getValue())
);
if(CollUtil.isNotEmpty(mallActivities)){
for (MallActivity mallActivity : mallActivities) {
AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
adminMallActivityListVo.setId(mallActivity.getId());
- adminMallActivityListVo.setName(mallActivity.getName());
+ String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
+ String desc1 = ActivityTypeEnum.getEnum(mallActivity.getType()).getDesc();
+ adminMallActivityListVo.setName(mallActivity.getName()+desc+desc1);
mallActivityList.add(adminMallActivityListVo);
}
}
@@ -219,12 +220,27 @@
MallActivity mallActivity = this.baseMapper.selectById(id);
mallActivity.setState(state);
this.baseMapper.updateById(mallActivity);
+
+ if(YesOrNoOrIngEnum.NO.getValue() == state){
+ List<MallGoods> mallGoods = mallGoodsMapper.selectList(
+ new LambdaQueryWrapper<MallGoods>()
+ .eq(MallGoods::getActivityId, id)
+ );
+ if(CollUtil.isNotEmpty(mallGoods)){
+ mallGoodsMapper.update(null,
+ new LambdaQueryWrapper<MallGoods>()
+ .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_DISABLED)
+ .eq(MallGoods::getActivityId, id)
+ );
+ }
+ }
return new FebsResponse().success().message("操作成功");
}
@Override
public FebsResponse delAdminActivity(Long id) {
this.baseMapper.deleteById(id);
+
return new FebsResponse().success().message("操作成功");
}
@@ -234,14 +250,14 @@
List<MallActivity> mallActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<MallActivity>()
.select(MallActivity::getId, MallActivity::getName)
- .eq(MallActivity::getState, YesOrNoOrIngEnum.YES.getValue())
.eq(MallActivity::getType, type)
);
if(CollUtil.isNotEmpty(mallActivities)){
for (MallActivity mallActivity : mallActivities) {
AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
adminMallActivityListVo.setId(mallActivity.getId());
- adminMallActivityListVo.setName(mallActivity.getName());
+ String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
+ adminMallActivityListVo.setName(mallActivity.getName()+desc);
mallActivityList.add(adminMallActivityListVo);
}
}
--
Gitblit v1.9.1