From a77cf144d3615aae0d572e1aaab1c3b86874055c Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 25 Feb 2025 07:28:28 +0800 Subject: [PATCH] md --- .../emis/service/IEmisTmsCostFeeService.java | 1 + .../impl/EmisTmsCostFeeServiceImpl.java | 24 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java index c95661ea8..272c560be 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java @@ -9,6 +9,7 @@ */ package com.xdadan.erp.emis.service; +import java.text.ParseException; import java.util.List; import com.xdadan.erp.emis.domain.EmisTmsCostFee; import com.xdadan.erp.emis.domain.exception.EmisBizError; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index fd32e4fd6..301f677b4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.service.impl; import java.math.BigDecimal; +import java.text.ParseException; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -29,6 +31,8 @@ import org.springframework.stereotype.Service; import com.xdadan.erp.emis.service.IEmisTmsCostFeeService; import org.springframework.transaction.annotation.Transactional; +import static org.apache.commons.lang3.time.DateUtils.parseDate; + /** * TMS运输成本账单Service业务层处理 * @@ -136,8 +140,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 币种进行换算 if(!"CNY".equals(feeItem.getCurrency())){ - Date calcDate = new Date(); - if(calcDate==null){ + Date calcDate = emisTmsCostFee.getTradeDate(); + Date dateOld= null; + try { + dateOld = DateUtils.parseDate("2024-08-01",DateUtils.YYYY_MM_DD); + } catch (ParseException e) { + e.printStackTrace(); + } + if(calcDate==null|| calcDate.before(dateOld)){ calcDate= new Date(); } @@ -411,8 +421,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService // 币种进行换算 if(!"CNY".equals(feeItem.getCurrency())){ - Date calcDate = new Date(); - if(calcDate==null){ + Date calcDate = emisTmsCostFee.getTradeDate(); + Date dateOld= null; + try { + dateOld = DateUtils.parseDate("2024-08-01",DateUtils.YYYY_MM_DD); + } catch (ParseException e) { + e.printStackTrace(); + } + if(calcDate==null|| calcDate.before(dateOld)){ calcDate= new Date(); }