From f8f52081879eb09033c3cf66fd40314a46c92604 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 09 Jan 2025 11:01:52 +0800
Subject: [PATCH] refactor(mall): 优化活动状态显示和处理

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java |    3 ++-
 src/main/resources/templates/febs/views/modules/activity/list.html      |    2 ++
 2 files changed, 4 insertions(+), 1 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 57dbb83..7c6da9b 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
@@ -88,8 +88,9 @@
 
         if(ActivityTypeEnum.YOU_HUI_JUAN.getValue() == adminActivityAddDto.getType()){
             mallActivity.setCouponId(adminActivityAddDto.getCouponId());
-            addCouponGoods(adminActivityAddDto.getCouponId(),activityGoodsIds);
+//            addCouponGoods(adminActivityAddDto.getCouponId(),activityGoodsIds);
         }
+        this.baseMapper.updateById(mallActivity);
 
         return new FebsResponse().success().data("操作成功");
     }
diff --git a/src/main/resources/templates/febs/views/modules/activity/list.html b/src/main/resources/templates/febs/views/modules/activity/list.html
index 3dbd263..3cd2f66 100644
--- a/src/main/resources/templates/febs/views/modules/activity/list.html
+++ b/src/main/resources/templates/febs/views/modules/activity/list.html
@@ -50,6 +50,8 @@
 <script type="text/html" id="activityStateSwitch">
     {{# if(d.state === 1) { }}
     <input type="checkbox" value={{d.id}} lay-text="开启|关闭" checked lay-skin="switch" lay-filter="activityStateSwitch">
+    {{# } else if(d.state === 2) { }}
+    <input type="checkbox" value={{d.id}} lay-text="进行中|关闭" checked lay-skin="switch" lay-filter="activityStateSwitch">
     {{# } else { }}
     <input type="checkbox" value={{d.id}} lay-text="开启|关闭" lay-skin="switch" lay-filter="activityStateSwitch">
     {{# } }}

--
Gitblit v1.9.1