修改同步头程费逻辑

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

@@ -640,30 +640,26 @@ public class OrderSyncJob extends PointJob {
                     return dcBaseOmsOrder1.getCostFirst();
                 }
             }*/
-            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();
-                dcMidCostFirst.setHasCalculation(Boolean.TRUE);
-                dcMidCostFirst.setCostFirst(bailunSkuStructure.getBailunSkuWeight().multiply(Constant.COST_FIRST_PRICE).setScale(5, RoundingMode.HALF_EVEN));
-            }
-            if (dcMidCostFirst.getHasCalculation()) {
-                dcBaseOmsSku.setCostFirst(dcMidCostFirst.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 {
-                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));
+                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();
+                    dcMidCostFirst.setHasCalculation(Boolean.TRUE);
+                    dcMidCostFirst.setCostFirst(bailunSkuStructure.getBailunSkuWeight().multiply(Constant.COST_FIRST_PRICE).setScale(5, RoundingMode.HALF_EVEN));
+                }
+                if (dcMidCostFirst.getHasCalculation()) {
+                    dcBaseOmsSku.setCostFirst(dcMidCostFirst.getCostFirst());
+                } else {
+                    dcBaseOmsOrder.setCostFirst(BigDecimal.ZERO);
                 }
             }
             totalCostFirst = totalCostFirst.add(dcBaseOmsSku.getCostFirst().multiply(BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped())));