数据中心--修复订单成本费不以发货数据计费

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

@@ -358,7 +358,7 @@ public class OrderSyncJob extends PointJob {
                             BigDecimal quantityOrderdDecimal = BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd());
                             BigDecimal bailunSkuQuantityShippedDecimal = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped());
                             //MARKETING平台 如果是耗材仓的，产品成本不参与利润统计
-                            totalSkuCostProduct = caculateCostProduct(dcBaseWarehouse, dcBaseOmsSku,bailunSkuStructure, bailunSkuQuantityShippedDecimal, totalSkuCostProduct, dcBaseOmsOrder);
+                            totalSkuCostProduct = caculateCostProduct(dcBaseWarehouse, dcBaseOmsSku,bailunSkuStructure, totalSkuCostProduct, dcBaseOmsOrder);
                             BigDecimal rmbCost = BigDecimal.ZERO;
                             BigDecimal skuAmountGeneralCargo = BigDecimal.ZERO;
                             BigDecimal costLogistics = BigDecimal.ZERO;
@@ -571,11 +571,12 @@ public class OrderSyncJob extends PointJob {
         return totalCostFirst;
     }
 
-    private BigDecimal caculateCostProduct(DcBaseWarehouse dcBaseWarehouse, DcBaseOmsSku dcBaseOmsSku,  BailunSkuStructure bailunSkuStructure, BigDecimal bailunSkuQuantityShippedDecimal, BigDecimal totalSkuCostProduct, DcBaseOmsOrder dcBaseOmsOrder) {
+    private BigDecimal caculateCostProduct(DcBaseWarehouse dcBaseWarehouse, DcBaseOmsSku dcBaseOmsSku,  BailunSkuStructure bailunSkuStructure, BigDecimal totalSkuCostProduct, DcBaseOmsOrder dcBaseOmsOrder) {
         if(dcBaseOmsOrder.getPlatformType().toUpperCase().equals(PlatformType.Marketing.value()) &&  ((dcBaseWarehouse != null && Constant.CONSUMABLES_WAREHOUSE.equals(dcBaseWarehouse.getHqType())) || dcBaseOmsOrder.getHasTransferOrder())) {
             dcBaseOmsSku.setCostProduct(BigDecimal.ZERO);
         }else {
-            totalSkuCostProduct = totalSkuCostProduct.add(bailunSkuStructure.getBailunSkuUnitPrice().multiply(bailunSkuQuantityShippedDecimal));
+            BigDecimal bailunSkuQuantityOrdered = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityOrdered());
+            totalSkuCostProduct = totalSkuCostProduct.add(bailunSkuStructure.getBailunSkuUnitPrice().multiply(bailunSkuQuantityOrdered));
         }
         return totalSkuCostProduct;
     }