修复是否推送空指针异常问题

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

@@ -765,12 +765,12 @@ public class OrderSyncJob extends PointJob {
                         dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId());
                         dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
                         dcBaseOmsPick.setCompanyId(omsResult.getCompanyId());
-                        dcBaseOmsPick.setHasPushed(pickingOrder.getHasPushed());
+                        dcBaseOmsPick.setHasPushed(pickingOrder.getHasPushed() == null ? false : pickingOrder.getHasPushed());
                         if (bailunSkuStructure != null) {
                             DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku();
                             dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
                             dcBaseOmsSku.setBailunSkuQuantityPicked(dcBaseOmsSku.getBailunSkuQuantityPicked() != null ? dcBaseOmsSku.getBailunSkuQuantityPicked() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
-                            if(pickingOrder.getHasPushed()) {
+                            if(dcBaseOmsPick.getHasPushed()) {
                                 dcBaseOmsSku.setBailunSkuQuantityPushed(dcBaseOmsSku.getBailunSkuQuantityPushed() != null ? dcBaseOmsSku.getBailunSkuQuantityPushed() + dcBaseOmsPick.getQuantityPicked() : dcBaseOmsPick.getQuantityPicked());
                             }
                             dcBaseOmsSku.setCostHandlePlatform(dcBaseOmsSku.getCostHandlePlatform() != null ? dcBaseOmsSku.getCostHandlePlatform().add(dcBaseOmsPick.getBailunSkuCostPackaging()) : dcBaseOmsPick.getBailunSkuCostPackaging());