~api:店铺商品管理:批量导入数据;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/GoblinGoodsImportDto.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class GoblinGoodsImportDto {
@@ -13,8 +14,10 @@ public class GoblinGoodsImportDto {
     private String spuName;
     @ExcelProperty(value = "商品图片")
     private String spuImgs;
+    private List<String> spuImgList;
     @ExcelProperty(value = "商品规格")
     private String skuSpec;
+    private List<GoblinGoodsSpecDto> skuSpecDtos;
     @ExcelProperty(value = "规格编码")
     private String skuCode;
     @ExcelProperty(value = "价格")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsImportController.java

@@ -34,9 +34,9 @@ public class GoblinStoreMgtGoodsImportController {
     @PostMapping("/upload")
     @ApiOperation(value = "批量导入数据", notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "File", name = "file", value = "文件", required = true),
-            @ApiImplicitParam(type = "form", dataType = "Integer", name = "dataType", value = "导入数据类型[1-商品数据]", example = "1"),
-            @ApiImplicitParam(type = "form", dataType = "String", name = "storeId", value = "店铺ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "File", name = "file", value = "文件"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "dataType", value = "导入数据类型[1-商品数据]", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
     })
     public ResponseDto<String> upload(@RequestParam MultipartFile file, @RequestParam int dataType,
                                         @RequestParam @NotBlank(message = "店铺ID不能为空") String storeId) {
@@ -51,12 +51,12 @@ public class GoblinStoreMgtGoodsImportController {
                     break;
                 case 2:
                 default:
-                    return ResponseDto.failure(ErrorMapping.get("39001"));
+                    return ResponseDto.failure(ErrorMapping.get("149001"));
             }
         } catch (LiquidnetServiceException e) {
             return ResponseDto.failure(e.getMessage());
         } catch (IOException e) {
-            log.error("店铺商品管理:批量导入数据:异常[UID={},dataType={},fileName={}]", currentUid, dataType, file.getOriginalFilename(), e);
+            log.warn("店铺商品管理:批量导入数据:异常[UID={},dataType={},fileName={}]", currentUid, dataType, file.getOriginalFilename(), e);
             return ResponseDto.failure("数据错误，解析失败");
         }
         return ResponseDto.success();