毛利润=等于销售额（商品收入+运费收入（FBA & 非FBA）+ Gift Wrap -促销）-平台费-FBA 费用（包含fba pick & pack 和…

毛利润=等于销售额（商品收入+运费收入（FBA & 非FBA）+ Gift Wrap -促销）-平台费-FBA 费用（包含fba pick & pack 和 gift wrap charge back) -头程-尾程-
处理费-操作费-退款-采购成本  - 运费支出

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

@@ -149,7 +149,6 @@ public class OrderSyncJob extends PointJob {
                     BailunSkuCumulative bailunSkuCumulative = getBailunSkuCumulative(omsResult);
                     //SKU总个数
                     dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity());
-
                     //计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
                     for (BailunSku bailunSku : omsResult.getBailunSku()) {
                         //拿每个SKU的发货仓库信息
@@ -202,7 +201,7 @@ public class OrderSyncJob extends PointJob {
                 //由LMS线路计算的物流费
                 BigDecimal totalCostLogistics = getTotalCostLogistics(omsResult.getLogisticsItems());
                 //销售额
-                dcBaseOmsOrder.setAmountSales(totalAmountSale.add(dcBaseOmsOrder.getAmountShipping()).subtract(dcBaseOmsOrder.getCostPromotion()));
+                dcBaseOmsOrder.setAmountSales(totalAmountSale.add(dcBaseOmsOrder.getAmountShipping()).add(dcBaseOmsOrder.getAmountGiftWrap()).subtract(dcBaseOmsOrder.getCostPromotion()));
                 //平台渠道费
                 dcBaseOmsOrder.setCostPlatformFee((omsResult.getOrderCharge().getCostPlatformFee() != null && omsResult.getOrderCharge().getCostPlatformFee().getAmount() != null) ? omsResult.getOrderCharge().getCostPlatformFee().getAmount() : BigDecimal.ZERO);
                 //平台渠道费人民币 - Ebay的平台费币种不一样
@@ -780,7 +779,6 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setBailunRequireLogistics(omsResult.getBailunRequireLogistics());
         dcBaseOmsOrder.setAmountGiftWrap((omsResult.getOrderCharge().getAmountGiftWrap() != null && omsResult.getOrderCharge().getAmountGiftWrap().getAmount() != null) ? omsResult.getOrderCharge().getAmountGiftWrap().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountTotal((omsResult.getOrderCharge().getAmountTotal() != null && omsResult.getOrderCharge().getAmountTotal().getAmount() != null) ? omsResult.getOrderCharge().getAmountTotal().getAmount() : BigDecimal.ZERO);
-        dcBaseOmsOrder.setAmountShipping(BigDecimal.ZERO);//FBA订单不考虑运费收入
         dcBaseOmsOrder.setAmountShipping((omsResult.getOrderCharge().getAmountShipping() != null && omsResult.getOrderCharge().getAmountShipping().getAmount() != null) ? omsResult.getOrderCharge().getAmountShipping().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountProduct((omsResult.getOrderCharge().getAmountProduct() != null && omsResult.getOrderCharge().getAmountProduct().getAmount() != null) ? omsResult.getOrderCharge().getAmountProduct().getAmount() : BigDecimal.ZERO);
         dcBaseOmsOrder.setAmountTax((omsResult.getOrderCharge().getAmountTax() != null && omsResult.getOrderCharge().getAmountTax().getAmount() != null) ? omsResult.getOrderCharge().getAmountTax().getAmount() : BigDecimal.ZERO);