修改同步头程费逻辑

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

@@ -640,12 +640,16 @@ public class OrderSyncJob extends PointJob {
                     return dcBaseOmsOrder1.getCostFirst();
                 }
             }*/
+            DcBaseOmsConfigCostFirstMapper costFirstMapper = SessionUtil.getSession().getMapper(DcBaseOmsConfigCostFirstMapper.class);
+            DcBaseOmsConfigCostFirst omsConfigCostFirst = costFirstMapper.selectOneByExample(DcBaseOmsConfigCostFirstExample.newAndCreateCriteria().andCompanyIdEqualTo(dcBaseOmsSku.getCompanyId()).andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku()).andWarehouseCodeEqualTo(dcBaseOmsSku.getWarehouseCode()).example());
+            if (omsConfigCostFirst != null) {
+                dcBaseOmsSku.setCostFirst(bailunSkuStructure.getBailunSkuWeight().multiply(omsConfigCostFirst.getPrice()).setScale(5, RoundingMode.HALF_EVEN));
+            } else {
                 DcMidCostFirstMapper mapper = SessionUtil.getSession().getMapper(DcMidCostFirstMapper.class);
                 DcMidCostFirst dcMidCostFirst = mapper.selectOneByExample(DcMidCostFirstExample.newAndCreateCriteria()
                         .andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku())
                         .andWarehouseCodeEqualTo(dcBaseWarehouse.getWarehouseCode())
                         .example());
-
                 //如果dcMidCostFirst查不到,铭哥那边商量好了，头程0的，先跑调拨单，若是真是之前的SKU无法找到的，那就取值38元1KG来计算。
                 if (dcMidCostFirst == null) {
                     dcMidCostFirst = new DcMidCostFirst();
@@ -657,14 +661,6 @@ public class OrderSyncJob extends PointJob {
                 } else {
                     dcBaseOmsOrder.setCostFirst(BigDecimal.ZERO);
                 }
-
-            //GBBLJW这个仓库有些SKU是单独配置的单价
-            if ("GBBLJW".equals(dcBaseWarehouse.getWarehouseCode())) {
-                DcBaseOmsConfigCostFirstMapper costFirstMapper = SessionUtil.getSession().getMapper(DcBaseOmsConfigCostFirstMapper.class);
-                DcBaseOmsConfigCostFirst omsConfigCostFirst = costFirstMapper.selectOneByExample(DcBaseOmsConfigCostFirstExample.newAndCreateCriteria().andCompanyIdEqualTo(dcBaseOmsSku.getCompanyId()).andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku()).andWarehouseCodeEqualTo(dcBaseOmsSku.getWarehouseCode()).example());
-                if (omsConfigCostFirst != null) {
-                    dcBaseOmsSku.setCostFirst(bailunSkuStructure.getBailunSkuWeight().multiply(omsConfigCostFirst.getPrice()).setScale(5, RoundingMode.HALF_EVEN));
-                }
             }
             totalCostFirst = totalCostFirst.add(dcBaseOmsSku.getCostFirst().multiply(BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped())));
         }