接入cdf商品数据

src/main/java/com/cdf/controller/FdkkSceneEditController.java

@@ -38,11 +38,10 @@ public class FdkkSceneEditController {
     }
 
     @PostMapping("/tag/getHotJson")
-    public ResultData getHotJs (@RequestParam(required = false) String num,@RequestHeader String token){
+    public ResultData getHotJson (@RequestParam(required = false) String num,@RequestHeader String token){
         return ResultData.ok( fdkkSceneEditService.getHotJson(num,token));
     }
 
-
     @PostMapping("publicScene")
     @SysLog("场景发布")
     public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token){

src/main/java/com/cdf/controller/SysDeptController.java

@@ -67,7 +67,6 @@ public class SysDeptController {
     @PostMapping("/allList")
     public ResultData list(){
         return ResultData.ok(deptService.getDeptList(null));
-
     }
 
 

src/main/java/com/cdf/entity/HotRelation.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -34,7 +35,10 @@ public class HotRelation implements Serializable {
     private String num;
 
     @TableField("hot_type")
-    private Integer hotType;
+    private Integer hotType;    //0商品，1优惠劵，2第三方跳转，3瀑布流
+
+    @TableField("content")
+    private String content;
 
     @TableField("tb_status")
     @TableLogic

src/main/java/com/cdf/httpClient/request/FdkkHotData.java

@@ -11,4 +11,5 @@ public class FdkkHotData {
     private List<String> icons;
     private Integer hotType;
     private List<String> relationIds;
+    private String content;
 }

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

@@ -72,8 +72,11 @@ public class FdkkSceneEditService {
             HotRelation hotRelation = new HotRelation();
             hotRelation.setHotId(sid);
             hotRelation.setHotType(type);
-            hotRelation.setRelationIds(JSONArray.toJSONString(relationIds));
+            if(relationIds !=null && relationIds.size() >0){
+                hotRelation.setRelationIds(JSONArray.toJSONString(relationIds));
+            }
             hotRelation.setNum(fdkkHotRequest.getNum());
+            hotRelation.setContent(fdkkHotData.getContent());
             hotRelationService.saveOrUpdate(hotRelation);
         }
         return fdkkResponse;
@@ -116,7 +119,16 @@ public class FdkkSceneEditService {
             if(hotRelation == null){
                 continue;
             }
+            tag.put("hotType",hotRelation.getHotType());
+            //0商品，1优惠劵，2第三方跳转，3瀑布流
+            if(hotRelation.getHotType() == 1 || hotRelation.getHotType() == 2){
+                tag.put("hotJumpUrl", hotRelation.getContent());
+                continue;
+            }
             String relationIds = hotRelation.getRelationIds();
+            if(StringUtils.isBlank(relationIds)){
+                continue;
+            }
             JSONArray jsonArray = JSONObject.parseArray(relationIds);
             List<CdfProduct> products = new ArrayList<>();
             for (Object o : jsonArray) {