From fa677dec1c55db004a31beefb1e346e18c7858c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 18:41:29 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/taoke/autopay/controller/agent/AgentController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/agent/AgentController.java b/src/main/java/com/taoke/autopay/controller/agent/AgentController.java
index 93a2553..29f231a 100644
--- a/src/main/java/com/taoke/autopay/controller/agent/AgentController.java
+++ b/src/main/java/com/taoke/autopay/controller/agent/AgentController.java
@@ -134,8 +134,8 @@
query.oMinCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24 * 60 * 60 * 1000L, "yyyy-MM-dd"), "yyyy-MM-dd"));
break;
case 2:
- query.oMaxCreateTime = new Date(TimeUtil.convertToTimeTemp(nowDay, "yyyy-MM-dd"));
query.oMinCreateTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 24 * 60 * 60 * 1000L * 3, "yyyy-MM-dd"), "yyyy-MM-dd"));
+ break;
case 3:
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date(now));
@@ -154,7 +154,10 @@
List<KeyOrder> list = keyOrderService.listWithUser(query);
long count = keyOrderService.countWithUser(query);
query.hasPayTime = true;
+ query.state = KeyOrder.STATE_PAY;
+ // 缁熻鎵�鏈夌殑
ChannelOrderStatistic statistic = keyOrderService.statisticWithUser(query);
+ // 缁熻
List<AgentOrderVO> voList = new ArrayList<>();
Map<OrderChannelEnum, BigDecimal> shareMoneyMap = channelAgentSharingRatioService.getShareMoneyMap(agent.getId());
@@ -203,6 +206,7 @@
}
ChannelAgentSettleRecordMapper.DaoQuery daoQuery = new ChannelAgentSettleRecordMapper.DaoQuery();
+ daoQuery.agentId = agent.getId();
daoQuery.statusList = Arrays.asList(new Integer[]{ChannelAgentSettleRecord.STATUS_SETTLED, ChannelAgentSettleRecord.STATUS_WITHDRAWING, ChannelAgentSettleRecord.STATUS_WITHDRAW_SUCCESS, ChannelAgentSettleRecord.STATUS_WITHDRAW_REJECTED});
daoQuery.sortList = Arrays.asList(new String[]{"_update_time desc"});
daoQuery.count = 20;
@@ -257,8 +261,7 @@
return JsonUtil.loadFalseResult("灏氭湭鐧诲綍");
}
- if(StringUtil.isNullOrEmpty(agent.getAlipayName())||StringUtil.isNullOrEmpty(agent.getAlipayAccount()))
- {
+ if (StringUtil.isNullOrEmpty(agent.getAlipayName()) || StringUtil.isNullOrEmpty(agent.getAlipayAccount())) {
return JsonUtil.loadFalseResult("灏氭湭璁剧疆鏀粯瀹濅俊鎭�");
}
--
Gitblit v1.8.0