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

33
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,18 +2194,23 @@ 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){
if( !StringUtils.isEmpty(feeItem.getCurrency()) ){ realFee=BigDecimal.ZERO;
EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY"); }
if(realFee!=null){
// 汇率计算
if( !StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency() ){
EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY");
if(emisExchangeRate!=null){ if(emisExchangeRate!=null){
BigDecimal rate=BigDecimal.valueOf(Double.valueOf(emisExchangeRate.getRate())); BigDecimal rate=BigDecimal.valueOf(Double.valueOf(emisExchangeRate.getRate()));
realFee=realFee.multiply(rate); realFee=realFee.multiply(rate);
realFee=realFee.setScale(2,BigDecimal.ROUND_HALF_UP); realFee=realFee.setScale(2,BigDecimal.ROUND_HALF_UP);
} }
// 汇率查不到的情况就不计算 // 汇率查不到的情况就不计算
else{ else{
// realFee=BigDecimal.ZERO; // realFee=BigDecimal.ZERO;
}
} }
} }