From 58ba101fd106189e938b945d173cd283eccee526 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 May 2021 18:51:49 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
index 6c070d9..ca05a3e 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/controller/ActivityController.java
@@ -4,20 +4,25 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import com.xcong.excoin.common.annotations.SubmitRepeat;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.activity.service.ActivityService;
-import com.xcong.excoin.modules.activity.vo.ActivityMainListVo;
+import com.xcong.excoin.modules.activity.vo.ActivityMainDetailVo;
+import com.xcong.excoin.modules.activity.vo.ActivityMainVo;
+import com.xcong.excoin.modules.helpCenter.vo.NoticeInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
@RestController
-@RequestMapping(value = "admin/activity")
+@RequestMapping(value = "api/activity")
@Slf4j
@Api(value = "ActivityController", tags = "活动中心")
public class ActivityController {
@@ -26,13 +31,37 @@
ActivityService activityService;
/**
- * 活动中心
+ * 首页获取活动图片
*/
- @ApiOperation(value="用户协议", notes="用户协议")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = ActivityMainListVo.class)})
- @GetMapping(value = "/getActivityMainList")
- public Result getActivityMainList() {
- return activityService.getActivityMainList();
+ @ApiOperation(value="首页获取活动图片", notes="首页获取活动图片")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ActivityMainVo.class)})
+ @GetMapping(value = "/getActivityMain")
+ public Result getActivityMain() {
+ return activityService.getActivityMain();
}
+
+ /**
+ * 活动详情
+ */
+ @ApiOperation(value="活动详情", notes="活动详情")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ActivityMainDetailVo.class)})
+ @GetMapping(value = "/getActivityMainDetail")
+ public Result getActivityMainDetail(@ApiParam(name = "id", value = "id", required = true,example = "1")
+ @RequestParam(value = "id") long Id) {
+ return activityService.getActivityMainDetail(Id);
+ }
+
+ /**
+ * 点击领取
+ */
+ @SubmitRepeat
+ @ApiOperation(value="点击领取", notes="点击领取")
+ @GetMapping(value = "/clinkReceive")
+ public Result clinkReceive(@ApiParam(name = "subId", value = "活动规则ID", example = "1")
+ @RequestParam(value = "subId") long subId) {
+ return activityService.clinkReceive(subId);
+ }
+
+
}
--
Gitblit v1.9.1