From e5a431b9082c8882ccdd69d04d4bd76645d44b6e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 20:50:03 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 66 +++++++++++++++------------------
1 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index f039285..0048826 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -41,6 +41,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
@@ -304,8 +305,12 @@
List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
.eq("operatorId", UserExt.getUser().getObjectId())).stream()
.map(TStore::getId).collect(Collectors.toList());
+ if (operatorId.isEmpty()){
+ operatorId.add(0);
+ }
query.setStoresIds(operatorId);
competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
+
siteBookingQuery.setStoreIds(operatorId);
}
if (UserExt.getUser().getObjectType()==3){
@@ -348,7 +353,7 @@
temp.setStoreName("");
temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
temp.setIncomeType(1);
- temp.setState(vipPayment.getState());
+ temp.setState(2);
temp.setInsertTime(vipPayment.getInsertTime());
if (UserExt.getUser().getObjectType()!=1){
break;
@@ -382,7 +387,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
@@ -415,12 +420,9 @@
temp.setAmount(registerOrderVO.getMoney());
}
temp.setIncomeType(3);
- if (registerOrderVO.getPayStatus() == 1){
+
temp.setState(2);
- }
- if (registerOrderVO.getPayStatus() == 2){
- temp.setState(1);
- }
+
incomeVOS.add(temp);
}
}
@@ -470,11 +472,9 @@
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
temp.setIncomeType(4);
- if (competition.getPayStatus() == 1){
+
temp.setState(2);
- }else if (competition.getPayStatus() == 2){
- temp.setState(1);
- }
+
incomeVOS.add(temp);
}
}
@@ -484,11 +484,9 @@
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
- temp.setState(1);
- } else {
+
temp.setState(2);
- }
+
TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
Store store = storeClient.getStoreById(siteBooking.getStoreId());
@@ -529,11 +527,16 @@
temp.setPhone(worldCupIncomeVO.getPhone());
temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
temp.setIncomeType(6);
- temp.setState(1);
+ temp.setState(2);
temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
incomeVOS.add(temp);
}
}
+ // 推荐：一行代码解决
+ incomeVOS.sort(Comparator.comparing(
+ IncomeVO::getInsertTime,
+ Comparator.nullsLast(Comparator.reverseOrder())
+ ));
return incomeVOS;
}
@@ -637,7 +640,7 @@
temp.setStoreName("");
temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
temp.setIncomeType(1);
- temp.setState(vipPayment.getState());
+ temp.setState(2);
temp.setInsertTime(vipPayment.getInsertTime());
if (UserExt.getUser().getObjectType()!=1){
break;
@@ -671,8 +674,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
-
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -686,11 +688,9 @@
TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
IncomeVO temp = new IncomeVO();
temp.setId(registerOrderVO.getId().toString());
- if (registerOrderVO.getPayStatus()==2) {
- temp.setState(2);
- } else {
- temp.setState(1);
- }
+
+ temp.setState(2);
+
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
temp.setProvince(tAppUser.getProvince());
@@ -709,7 +709,7 @@
temp.setAmount(registerOrderVO.getMoney());
}
temp.setIncomeType(3);
- temp.setState(registerOrderVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -742,11 +742,9 @@
temp.setStoreName(substring);
}
- if (competition.getPayStatus()==2) {
+
temp.setState(2);
- } else {
- temp.setState(1);
- }
+
temp.setId(competition.getId().toString());
if (tAppUser!=null){
if (tAppUser.getProvince()!=null){
@@ -763,7 +761,7 @@
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
temp.setIncomeType(4);
- temp.setState(competition.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -772,11 +770,7 @@
List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
for (SiteBooking siteBooking : siteBookings) {
IncomeVO temp = new IncomeVO();
- if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
- temp.setState(1);
- } else {
- temp.setState(2);
- }
+ temp.setState(2);
TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
Store store = storeClient.getStoreById(siteBooking.getStoreId());
@@ -816,7 +810,7 @@
temp.setPhone(worldCupIncomeVO.getPhone());
temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
temp.setIncomeType(6);
- temp.setState(1);
+ temp.setState(2);
temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
incomeVOS.add(temp);
}
--
Gitblit v1.7.1