From a42cd13388b041b29ebbae7e40071011bae31f67 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 10 七月 2023 11:59:22 +0800
Subject: [PATCH] 充值中心除了支付的其他接口；增加储值规则实体类
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 19a543e..15f82ac 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -16,10 +16,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -62,7 +59,10 @@
.eq("payType",3 )
.eq("auditStatus",2));
List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(sourseList.getStartTime(),sourseList.getEndTime(),sourseList.getAppUserId(),comIds);
+ List<UserCompetition> userCompetitions = ucttService.list(new QueryWrapper<UserCompetition>()
+ .between("insertTime", sourseList.getStartTime(),sourseList.getEndTime() )
+ .eq("userId", sourseList.getAppUserId())
+ .in("competitionId",comIds ));
if (userCompetitions.size() > 0){
userCompetitions.forEach(coms ->{
PurchaseRecordVo recordVo = new PurchaseRecordVo();
@@ -102,18 +102,32 @@
-
- public ResultUtil<CompetitionInfo> queryCompetitionInfo(Integer id){
+ @ResponseBody
+ @PostMapping("/base/competition/queryCompetitionInfo")
+ @ApiOperation(value = "获取赛事详情", tags = {"APP-赛事活动列表"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<CompetitionInfo> queryCompetitionInfo(Integer id, String lon, String lat){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
}
- return null;
+ CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat);
+ return ResultUtil.success(competitionInfo);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
+
+
+// public ResultUtil
}
--
Gitblit v1.7.1