汇率冗余业务补充

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableServiceImpl.java

@@ -123,6 +123,10 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
             receivable.setBaseCurrencyId(Long.parseLong(regionInfo.getImportCurrency5()));
             ExchangeRateRespDTO baseCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getBaseCurrencyId());
             BigDecimal baseAmount = receivable.getTotalAmount().multiply(baseCurrencyRate.getTargetCurrencyAmount()).divide(baseCurrencyRate.getSourceCurrencyAmount(), 2, RoundingMode.HALF_UP);
+            receivable.setSourceAmount(baseCurrencyRate.getSourceCurrencyAmount());
+            receivable.setSourceCurrencyCode(baseCurrencyRate.getSourceCurrencyCode());
+            receivable.setTargetAmount(baseCurrencyRate.getTargetCurrencyAmount());
+            receivable.setTargetCurrencyCode(baseCurrencyRate.getTargetCurrencyCode());
             receivable.setBaseAmount(baseAmount);
             int feeType = getFeeType(receivable.getFeeType());
             // 运费
@@ -139,6 +143,7 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
                 ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId());
                 receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
                 receivable.setDestCountrySourceAmount(destCurrencyRate.getSourceCurrencyAmount());
+                receivable.setDestCountryTargetCurrencyCode(destCurrencyRate.getTargetCurrencyCode());
                 receivable.setDestCountryTargetAmount(destCurrencyRate.getTargetCurrencyAmount());
             }
             // 额外费用
@@ -147,11 +152,13 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
                 ExchangeRateRespDTO destCurrencyRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), receivable.getDestCountryCurrencyId());
                 receivable.setDestCountryRate(destCurrencyRate.getTargetCurrencyAmount().divide(destCurrencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
                 receivable.setDestCountrySourceAmount(destCurrencyRate.getSourceCurrencyAmount());
+                receivable.setDestCountryTargetCurrencyCode(destCurrencyRate.getTargetCurrencyCode());
                 receivable.setDestCountryTargetAmount(destCurrencyRate.getTargetCurrencyAmount());
             }
             ExchangeRateRespDTO destCurrencySubRate = currencyApi.getCurrencyRate(receivable.getCurrencyId(), Long.parseLong(regionInfo.getImportCurrency4()));
             receivable.setDestCountrySubRate(destCurrencySubRate.getTargetCurrencyAmount().divide(destCurrencySubRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
             receivable.setDestCountrySubSourceAmount(destCurrencySubRate.getSourceCurrencyAmount());
+            receivable.setDestCountrySubTargetCurrencyCode(destCurrencySubRate.getTargetCurrencyCode());
             receivable.setDestCountrySubTargetAmount(destCurrencySubRate.getTargetCurrencyAmount());
         }
         this.save(receivable);
@@ -305,7 +312,11 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
             receivableBackVO.setActualAmount(receivableBackVO.getNotIncludedTaxAmount().subtract(receivableBackVO.getDiscountTotal()));
             ExchangeRateRespDTO currencyRate = currencyApi.getCurrencyRate(receivableBackVO.getCurrencyId(), receivableBackVO.getBaseCurrencyId());
             receivableBackVO.setExchangeRate(currencyRate.getTargetCurrencyAmount().divide(currencyRate.getSourceCurrencyAmount(), 6, RoundingMode.HALF_UP));
-            receivableBackVO.setBaseAmount(receivableBackVO.getActualAmount().multiply(currencyRate.getCurrencyRate()));
+            receivableBackVO.setSourceAmount(currencyRate.getSourceCurrencyAmount());
+            receivableBackVO.setSourceCurrencyCode(currencyRate.getSourceCurrencyCode());
+            receivableBackVO.setTargetAmount(currencyRate.getTargetCurrencyAmount());
+            receivableBackVO.setTargetCurrencyCode(currencyRate.getTargetCurrencyCode());
+            receivableBackVO.setBaseAmount(receivableBackVO.getActualAmount().multiply(currencyRate.getTargetCurrencyAmount()).divide(currencyRate.getSourceCurrencyAmount(),2, RoundingMode.HALF_UP));
         });
         return PageResult.of(mpPage);
     }