|
@@ -209,17 +209,17 @@ public class PayPayCheckbalanceServiceImpl implements PayPayCheckbalanceService
|
|
|
{
|
|
|
//取账期天数
|
|
|
LocalTime minTime = LocalTime.parse("00:00:00.000");
|
|
|
- LocalDateTime ldtStTime = dateToLocalDateTime(baseClosingAccountInfoDtoList.get(0).getStartTime());
|
|
|
- ldtStTime = ldtStTime.with(minTime);
|
|
|
+ LocalDateTime closingAccountStTime =dateToLocalDateTime(baseClosingAccountInfoDtoList.get(0).getStartTime());
|
|
|
+ LocalDateTime ldtStTime = closingAccountStTime.with(minTime);
|
|
|
|
|
|
- LocalDateTime ldtEndTime=null;
|
|
|
+ LocalDateTime closingAccountEndTime = null;
|
|
|
if(baseClosingAccountInfoDtoList.get(0).getEndTime() != null)
|
|
|
- ldtEndTime = dateToLocalDateTime(baseClosingAccountInfoDtoList.get(0).getEndTime());
|
|
|
+ closingAccountEndTime = dateToLocalDateTime(baseClosingAccountInfoDtoList.get(0).getEndTime());
|
|
|
else
|
|
|
- ldtEndTime = LocalDateTime.now();
|
|
|
+ closingAccountEndTime = LocalDateTime.now();
|
|
|
|
|
|
LocalTime maxTime = LocalTime.parse("23:59:59.999");
|
|
|
- ldtEndTime = ldtEndTime.with(maxTime);
|
|
|
+ LocalDateTime ldtEndTime = closingAccountEndTime.with(maxTime);
|
|
|
java.time.Duration duration = java.time.Duration.between(ldtStTime,ldtEndTime); //设置时分秒便于计算天数
|
|
|
long days = duration.toDays() + 1;
|
|
|
|
|
@@ -227,8 +227,8 @@ public class PayPayCheckbalanceServiceImpl implements PayPayCheckbalanceService
|
|
|
int sysItemIndex=0;
|
|
|
int tradeItemIndex=0;
|
|
|
//返回指定月份每天的统计额,按日期、支付类型分类
|
|
|
- List<PayPayCheckbalanceItemDto> sysItem1 = payPayCheckbalanceMapper.findSysDay2Cycle("", ldtStTime,ldtEndTime,siteId,customerId);
|
|
|
- List<PayPayCheckbalanceItemDto> tradeItme1 = payPayCheckbalanceMapper.findTradeDay2Cycle("",ldtStTime,ldtEndTime,siteId,customerId);
|
|
|
+ List<PayPayCheckbalanceItemDto> sysItem1 = payPayCheckbalanceMapper.findSysDay2Cycle("", closingAccountStTime,closingAccountEndTime,siteId,customerId);
|
|
|
+ List<PayPayCheckbalanceItemDto> tradeItme1 = payPayCheckbalanceMapper.findTradeDay2Cycle("",closingAccountStTime,closingAccountEndTime,siteId,customerId);
|
|
|
|
|
|
for (int i=0;i< days;i++)
|
|
|
{
|