From 631a5aa09e0147ca81fffcb1434e57b1cd1ba6f6 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 09:34:53 +0800
Subject: [PATCH] app端口:积分变动记录增加变动类型字段，代码同步更新；积分兑换操作的数量校验功能完善
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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..e82c819 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
@@ -75,29 +75,30 @@
private AppUserClient appUserClient;
+ @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;
}
--
Gitblit v1.7.1