1

src/main/java/com/cdf/controller/back/ExcelController.java

@@ -3,12 +3,15 @@ package com.cdf.controller.back;
 
 import com.cdf.common.ResultData;
 import com.cdf.request.UploadHotsParam;
+import com.cdf.service.IBrandService;
 import com.cdf.service.impl.ExcelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.HashSet;
 
 /**
  * <p>
@@ -39,6 +42,7 @@ public class ExcelController extends BaseLogController{
     @PostMapping("/checkFile")
     public ResultData checkFile(@RequestBody UploadHotsParam param){
         param.setToken(getToken());
+
         return ResultData.ok(hotsService.checkFile(param));
     }
 

src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -309,7 +309,12 @@ public class FdkkSceneEditService {
                     productSourceMap.put(productSource.getId(),productSource);
                 }
             }
-            Set<String> brandIds = hotRelations.stream().map(HotRelation::getBrandId).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
+            Set<String> brandIds = new HashSet<>();
+            for (HotRelation hotRelation : hotRelations) {
+                if(StringUtils.isNotBlank(hotRelation.getBrandId())){
+                    brandIds.add(hotRelation.getBrandId());
+                }
+            }
             brandMap = brandService.getMapByIds(brandIds);
         }
 
@@ -326,6 +331,9 @@ public class FdkkSceneEditService {
             if(hotRelation == null){
                 continue;
             }
+            if(hotRelation.getBrandId() != null){
+                tag.put("brand",brandMap.get(hotRelation.getBrandId()));
+            }
             tag.put("hotType",hotRelation.getHotType());
             //0商品，1优惠劵，2第三方跳转，3瀑布流 ,場景关联
             if(hotRelation.getHotType() == null){
@@ -346,9 +354,7 @@ public class FdkkSceneEditService {
             if(hotRelation.getProductSourceId() != null){
                 tag.put("productSource",productSourceMap.get(hotRelation.getProductSourceId()));
             }
-            if(hotRelation.getBrandId() != null){
-                tag.put("brand",brandMap.get(hotRelation.getBrandId()));
-            }
+
             resultMap.put(sid,jsonArray);
             requestArray.addAll(jsonArray);
         }