From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 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 4a2c398..57f39c4 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
@@ -11,9 +11,7 @@
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.model.*;
-import com.dsh.competition.model.CompetitionInfo;
-import com.dsh.competition.model.CompetitionListVo;
-import com.dsh.competition.model.PaymentCompetitionVo;
+import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.IPaymentCompetitionService;
@@ -74,30 +72,38 @@
@Autowired
private AppUserClient appUserClient;
-
+ /**
+ * 获取赛事报名记录
+ */
+ @ResponseBody
+ @RequestMapping("/base/competition/listAllPayment")
+ public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
+ return paymentCompetitionService.listAll(query);
+ }
+ @ResponseBody
@PostMapping("/base/competition/getPayedCompetitions")
- public List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
- List<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
- return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .in("payType",integers)
- .eq("appUserId",requestVo.getAppUserId())
- .eq("payStatus",2)
- .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
+ public BillingRequestVo getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo){
+ BillingRequestVo billingRequestVo = new BillingRequestVo();
+ List<BillingRequest> integers = new ArrayList<>();
+ integers = paymentCompetitionService.queryDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd());
+ System.out.println(integers);
+ if (integers.size() > 0 ){
+ billingRequestVo.setRequests(integers);
+ }
+ return billingRequestVo;
}
-
+ @ResponseBody
@PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){
- List<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
- return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .in("payType",integers)
- .eq("appUserId",requestVo.getAppUserId())
- .eq("payStatus",3)
- .between("refundTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
+ public BillingRequestVo getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo requestVo){
+ BillingRequestVo billingRequestVo = new BillingRequestVo();
+ List<BillingRequest> integers = new ArrayList<>();
+ integers = paymentCompetitionService.queryCancelDatas(requestVo.getAppUserId(),requestVo.getMonthStart(),requestVo.getMonthEnd());
+ System.out.println(integers);
+ if (integers.size() > 0 ){
+ billingRequestVo.setRequests(integers);
+ }
+ return billingRequestVo;
}
@@ -203,6 +209,7 @@
@ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+
})
public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
try {
@@ -218,6 +225,27 @@
}
+ @ResponseBody
+ @PostMapping("/api/competition/paymentCompetitionCourseList")
+ @ApiOperation(value = "赛事报名--支付可用课时列表", tags = {"APP-赛事活动列表"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+ })
+ public ResultUtil paymentCompetitionCourseList(Integer id){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ return cttService.paymentCompetitionCourseList(uid, id);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
/**
* 报名赛事微信支付回调
* @param request
--
Gitblit v1.7.1