diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index e9f991c3e..2bbe3d24f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -43,6 +43,8 @@ package com.xdadan.erp.emis.service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; + import java.time.Instant; + import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -1592,7 +1594,7 @@ public class EmisBaseService { // 账期内金额 BigDecimal inTermMoney = getInTermMoney(emisWaybillList); // 超期金额 - BigDecimal overTermMoney = BigDecimal.valueOf(useMoney.subtract(inTermMoney).stripTrailingZeros().longValue()); + BigDecimal overTermMoney = new BigDecimal(useMoney.subtract(inTermMoney).stripTrailingZeros().toPlainString()); EmisCreditSalesmen emisCreditSalesmen = new EmisCreditSalesmen(); emisCreditSalesmen.setId(item.getId()); emisCreditSalesmen.setUseMoney(useMoney); @@ -1634,11 +1636,11 @@ public class EmisBaseService { return BigDecimal.ZERO; } log.info("query emisSettleSubBillList , emisSettleSubBillList,{}", emisSettleSubBillList); - BigDecimal inTermMoney = BigDecimal.valueOf(emisSettleSubBillList.stream() + BigDecimal inTermMoney = new BigDecimal(emisSettleSubBillList.stream() .map(EmisSettleSubBill::getBillFee) .filter(i -> i != null) .reduce(BigDecimal.ZERO, BigDecimal::add) - .stripTrailingZeros().longValue()); + .stripTrailingZeros().toPlainString()); log.info("success.getInTermMoney , inTermMoney,{}", inTermMoney); return inTermMoney; } @@ -1650,7 +1652,7 @@ public class EmisBaseService { } List overTermList = list.stream() .filter(item -> item.getSendDate() != null) - .filter(item -> (System.currentTimeMillis() - item.getSendDate().getTime()) > (10 * 1000 * 60 * 60 * 24)) + .filter(item -> ChronoUnit.DAYS.between(item.getSendDate().toInstant(), Instant.now()) > 10) .collect(Collectors.toList()); log.info("success.filterOverTermEmisWaybillList , overTermList,{}", overTermList); return overTermList; diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index e88fe1e12..716817620 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1378,11 +1378,11 @@ and a.send_date is not null - and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60) + and DATEDIFF(NOW(), a.send_date) > 10 and a.send_date is not null - and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) (10 * 24 * 60 * 60) + and DATEDIFF(NOW(), a.send_date) 10 @@ -1767,11 +1767,11 @@ and a.send_date is not null - and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) > (10 * 24 * 60 * 60) + and DATEDIFF(NOW(), a.send_date) > 10 and a.send_date is not null - and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) (10 * 24 * 60 * 60) + and DATEDIFF(NOW(), a.send_date) 10