From add46ca247cb527b0e8fabd217ac73e84ac7e5cd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 04 八月 2025 18:11:38 +0800
Subject: [PATCH] 主页视频，厨神，大健康，商品二维码优惠卷领取状态，优惠卷领取状态
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 67827d3..12715a1 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
@@ -121,14 +121,15 @@
//娲诲姩鏄惁鍙戝竷
if (activity.getPublish()){
- throw new RuntimeException("瀛樺湪娲诲姩宸插彂甯冨垹闄ゅ墠璇蜂笅鏋惰娲诲姩锛�");
+ return Result.error("瀛樺湪娲诲姩宸插彂甯冨垹闄ゅ墠璇蜂笅鏋惰娲诲姩锛�");
}
//妫�鏌ユ姤鍚嶄汉鍛樺墠鍒ゆ柇娲诲姩鏄惁缁撴潫浜� 缁撴潫浜嗗氨鍏佽鍒犻櫎
Date currentDate = new Date();
if (currentDate.before(activity.getEndTime())){
//娲诲姩鏈粨鏉� 涓旀姤鍚嶄汉鍛樼殑鎯呭喌
if(haveApplicationMembers(activity.getId())){
- throw new RuntimeException("瀛樺湪娲诲姩宸叉湁鎶ュ悕浜哄憳锛屾棤娉曞垹闄わ紒");
+ //todo 鎶ュ悕浜哄憳瀛樺湪 浣嗘槸闇�瑕佸垹闄ょ殑鎯呭喌棰勭暀
+// return Result.error("娲诲姩鏈粨鏉熶笖宸叉湁鎶ュ悕浜哄憳锛屾棤娉曞垹闄わ紒");
}
}
@@ -145,9 +146,9 @@
//鍒犻櫎娲诲姩鍚屾椂鍒犻櫎娲诲姩鐨勭浉鍏充俊鎭�
public void delActivityAndInformation(Activity activity){
- if (StringUtils.isNotEmpty(activity.getCover())){
- lmkFileService.deleteObject(activity.getCover());
- }
+// if (StringUtils.isNotEmpty(activity.getCover())){
+// lmkFileService.deleteObject(activity.getCover());
+// }
baseMapper.deleteById(activity.getId());
//鍒犻櫎瀹℃牳璁板綍
activityAuditRecordService.delActivityAuditById(activity.getId());
@@ -260,8 +261,12 @@
if (currentTime.before(entity.getEndTime())){
if(haveApplicationMembers(form.getId())){
- return Result.error("璇ユ椿鍔ㄦ棤娉曚笅鏋讹紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
+// return Result.error("璇ユ椿鍔ㄦ棤娉曚笅鏋讹紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
+ //todo 鎶ュ悕浜哄憳瀛樺湪 浣嗘槸闇�瑕佷笅鏋剁殑鎯呭喌棰勭暀
+
}
+
+
}
}else {
--
Gitblit v1.8.0