From 59b5c5cdcdfcf29537a53b90aa01331cb8894792 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 12:59:06 +0800
Subject: [PATCH] refactor(mall): 优化活动列表展示和商品添加功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 ce469dd..4bb947e 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,14 +201,14 @@
 
         List<MallActivity> mallActivities = this.baseMapper.selectList(
                 new LambdaQueryWrapper<MallActivity>()
-                        .select(MallActivity::getId, MallActivity::getName)
+                        .select(MallActivity::getId, MallActivity::getName, MallActivity::getState, MallActivity::getType)
         );
         if(CollUtil.isNotEmpty(mallActivities)){
             for (MallActivity mallActivity : mallActivities) {
                 AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
                 adminMallActivityListVo.setId(mallActivity.getId());
-                String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
-                String desc1 = ActivityTypeEnum.getEnum(mallActivity.getType()).getDesc();
+                String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
+                String desc1 = ActivityTypeEnum.ZHE_KOU.getActivityType(mallActivity.getType());
                 adminMallActivityListVo.setName(mallActivity.getName()+desc+desc1);
                 mallActivityList.add(adminMallActivityListVo);
             }
@@ -250,14 +250,14 @@
         List<AdminMallActivityListVo> mallActivityList = new ArrayList<>();
         List<MallActivity> mallActivities = this.baseMapper.selectList(
                 new LambdaQueryWrapper<MallActivity>()
-                        .select(MallActivity::getId, MallActivity::getName)
+                        .select(MallActivity::getId, MallActivity::getName, MallActivity::getState)
                         .eq(MallActivity::getType, type)
         );
         if(CollUtil.isNotEmpty(mallActivities)){
             for (MallActivity mallActivity : mallActivities) {
                 AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
                 adminMallActivityListVo.setId(mallActivity.getId());
-                String desc = YesOrNoOrIngEnum.getEnum(mallActivity.getState()).getDesc();
+                String desc = YesOrNoOrIngEnum.YES.getActivityDesc(mallActivity.getState());
                 adminMallActivityListVo.setName(mallActivity.getName()+desc);
                 mallActivityList.add(adminMallActivityListVo);
             }

--
Gitblit v1.9.1