订单销售额修改为FBA不加运费收入, 其他平台都是要加上的

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

@@ -226,7 +226,11 @@ public class OrderSyncJob extends PointJob {
                 if (omsResult.getPlatformType().toUpperCase().equals(PlatformType.Aliexpress.value())) {
                     dcBaseOmsOrder.setAmountSales(omsResult.getOrderCharge().getAmountTotal().getAmount());
                 } else {
-                    dcBaseOmsOrder.setAmountSales(totalAmountSale.add(dcBaseOmsOrder.getAmountShipping()).add(dcBaseOmsOrder.getAmountGiftWrap()).subtract(dcBaseOmsOrder.getCostPromotion()));
+
+                    dcBaseOmsOrder.setAmountSales(totalAmountSale //商品收入
+                            .add((omsResult.getPlatformType().toUpperCase().equals(PlatformType.FBA.value())?BigDecimal.ZERO : dcBaseOmsOrder.getAmountShipping())) //运费收入, FBA不算
+                            .subtract(dcBaseOmsOrder.getAmountGiftWrap()) //礼品包装
+                            .subtract(dcBaseOmsOrder.getCostPromotion())); //促销费
                 }
                 //平台渠道费
                 dcBaseOmsOrder.setCostPlatformFee((omsResult.getOrderCharge().getCostPlatformFee() != null && omsResult.getOrderCharge().getCostPlatformFee().getAmount() != null) ? omsResult.getOrderCharge().getCostPlatformFee().getAmount() : BigDecimal.ZERO);

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -73,7 +73,7 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("OriginOrderNo", "102409853402432");
+        map.put("OriginOrderNo", "402-2410782-3862701");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))