Changes

admin

2025-02-09 a592f3dc14f342ceab26fb904cae1c4020244368

 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("尚未设置支付宝信息");
        }