Administrator
2025-04-21 a217652d33c75df23202828000d82d0ca8555ac2
src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java
@@ -102,10 +102,11 @@
    @ResponseBody
    @RequestMapping("list")
    public String listAgent(String key, String day, int page, int limit) {
    public String listAgent(String key, String startDay,String endDay, int page, int limit) {
        //先查询所有的数据
        ChannelAgentSettleRecordMapper.DaoQuery query = new ChannelAgentSettleRecordMapper.DaoQuery();
        query.settleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(day)?null:day;
        query.minSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(startDay)?null:startDay;
        query.maxSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(endDay)?null:endDay;
        query.sortList = Arrays.asList(new String[]{"_create_time desc"});
        query.start = (long) (page - 1) * limit;
        query.count = limit;
@@ -126,11 +127,39 @@
        return JsonUtil.loadTrueResult("");
    }
    /**
     * @author hxh
     * @description 开始结算
     * @date 0:28 2024/10/14
     * @param: startDay 开始日期
     * @param: endDay 结束日期
     * @return java.lang.String
     **/
    @ResponseBody
    @RequestMapping("startSettle")
    public String startSettle(String  day) {
    public String startSettle(String  startDay, String endDay) {
        if(StringUtil.isNullOrEmpty(startDay)||StringUtil.isNullOrEmpty(endDay)){
            return JsonUtil.loadFalseResult("结算日期输入不完整");
        }
        if(Integer.parseInt(startDay.replace("-",""))>Integer.parseInt(endDay.replace("-",""))){
            return JsonUtil.loadFalseResult("开始日期不能大于结束日期");
        }
        long startTimeStamp =  TimeUtil.convertToTimeTemp(startDay,"yyyy-MM-dd");
        long endTimeStamp =  TimeUtil.convertToTimeTemp(endDay,"yyyy-MM-dd");
        List<String> days=new ArrayList<>();
        for(int i=0;i<100;i++){
          if(endTimeStamp< startTimeStamp + i*24*60*60*1000L){
              break;
          }
          days.add(TimeUtil.getGernalTime(startTimeStamp + i*24*60*60*1000L,"yyyy-MM-dd"));
       }
        try {
           channelAgentSettleService.startSettle(day);
            for(String day:days) {
                channelAgentSettleService.startSettle(day);
            }
            return JsonUtil.loadTrueResult("");
        } catch (ChannelAgentSettleException e) {
            return JsonUtil.loadFalseResult(e.getMessage());
@@ -213,9 +242,10 @@
    @RequestMapping("downloadSettleTable")
    public void downloadSettleTable(String day, HttpServletResponse response) throws IOException {
    public void downloadSettleTable(String startDay,String endDay, HttpServletResponse response) throws IOException {
        ChannelAgentSettleRecordMapper.DaoQuery daoQuery=new ChannelAgentSettleRecordMapper.DaoQuery();
        daoQuery.settleDay = day;
        daoQuery.minSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(startDay)?null:startDay;
        daoQuery.maxSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(endDay)?null:endDay;
        daoQuery.count = 10000;
        daoQuery.status =  ChannelAgentSettleRecord.STATUS_NOT_SETTLE;
        List<ChannelAgentSettleRecord> list =   channelAgentSettleService.list(daoQuery);