订单

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

@@ -184,8 +184,10 @@ public class OrderSyncJob extends PointJob {
                         bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) == 1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSkuObj.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 5, RoundingMode.HALF_EVEN) : BigDecimal.ONE);
                         bailunSkuStructure.setSkuQuantityOrderd(bailunSkuObj.getBailunSkuQuantityOrdered() != null ? bailunSkuObj.getBailunSkuQuantityOrdered() : 0);
                         DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
-                        if (PlatformType.FBA.value().equals(omsResult.getPlatformType())) {
-                            dcBaseOmsSku.setWarehouseCodeFba(dcBaseWarehouse.getWarehouseCode());
+                        if (PlatformType.FBA.value().equals(omsResult.getPlatformType() == null ? "" : omsResult.getPlatformType())) {
+                            if(dcBaseWarehouse != null) {
+                                dcBaseOmsSku.setWarehouseCodeFba(dcBaseWarehouse.getWarehouseCode());
+                            }
                         }
                         dcBaseOmsSku.setHasDelete(false);
                         dcBaseOmsSku.setHasScalp(dcBaseOmsOrder.getHasScalp());