From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index b08fed4..03dc7c6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -40,30 +40,31 @@
*/
@ResponseBody
@RequestMapping("/finance/rechargeList")
- public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query){
+ public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query) {
List<RechargeRecordsVO> rechargeRecordsVOS = rechargeRecordsService.rechargeList(query);
for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
TAppUser byId = appUserService.getById(rechargeRecordsVO.getAppUserId());
- if (byId==null)continue;
+ if (byId == null) continue;
Date vipEndTime = byId.getVipEndTime();
- if (vipEndTime==null){
+ if (vipEndTime == null) {
rechargeRecordsVO.setType(2);
continue;
}
- if (rechargeRecordsVO.getPayTime().after(vipEndTime)){
+ if (rechargeRecordsVO.getPayTime().after(vipEndTime)) {
rechargeRecordsVO.setType(2);
- }else{
+ } else {
rechargeRecordsVO.setType(1);
}
}
- return rechargeRecordsVOS;
+ return rechargeRecordsVOS;
}
+
/**
* 数据统计-充值记录列表数据
*/
@ResponseBody
@RequestMapping("/finance/rechargeList1")
- public List<RechargeRecords> rechargeList1(@RequestBody RechargeRecordsQuery query){
+ public List<RechargeRecords> rechargeList1(@RequestBody RechargeRecordsQuery query) {
List<RechargeRecords> payStatus = rechargeRecordsService.list(new QueryWrapper<RechargeRecords>().eq("payStatus", 2));
for (RechargeRecords list : payStatus) {
TAppUser byId = appUserService.getById(list.getAppUserId());
@@ -72,12 +73,13 @@
}
return payStatus;
}
+
/**
* 加入会员列表数据
*/
@ResponseBody
@RequestMapping("/finance/vipPaymentList")
- public List<VipPayment> registrationList(@RequestBody IncomeQuery query){
+ public List<VipPayment> registrationList(@RequestBody IncomeQuery query) {
return rechargeRecordsService.listAll(query);
}
}
--
Gitblit v1.7.1