diff --git a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ToolServiceImpl.java b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ToolServiceImpl.java index 0bbef62..973384c 100644 --- a/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ToolServiceImpl.java +++ b/src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/ToolServiceImpl.java @@ -1,8 +1,6 @@ package com.yn.bftl.thirdparty.modules.chinaums.service.impl; import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; @@ -60,10 +58,10 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import javax.servlet.ServletOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -198,13 +196,17 @@ // jsonObject.put("billDate", billDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); // Map result = chinaumsUtil.execute(RouteUtil.ROUTE_WALLET_TRADE_BILLS, jsonObject, Map.class); // return result.get("downloadUrl").toString(); - + if (LocalDate.now().compareTo(billDate) < 0) { + throw new RuntimeException("日期不能大于当前时间"); + } + String billdate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(billDate); + String nowdate = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()); ChinaumsAuthInfo chinaumsAuthInfo = authService.getCurrentAuthInfo(); - DateTime dateTime =ObjectUtil.isEmpty(billDate)?DateTime.now(): new DateTime(billDate); +// DateTime dateTime = ObjectUtil.isEmpty(billDate)?DateTime.now(): new DateTime(billDate); ByxChinaumsQueryBillInfoDTO billInfoDTO = new ByxChinaumsQueryBillInfoDTO(); - billInfoDTO.setStartDate(DateUtil.beginOfDay(dateTime).toString()); - billInfoDTO.setEndDate(DateUtil.endOfDay(dateTime).toString()); + billInfoDTO.setStartDate(billdate); + billInfoDTO.setEndDate(nowdate); billInfoDTO.setWalletId(chinaumsAuthInfo.getBalanceAcctId()); ByxChinaumsQueryBillInfoVO byxChinaumsQueryBillInfoVO = byxChinaumsUtil.execute(ByxRouteUtil.ROUTE_WALLET_TRADE_BILLS, (JSONObject) JSONObject.toJSON(billInfoDTO), ByxChinaumsQueryBillInfoVO.class);