From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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, 17 insertions(+), 1 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 86b0cec..b08fed4 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
@@ -18,6 +18,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -40,7 +41,22 @@
@ResponseBody
@RequestMapping("/finance/rechargeList")
public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query){
- return rechargeRecordsService.rechargeList(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;
}
/**
* 数据统计-充值记录列表数据
--
Gitblit v1.7.1