From 31755963171a6c7b7fdc286d83882daac6d9310b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 六月 2025 17:30:26 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 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..d6cbced 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
@@ -348,7 +348,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 +382,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
@@ -415,12 +415,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 +467,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 +479,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,7 +522,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);
}
@@ -637,7 +630,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 +664,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getPayStatus());
-
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -686,11 +678,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 +699,7 @@
temp.setAmount(registerOrderVO.getMoney());
}
temp.setIncomeType(3);
- temp.setState(registerOrderVO.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -742,11 +732,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 +751,7 @@
temp.setAmount(new BigDecimal(competition.getAmount().toString()));
}
temp.setIncomeType(4);
- temp.setState(competition.getPayStatus());
+ temp.setState(2);
incomeVOS.add(temp);
}
}
@@ -772,11 +760,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 +800,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