Commit 00e8256e authored by 332784038@qq.com's avatar 332784038@qq.com

应收单业务汇率计算业务修改

parent 2bca120b
...@@ -130,21 +130,29 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec ...@@ -130,21 +130,29 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency1())); receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency1()));
ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId()); ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId());
receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP)); receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
receivable.setDestCountrySourceAmount(destCurrencyRate.getSourceCurrencyAmount());
receivable.setDestCountryTargetAmount(destCurrencyRate.getTargetCurrencyAmount());
} }
// 清关费 // 清关费
if (feeType == 1) { if (feeType == 1) {
receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency2())); receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency2()));
ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId()); ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId());
receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP)); receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
receivable.setDestCountrySourceAmount(destCurrencyRate.getSourceCurrencyAmount());
receivable.setDestCountryTargetAmount(destCurrencyRate.getTargetCurrencyAmount());
} }
// 额外费用 // 额外费用
if (feeType == 2) { if (feeType == 2) {
receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency3())); receivable.setDestCountryCurrencyId(Long.parseLong(regionInfo.getImportCurrency3()));
ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId()); ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId());
receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP)); receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
receivable.setDestCountrySourceAmount(destCurrencyRate.getSourceCurrencyAmount());
receivable.setDestCountryTargetAmount(destCurrencyRate.getTargetCurrencyAmount());
} }
ExchangeRateRespDTO destCurrencySubRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), Long.parseLong(regionInfo.getImportCurrency4())); ExchangeRateRespDTO destCurrencySubRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), Long.parseLong(regionInfo.getImportCurrency4()));
receivable.setDestCountrySubRate(destCurrencySubRate.getTargetCurrencyAmount().divide(destCurrencySubRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP)); receivable.setDestCountrySubRate(destCurrencySubRate.getTargetCurrencyAmount().divide(destCurrencySubRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
receivable.setDestCountrySubSourceAmount(destCurrencySubRate.getSourceCurrencyAmount());
receivable.setDestCountrySubTargetAmount(destCurrencySubRate.getTargetCurrencyAmount());
} }
this.save(receivable); this.save(receivable);
// 返回 // 返回
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment