Merge branch 'test'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.cdf</groupId>
     <artifactId>cdf-gm</artifactId>
-    <version>2.0.0</version>
+    <version>test</version>
     <packaging>jar</packaging>
 
     <parent>

src/main/java/com/cdf/controller/service/FdkkSceneController.java

@@ -38,7 +38,9 @@ public class FdkkSceneController {
             JSONObject info = fdkkClient.getInfo(map);
             Integer code = info.getInteger("code");
             if(code == 0){
-                fdkkSceneEditService.writeHotJson(num,numRegion.getRegion());
+                if(!fdkkSceneEditService.cdfHasHotJson(num)){
+                    fdkkSceneEditService.writeHotJson(num,numRegion.getRegion());
+                }
                 JSONObject data = info.getJSONObject("data");
                 data.put("cdfRegionData",numRegion);
                 ProductSource productSource = sceneSourceService.getByNum(num);

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

@@ -164,6 +164,9 @@ public class FdkkSceneEditService {
         JSONArray tags = JSONObject.parseArray(data);
         return getProductByJsonObj(tags,pType,language);
     }
+    public Boolean cdfHasHotJson(String num) {
+       return uploadToCdfOssUtil.existKey(String.format(hotCdfPath, num));
+    }
 
     public JSONArray getCdfHotJson(String num) {
         String data = uploadToCdfOssUtil.getObjectContent(String.format(hotCdfPath, num));
@@ -230,6 +233,9 @@ public class FdkkSceneEditService {
             String json = JSONUtil.toJsonStr(hotJson);
             FileUtils.writeFile(path,json );
             uploadToCdfOssUtil.upload(path,String.format(hotCdfPath, num).replace("hot.json",name));
+            if("eshop_zh".equals(lang)){
+                uploadToCdfOssUtil.upload(path,String.format(hotCdfPath, num));
+            }
         }catch (Exception e){
             e.printStackTrace();
         }