处理Ebay平台费率的问题

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -932,9 +932,9 @@ public class OrderSyncJob extends PointJob {
          * 自己取汇率
          */
         if (orderCharge != null) {
+            LocalDateTime exchangeDate = omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime();
             if (orderCharge.getAmountTotal() != null) {
                 BigDecimal sellerOrderExchangeRate = null;
-                LocalDateTime exchangeDate = omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime();
                 String orderCurrency = orderCharge.getAmountTotal().getCurrencyCode();
                 if (StringUtils.isEmpty(orderCharge.getAmountTotal().getCurrencyCode()) || orderCurrency.equals(Constant.RMB_CURRENCY_RMB)) {
                     orderCurrency = Constant.RMB_CURRENCY;
@@ -944,16 +944,25 @@ public class OrderSyncJob extends PointJob {
                 }
                 dcBaseOmsOrder.setOrderCurrency(orderCurrency);
                 BigDecimal orderFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(orderCurrency, Constant.RMB_CURRENCY, exchangeDate);
-                dcBaseOmsOrder.setFinanceOrderExchangeRate(orderFinanceExchangeRate != null ? orderFinanceExchangeRate : BigDecimal.ZERO);
-                dcBaseOmsOrder.setSellerOrderExchangeRate(sellerOrderExchangeRate != null ? sellerOrderExchangeRate : BigDecimal.ZERO);
+                dcBaseOmsOrder.setFinanceOrderExchangeRate(orderFinanceExchangeRate);
+                dcBaseOmsOrder.setSellerOrderExchangeRate(sellerOrderExchangeRate);
             }
+            /**
+             * EBAY的平台费币种与订单币种可能不一致
+             */
             if (omsResult.getPlatformType() != null && PlatformType.Ebay.value().equals(omsResult.getPlatformType().toUpperCase()) && orderCharge.getCostPlatformFee() != null && !StringUtils.isEmpty(orderCharge.getCostPlatformFee().getCurrencyCode())) {
                 String otherCurrency = orderCharge.getCostPlatformFee().getCurrencyCode();
-                BigDecimal sellerOtherExchangeRate = orderCharge.getCostPlatformFee().getExchangeRate();
-                BigDecimal otherFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.RMB_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                BigDecimal sellerOtherExchangeRate = null;
+                if (StringUtils.isEmpty(orderCharge.getCostPlatformFee().getCurrencyCode()) || otherCurrency.equals(Constant.RMB_CURRENCY_RMB)) {
+                    otherCurrency = Constant.RMB_CURRENCY;
+                    sellerOtherExchangeRate = BigDecimal.ONE;
+                } else {
+                    sellerOtherExchangeRate = CallBailunSystem.getExchangeRate(otherCurrency, Constant.RMB_CURRENCY, exchangeDate);
+                }
                 dcBaseOmsOrder.setOtherCurrency(otherCurrency);
-                dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate != null ? otherFinanceExchangeRate : BigDecimal.ZERO);
-                dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate != null ? sellerOtherExchangeRate : BigDecimal.ZERO);
+                BigDecimal otherFinanceExchangeRate = CallBailunSystem.getMonthExchangeRate(otherCurrency, Constant.RMB_CURRENCY, omsResult.getPaidTime() != null ? omsResult.getPaidTime() : omsResult.getCreateTime());
+                dcBaseOmsOrder.setFinanceOtherExchangeRate(otherFinanceExchangeRate);
+                dcBaseOmsOrder.setSellerOtherExchangeRate(sellerOtherExchangeRate);
             }
         }
     }