From c36b79ea63fe43aa77ab74508505b727e4976a01 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 十一月 2023 16:01:04 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 53f0dd5..b484715 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -337,12 +337,14 @@
     @Override
     public void deleteMgtActivity(String activityId){
         Activity activity = this.getById(activityId);
-        if (activity.getActivityStatus() != 0) {
-            throw new ServiceException(AppErrorConstant.ACTIVITY_ING_DELETE);
-        }
+//        if (activity.getActivityStatus() != 0) {
+//            throw new ServiceException(AppErrorConstant.ACTIVITY_ING_DELETE);
+//        }
         activity.setDelFlag(1);
         activity.setActivityStatus(-1);
         this.saveOrUpdate(activity);
+        //活动结束
+        endActivity(activityId);
     }
 
     /**

--
Gitblit v1.7.1