From ea2e322e4564a177b49ad38fda2d42780632ea0d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 11:07:26 +0800
Subject: [PATCH] 10.16
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 09efcda..0fbd82e 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
@@ -318,7 +318,7 @@
temp.setAmount(rechargeRecordsVO.getAmount());
}
temp.setIncomeType(2);
- temp.setState(rechargeRecordsVO.getState());
+ temp.setState(rechargeRecordsVO.getPayStatus());
incomeVOS.add(temp);
}
}
@@ -356,7 +356,10 @@
}
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
- Store store = storeClient.getStoreById(competition1.getStoreId());
+ if (!competition1.getStoreId().equals("")){
+ String[] split = competition1.getStoreId().split(",");
+ }
+ Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
IncomeVO temp = new IncomeVO();
temp.setId(competition.getId().intValue());
temp.setProvince(tAppUser.getProvince());
@@ -405,6 +408,7 @@
}
return incomeVOS;
}
+
/**
* 获取收入管理列表
*/
@@ -534,7 +538,7 @@
}
TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
- Store store = storeClient.getStoreById(competition1.getStoreId());
+ Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId().split(",")[0]));
IncomeVO temp = new IncomeVO();
temp.setId(competition.getId().intValue());
temp.setProvince(tAppUser.getProvince());
--
Gitblit v1.7.1