From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 cc1c78b..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
@@ -12,11 +12,13 @@
import com.dsh.account.model.vo.CoachSerchVO;
import com.dsh.account.model.vo.RechargeRecordsVO;
import com.dsh.account.service.*;
+import net.bytebuddy.asm.Advice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -32,32 +34,52 @@
@Autowired
private TAppUserService appUserService;
+
/**
* 充值记录列表数据
*/
@ResponseBody
@RequestMapping("/finance/rechargeList")
- public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query){
- return rechargeRecordsService.rechargeList(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;
+ Date vipEndTime = byId.getVipEndTime();
+ if (vipEndTime == null) {
+ rechargeRecordsVO.setType(2);
+ continue;
+ }
+ if (rechargeRecordsVO.getPayTime().after(vipEndTime)) {
+ rechargeRecordsVO.setType(2);
+ } else {
+ rechargeRecordsVO.setType(1);
+ }
+ }
+ 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());
+ Integer addUserId = byId.getAddUserId();
+
}
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