From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java b/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
index a52e75c..ca43f8e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/MyActivityService.java
@@ -2,12 +2,25 @@
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.entity.Activity;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
+import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import com.baomidou.mybatisplus.extension.service.IService;
public interface MyActivityService extends IService<Activity> {
public Result getMyActivityList(MyActivityQuery query);
- public Result cancelActivity(ActivityReportQuery query);
+ public Result activityCancel(String activityId);
+
+ Result activityReport(ActivityReportForm activityReportForm);
+
+ /**
+ * 鑾峰緱鎶ュ悕涓棿琛ㄥ璞℃洿鍏锋椿鍔╥d 锛岋紙鐢ㄦ埛id锛夋潵鑷猽ser涓婁笅鏂�
+ * @param activityId 娲诲姩id
+ * @return 鏈煡鍒� 杩斿洖 null
+ */
+ ActivityReportVO userReport(String activityId);
+
+ Result detailByUsr(String activityId);
}
--
Gitblit v1.8.0