商品导入功能修复

src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@@ -230,6 +230,7 @@ public class GoodsSkuController {
         Map<String,List<GoodsSkuImportBo.SkuItem>> skuItemList = param.getSkuList().stream().collect(Collectors.groupingBy(GoodsSkuImportBo.SkuItem::getOpt));
         //处理删除
         List<GoodsSkuImportBo.SkuItem> delList = skuItemList.get(DELETE);
+        if(delList!=null){
             List<String> delSkuCodes = delList.stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).collect(Collectors.toList());
             QueryWrapper lqw1 = new QueryWrapper<>();
             lqw1.eq("target_type", TbsGoodsType.sku.name());
@@ -269,6 +270,9 @@ public class GoodsSkuController {
                 delLqw.in(GoodsSku::getSkuCode,skuCodeToDelList);
                 goodsSkuService.remove(delLqw);
             }
+        }
+
+
 
         //处理更新和新增
         List<String> skuCodes = param.getSkuList().stream().map(GoodsSkuImportBo.SkuItem::getSkuCode).distinct().collect(Collectors.toList());
@@ -337,20 +341,30 @@ public class GoodsSkuController {
     }
 
     private GoodsSku selectSku( List<GoodsSku> skuList, String skuCode){
+        if(skuCode!=null){
             for (GoodsSku goodsSku : skuList) {
+                if(goodsSku.getSkuCode()==null){
+                    continue;
+                }
                 if(goodsSku.getSkuCode().equals(skuCode)){
                     return goodsSku;
                 }
             }
+        }
         return null;
     }
 
     private GoodsSpu selectSpu( List<GoodsSpu> spuList, String skuCode){
+        if(skuCode!=null){
             for (GoodsSpu goodsSpu : spuList) {
+                if(goodsSpu.getSkuCode()==null){
+                    continue;
+                }
                 if(goodsSpu.getSkuCode().equals(skuCode)){
                     return goodsSpu;
                 }
             }
+        }
         return null;
     }
 

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -416,7 +416,7 @@ public class GoodsSpuController {
         }
 
         if(isError){
-            return R.error("数据异常",param);
+            return R.ok(param);
         }
 
         List<Long> rmIds = new ArrayList<>();

src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSkuExportVo.java

@@ -36,8 +36,10 @@ public class GoodsSkuExportVo implements Serializable {
 
     private String skuName;
 
+    private String name;
+
     /** spu编码 */
-    private Long spuCode;
+    private String spuCode;
 
     /** 销售价格 */
     private BigDecimal salesPrice;