销售额

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

@@ -232,7 +232,7 @@ public class OrderSyncJob extends PointJob {
                 dcBaseOmsOrder.setAmountProduct(productAmount);//部分订单 AmountProduct(产品金额)字段没值或等于0， 就取AmountTotal（商品总收入）
                 //销售额统一改为 销售额=产品金额+运费-促销
                 if(omsResult.getPlatformType().toUpperCase().equals(PlatformType.Aliexpress.value())) {
-                    dcBaseOmsOrder.setAmountSales(omsResult.getOrderCharge().getAmountTotal().getAmount());
+                    dcBaseOmsOrder.setAmountSales(omsResult.getOrderCharge().getAmountTotal().getAmount().subtract(dcBaseOmsOrder.getCostPromotion()));
                 } else{
                     dcBaseOmsOrder.setAmountSales(productAmount.add(dcBaseOmsOrder.getAmountShipping()).subtract(dcBaseOmsOrder.getCostPromotion()));
                 }
@@ -351,7 +351,7 @@ public class OrderSyncJob extends PointJob {
                                 dcBaseOmsSku.setCostTail(dcBaseOmsSku.getCostTail().divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setCostProduct(bailunSkuStructure.getBailunSkuUnitPrice());
                                 dcBaseOmsSku.setCostPromotion(skuCostPromotion.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
-                                dcBaseOmsSku.setAmountSales(skuAmountSales.subtract(skuCostPromotion).divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
+                                dcBaseOmsSku.setAmountSales(skuAmountSales.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountShipping(skuAmountShipping.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
                                 if(dcBaseOmsSku.getCostTail().compareTo(BigDecimal.ZERO) == 1) {
                                     costLogistics = dcBaseOmsSku.getCostTail();