From 595b7935a30e84fba1bc3561d05f9d19d3e32e1f Mon Sep 17 00:00:00 2001 From: Administrator <1101184511@qq.com> Date: 星期三, 23 四月 2025 00:45:48 +0800 Subject: [PATCH] 后台管理页面完成 --- src/main/java/com/taoke/autopay/controller/agent/AgentController.java | 10 +++++++--- 1 files changed, 7 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..5d1269c 100644 --- a/src/main/java/com/taoke/autopay/controller/agent/AgentController.java +++ b/src/main/java/com/taoke/autopay/controller/agent/AgentController.java @@ -120,6 +120,7 @@ if (!StringUtil.isNullOrEmpty(filter.getKey())) { query.nickName = filter.getKey().trim(); } + query.ignore = false; query.start = (filter.getPage() - 1) * 20L; query.count = 20; @@ -134,8 +135,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 +155,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 +207,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 +262,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