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 2024-07-31 12:25:42 +08:00
parent 68bf50aab6
commit ffc21f5b72
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1808,8 +1808,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
for (EmisWaybillFeeitem feeItem:feeitemList) { for (EmisWaybillFeeitem feeItem:feeitemList) {
BigDecimal realFee = feeItem.getFee(); BigDecimal realFee = feeItem.getFee();
if(realFee==null){
realFee=BigDecimal.ZERO;
}
// 汇率计算 // 汇率计算
if( !StringUtils.isEmpty(feeItem.getCurrency()) ){ if( !StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency()) ){
EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY"); EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY");
if(emisExchangeRate!=null){ if(emisExchangeRate!=null){
@ -2190,8 +2194,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
for (EmisWaybillFeeitem feeItem:feeitemList) { for (EmisWaybillFeeitem feeItem:feeitemList) {
BigDecimal realFee = feeItem.getFee(); BigDecimal realFee = feeItem.getFee();
if(realFee==null){
realFee=BigDecimal.ZERO;
}
if(realFee!=null){
// 汇率计算 // 汇率计算
if( !StringUtils.isEmpty(feeItem.getCurrency()) ){ if( !StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency() ){
EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY"); EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY");
if(emisExchangeRate!=null){ if(emisExchangeRate!=null){
@ -2204,6 +2212,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// realFee=BigDecimal.ZERO; // realFee=BigDecimal.ZERO;
} }
} }
}
totalRealFee=totalRealFee.add(realFee); totalRealFee=totalRealFee.add(realFee);
} }