aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-02-25 07:28:28 +08:00
parent 1482183526
commit a77cf144d3
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsCostFeeService.java
View File

@ -9,6 +9,7 @@
*/ */
package com.xdadan.erp.emis.service; package com.xdadan.erp.emis.service;
import java.text.ParseException;
import java.util.List; import java.util.List;
import com.xdadan.erp.emis.domain.EmisTmsCostFee; import com.xdadan.erp.emis.domain.EmisTmsCostFee;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;

24
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -11,6 +11,8 @@
package com.xdadan.erp.emis.service.impl; package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -29,6 +31,8 @@ import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.service.IEmisTmsCostFeeService; import com.xdadan.erp.emis.service.IEmisTmsCostFeeService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import static org.apache.commons.lang3.time.DateUtils.parseDate;
/** /**
* TMS运输成本账单Service业务层处理 * TMS运输成本账单Service业务层处理
* *
@ -136,8 +140,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 币种进行换算 // 币种进行换算
if(!"CNY".equals(feeItem.getCurrency())){ if(!"CNY".equals(feeItem.getCurrency())){
Date calcDate = new Date(); Date calcDate = emisTmsCostFee.getTradeDate();
if(calcDate==null){ 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(); calcDate= new Date();
} }
@ -411,8 +421,14 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 币种进行换算 // 币种进行换算
if(!"CNY".equals(feeItem.getCurrency())){ if(!"CNY".equals(feeItem.getCurrency())){
Date calcDate = new Date(); Date calcDate = emisTmsCostFee.getTradeDate();
if(calcDate==null){ 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(); calcDate= new Date();
} }