From e93a1ffbe1b01253d7a9808cc7a05b5c69413c8d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 11:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 dfbb732..ff6b4dc 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
@@ -63,7 +63,37 @@
private IPaymentCompetitionService paymentCompetitionService;
+ @PostMapping("/base/competition/getPayedCompetitions")
+ public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId){
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("payType",integers)
+ .eq("appUserId",appUserId)
+ .eq("payStatus",2));
+ }
+
+ @PostMapping("/base/competition/getCancelOrderOfUserPay")
+ public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId){
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("payType",integers)
+ .eq("appUserId",appUserId)
+ .eq("payStatus",3));
+ }
+
+
+ @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
+ public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
+ return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .eq("payType",3)
+ .eq("appUserId",appUserId)
+ .eq("payStatus",3));
+ }
@@ -85,8 +115,8 @@
PurchaseRecordVo recordVo = new PurchaseRecordVo();
recordVo.setPurchaseType("报名赛事");
recordVo.setPurchaseTime(dateFormat.format(coms.getInsertTime()));
- Competition competition = cttService.getById(coms.getCompetitionId());
- recordVo.setPurchaseAmount("-"+competition.getPrice());
+ PaymentCompetition paymentCompetition = paymentCompetitionService.getById(coms.getPaymentCompetitionId());
+ recordVo.setPurchaseAmount("-"+paymentCompetition.getAmount());
recordVos.add(recordVo);
});
}
@@ -104,10 +134,10 @@
@ApiImplicitParam(value = "城市code", name = "cityCode", dataType = "string", required = false),
@ApiImplicitParam(value = "搜索内容", name = "content", dataType = "string", required = false),
@ApiImplicitParam(value = "报名条件（1=全部用户，2=仅限年度会员参与，3=仅限学员参与）", name = "registerCondition", dataType = "int", required = false),
- @ApiImplicitParam(value = "排序（1=正序，2=倒序）", name = "heat", dataType = "int", required = false),
+ @ApiImplicitParam(value = "排序（asc=正序，desc=倒序）", name = "heat", dataType = "String", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, Integer heat){
+ public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat){
try {
List<CompetitionListVo> competitionListVos = cttService.queryCompetitionList(cityCode, content, registerCondition, heat);
return ResultUtil.success(competitionListVos);
@@ -244,7 +274,7 @@
@PostMapping("/api/competition/queryMyCompetitionList")
@ApiOperation(value = "获取已报名赛事列表", tags = {"APP-赛事活动列表"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "类型（1=未开始，2=进行中，3=已结束，4=已取消）", name = "type", dataType = "int", required = true),
+ @ApiImplicitParam(value = "类型（0=全部，1=未开始，2=进行中，3=已结束，4=已取消）", name = "type", dataType = "int", required = true),
@ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
@ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
--
Gitblit v1.7.1