修复同步SKU出现空指针异常的问题

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuMSSyncJob.java

@@ -96,7 +96,6 @@ public class SkuMSSyncJob extends PointJob {
             DcBaseSkuWarehouseMapper dcBaseSkuWarehouseMapper = SessionUtil.getSession().getMapper(DcBaseSkuWarehouseMapper.class);
             for (SkuInfo skuInfo : data) {
                 if (StringUtils.isNotBlank(skuInfo.getBailunSku())) {
-                    String bailunSku = skuInfo.getBailunSku();
                     //逻辑删除仓库
                     dcBaseSkuWarehouseMapper.logicDeleteWarehouse(skuInfo.getBailunSku(),skuInfo.getCompanyId());
                     try {
@@ -105,19 +104,21 @@ public class SkuMSSyncJob extends PointJob {
                         throw new RuntimeException("BeanUtils.copyProperties失败");
                     }
                     List<WarehouseInfo> warehouseList = skuInfo.getWarehouseList();
-                    for (WarehouseInfo warehouseInfo : warehouseList) {
-                        try {
-                            BeanUtils.copyProperties(dcBaseSkuWarehouse, warehouseInfo);
-                        } catch (Exception e) {
-                            throw new RuntimeException("BeanUtils.copyProperties失败");
-                        }
-                        dcBaseSkuWarehouse.setBailunSku(skuInfo.getBailunSku());
-                        dcBaseSkuWarehouse.setCompanyId(skuInfo.getCompanyId());
-                        dcBaseSkuWarehouse.setStatus(0);
-                        dcBaseSkuWarehouse.setGmtModified(LocalDateTime.now());
-                        int i = dcBaseSkuWarehouseMapper.updateByExampleSelective(dcBaseSkuWarehouse, DcBaseSkuWarehouseExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseSkuWarehouse.getBailunSku()).andCompanyIdEqualTo(dcBaseSkuWarehouse.getCompanyId()).andWarehouseCodeEqualTo(dcBaseSkuWarehouse.getWarehouseCode()).example());
-                        if (i == 0) {
-                            dcBaseSkuWarehouseMapper.insertSelective(dcBaseSkuWarehouse);
+                    if (warehouseList != null && warehouseList.size() > 0) {
+                        for (WarehouseInfo warehouseInfo : warehouseList) {
+                            try {
+                                BeanUtils.copyProperties(dcBaseSkuWarehouse, warehouseInfo);
+                            } catch (Exception e) {
+                                throw new RuntimeException("BeanUtils.copyProperties失败");
+                            }
+                            dcBaseSkuWarehouse.setBailunSku(skuInfo.getBailunSku());
+                            dcBaseSkuWarehouse.setCompanyId(skuInfo.getCompanyId());
+                            dcBaseSkuWarehouse.setStatus(0);
+                            dcBaseSkuWarehouse.setGmtModified(LocalDateTime.now());
+                            int i = dcBaseSkuWarehouseMapper.updateByExampleSelective(dcBaseSkuWarehouse, DcBaseSkuWarehouseExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseSkuWarehouse.getBailunSku()).andCompanyIdEqualTo(dcBaseSkuWarehouse.getCompanyId()).andWarehouseCodeEqualTo(dcBaseSkuWarehouse.getWarehouseCode()).example());
+                            if (i == 0) {
+                                dcBaseSkuWarehouseMapper.insertSelective(dcBaseSkuWarehouse);
+                            }
                         }
                     }
                     dcBaseSku.setGmtModified(LocalDateTime.now());

data-base/base-sync-sku/src/test/java/SyncSkuTest.java

@@ -9,8 +9,8 @@ public class SyncSkuTest {
     public void test() {
         SkuMSSyncJob skuSyncJob = new SkuMSSyncJob();
         skuSyncJob.executeJob(null, new JobPointLog("base-sku",1 ,1000,1,1,
-                LocalDateTime.of(2019,6,4,18,51),
-                LocalDateTime.of(2019,6,5,18,52)));
+                LocalDateTime.of(2019,5,29,0,0),
+                LocalDateTime.of(2019,5,30,0,0)));
     }
 
 }