From 2922e51a7a8e657a8467c818ae16700e41ddac77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 五月 2022 19:45:58 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
index c72e872..85f1812 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
@@ -77,6 +77,7 @@
public List<Extract> list(ExtractQuery extractQuery, int page, int pageSize) {
DaoQuery daoQuery = new DaoQuery();
daoQuery.uid = extractQuery.getUid();
+ daoQuery.state = extractQuery.getState();
daoQuery.minCreateTime = extractQuery.toStartTime();
daoQuery.maxCreateTime = extractQuery.toEndTime();
daoQuery.sortList = Arrays.asList(new String[]{"create_time desc"});
@@ -89,6 +90,7 @@
public long count(ExtractQuery extractQuery) {
DaoQuery daoQuery = new DaoQuery();
daoQuery.uid = extractQuery.getUid();
+ daoQuery.state = extractQuery.getState();
daoQuery.minCreateTime = extractQuery.toStartTime();
daoQuery.maxCreateTime = extractQuery.toEndTime();
return extractMapper.count(daoQuery);
@@ -235,7 +237,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void passExtract(Long id, Long adminId) throws ExtractException {
+ public void passExtract(Long id, String adminId) throws ExtractException {
Extract extract = extractMapper.selectByPrimaryKeyForUpdate(id);
if (extract == null) {
throw new ExtractException(ExtractException.CODE_NOT_EXIST, "鎻愮幇璁板綍涓嶅瓨鍦�");
@@ -267,7 +269,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void rejectExtract(Long id, Long adminId, String reason) throws ExtractException, UserMoneyBalanceException, ParamsException {
+ public void rejectExtract(Long id, String adminId, String reason) throws ExtractException, UserMoneyBalanceException, ParamsException {
Extract extract = extractMapper.selectByPrimaryKeyForUpdate(id);
if (extract == null) {
throw new ExtractException(ExtractException.CODE_NOT_EXIST, "鎻愮幇璁板綍涓嶅瓨鍦�");
@@ -346,7 +348,7 @@
* @param extract
* @param adminId
*/
- private void transferByAlipay(Extract extract, Long adminId) {
+ private void transferByAlipay(Extract extract, String adminId) {
//鑾峰彇鐢ㄦ埛鐨勭郴缁�
UserInfo user = userInfoService.get(extract.getUser().getId());
String appName = user.getSystem().getName();
@@ -370,7 +372,7 @@
}
}
- private void transferByWX(Extract extract, Long adminId, String wxAPPId) {
+ private void transferByWX(Extract extract, String adminId, String wxAPPId) {
//鑾峰彇鐢ㄦ埛鐨勭郴缁�
UserInfo user = userInfoService.get(extract.getUser().getId());
String appName = user.getSystem().getName();
--
Gitblit v1.8.0