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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 f6cfaab..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
@@ -6,6 +6,8 @@
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.ActivityMainDetailVo;
@@ -20,7 +22,7 @@
import lombok.extern.slf4j.Slf4j;
@RestController
-@RequestMapping(value = "admin/activity")
+@RequestMapping(value = "api/activity")
@Slf4j
@Api(value = "ActivityController", tags = "活动中心")
public class ActivityController {
@@ -44,17 +46,18 @@
@ApiOperation(value="活动详情", notes="活动详情")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = ActivityMainDetailVo.class)})
@GetMapping(value = "/getActivityMainDetail")
- public Result getActivityMainDetail(@ApiParam(name = "活动ID", value = "ID", example = "1")
- @RequestParam(value = "Id") long Id) {
+ 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 = "活动规则ID", value = "subId", example = "1")
+ public Result clinkReceive(@ApiParam(name = "subId", value = "活动规则ID", example = "1")
@RequestParam(value = "subId") long subId) {
return activityService.clinkReceive(subId);
}
--
Gitblit v1.9.1