From ff1ab6f2c6f9cb480e6dbe712eb25b2701279d67 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 10:36:19 +0800
Subject: [PATCH] 活动接口更新

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 32ad58f..b32929a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -82,6 +82,7 @@
 
         return Result.ok("淇敼鎴愬姛");
     }
+    //鍒ゆ柇璇锋眰鏉ユ簮鏄钩鍙扮杩樻槸灏忕▼搴忕
     public void mangerSaveOrUpdate(Boolean isManager,Activity entity){
         ActivityAuditRecordForm activityAuditRecordForm;
         //娣诲姞瀹℃牳璁板綍
@@ -95,19 +96,27 @@
     }
     @Override
     public Result remove(List<String> ids) {
-        baseMapper.deleteBatchIds(ids);
+        //鍒ゆ柇娲诲姩id鏄惁宸茬粡瀛樺湪鎶ュ悕浜哄憳
+        for(String id : ids){
+            if(haveApplicationMembers(id)){
+                return Result.error("璇ユ椿鍔ㄦ棤娉曞垹闄わ紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
+            }
+        }
+        //鏈粡杩噐eturn鍒欏垹闄�
+        for (String id : ids){
+            delActivityAndInformation(id);
+        }
+
         return Result.ok("鍒犻櫎鎴愬姛");
     }
-
-    @Override
-    public Result removeById(String id) {
-        //鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
+    //鍒ゆ柇娲诲姩鏄惁瀛樺湪鎶ュ悕浜哄憳
+    public Boolean haveApplicationMembers(String id){
         ActivityMembersQuery activityMembersQuery = new ActivityMembersQuery();
         activityMembersQuery.setId(id);
-        if((long)activityMembersPage(activityMembersQuery).get("total") > 0){
-            return Result.error("璇ユ椿鍔ㄦ棤娉曚笅鏋讹紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
-        }
-        //鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
+        return (long) activityMembersPage(activityMembersQuery).get("total") > 0;
+    }
+    //鍒犻櫎娲诲姩鍚屾椂鍒犻櫎娲诲姩鐨勭浉鍏充俊鎭�
+    public void delActivityAndInformation(String id){
         ActivityVO vo = baseMapper.getById(id);
         if (StringUtils.isNotEmpty(vo.getCover())){
             lmkFileService.deleteObject(vo.getCover());
@@ -115,7 +124,16 @@
         baseMapper.deleteById(id);
         //鍒犻櫎瀹℃牳璁板綍
         activityAuditRecordService.delActivityAuditById(id);
+    }
+    @Override
+    public Result removeById(String id) {
+        //鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
 
+        if(haveApplicationMembers(id)){
+            return Result.error("璇ユ椿鍔ㄦ棤娉曞垹闄わ紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
+        }
+        //鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
+        delActivityAndInformation(id);
         return Result.ok("鍒犻櫎鎴愬姛");
     }
 

--
Gitblit v1.8.0