From c93db40daf1adc5e6c77728b385552ac0f76bb32 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 30 Apr 2025 14:57:43 +0800
Subject: [PATCH] =?UTF-8?q?demand:=201.=E8=B6=85=E6=9C=9F=E9=A2=9D?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E7=AE=97=E6=97=B6=E9=97=B4=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=8F=AA=E5=8F=96=E5=A4=A9=E6=95=B0=EF=BC=88=E4=B8=8D=E7=B2=BE?=
 =?UTF-8?q?=E7=A1=AE=E5=88=B0=E6=97=B6=E5=88=86=E7=A7=92=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?2.=E5=B0=8F=E6=95=B0=E7=82=B9=E5=8E=BB=E9=99=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 ++++++----
 .../src/main/resources/mapper/EmisWaybillMapper.xml    |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

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<EmisWaybill> 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 @@
             <!-- 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度 -->
             <if test="params.queryQuotaType != null and params.queryQuotaType == 1">
                 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
             </if>
             <if test="params.queryQuotaType != null and params.queryQuotaType == 2">
                 and a.send_date is not null
-                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) <![CDATA[ <= ]]> (10 * 24 * 60 * 60)
+                and DATEDIFF(NOW(), a.send_date) <![CDATA[ <= ]]> 10
             </if>
 
             <if test="(params.isNeedBatch == null  or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " >
@@ -1767,11 +1767,11 @@
             <!-- 查询现金客户额度属性; 1：查询超期额度，2：查询账期内额度 -->
             <if test="params.queryQuotaType != null and params.queryQuotaType == 1">
                 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
             </if>
             <if test="params.queryQuotaType != null and params.queryQuotaType == 2">
                 and a.send_date is not null
-                and (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(a.send_date)) <![CDATA[ <= ]]> (10 * 24 * 60 * 60)
+                and DATEDIFF(NOW(), a.send_date) <![CDATA[ <= ]]> 10
             </if>