From 400724b562dba51135d9b1a8a0b2be61d04e3ce7 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 2 Dec 2021 13:57:29 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/ActPeriodService.java     |  2 +-
 .../service/impl/ActInfoServiceImpl.java       | 18 ++++++++++--------
 .../service/impl/ActPeriodServiceImpl.java     |  5 +++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java
index 723b651d..0fa7f904 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActPeriodService.java
@@ -101,7 +101,7 @@ public interface ActPeriodService extends BaseService<ActPeriodEntity> {
      * @author lc
      * @since 2021/9/2 15:28
      */
-    void removeActPeriodsByActId(String actId);
+    boolean removeActPeriodsByActId(String actId);
 
     /**
      * 获取活动时间段
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index befdfa4d..cea3887d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -923,14 +923,16 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
      */
     private void saveOrUpdateActPeriods(List<ActPeriodDTO> periods, String actId, Integer actQuotaCategory) {
         // 删除活动已有的时间段
-        actPeriodService.removeActPeriodsByActId(actId);
-        // 保存活动时间段
-        for (ActPeriodDTO dto:
-                periods) {
-            dto.setActId(actId);
-            dto.setActPeriodQuotaCategory(actQuotaCategory);
-            dto.setId(null);
-            actPeriodService.save(dto);
+        boolean result = actPeriodService.removeActPeriodsByActId(actId);
+        if (result) {
+            // 保存活动时间段
+            for (ActPeriodDTO dto:
+                    periods) {
+                dto.setActId(actId);
+                dto.setActPeriodQuotaCategory(actQuotaCategory);
+                dto.setId(null);
+                actPeriodService.save(dto);
+            }
         }
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
index 33f0f21f..0cdc48c3 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
@@ -101,13 +101,14 @@ public class ActPeriodServiceImpl extends BaseServiceImpl<ActPeriodDao, ActPerio
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void removeActPeriodsByActId(String actId) {
+    public boolean removeActPeriodsByActId(String actId) {
         // 校验活动是否已有人报名，有人报名后不能修改活动时间段
         List<ActPeriodDTO> periods = baseDao.selectPeriodsAlreadySignIn(actId);
         if (CollectionUtil.isNotEmpty(periods)) {
-            throw new RenException("活动时间段已有人报名，不能修改");
+            return false;
         }
         baseDao.modifyDelFlagByActId(actId);
+        return true;
     }
 
     @Override