Bläddra i källkod

场景升级逻辑优化

dengsixing 2 år sedan
förälder
incheckning
18067a88f1

+ 11 - 10
src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -367,9 +367,9 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
                 new LambdaQueryWrapper<ScenePlusExt>()
                     .eq(ScenePlusExt::getPlusId, scenePro.getId()));
+            String thumbUrl = null;
             if(StrUtil.isNotEmpty(scenePro.getThumb())
-                && scenePro.getThumb().contains(imagePath)){
-                String thumbUrl = null;
+                && scenePro.getThumb().contains(imagePath) && !reUpgrade){//重算触发的升级,不需要再设置thum的url地址
                 if(scenePro.getThumb().contains("thumbSmallImg.jpg")){
                     fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", editUsersPath + "thumb-1k.jpg");
                     fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", viewUsersPath + "thumb-1k.jpg");
@@ -381,16 +381,17 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 }else{
                     thumbUrl = scenePro.getThumb().replace(imagePath, viewImagesPath);
                 }
+            }
 
-                String webSite = sceneUrl + num;
-                scenePro.setThumb(thumbUrl);
-                scenePro.setWebSite(webSite);
-                sceneProService.updateById(scenePro);
+            String webSite = sceneUrl + num;
+            scenePro.setThumb(thumbUrl);
+            scenePro.setWebSite(webSite);
+            sceneProService.updateById(scenePro);
+
+            scenePlusExt.setThumb(thumbUrl);
+            scenePlusExt.setWebSite(webSite);
+            scenePlusExtService.updateById(scenePlusExt);
 
-                scenePlusExt.setThumb(thumbUrl);
-                scenePlusExt.setWebSite(webSite);
-                scenePlusExtService.updateById(scenePlusExt);
-            }
             if(StrUtil.isNotEmpty(sceneEditInfo.getBoxVideos())){
                 JSONArray boxVideoArr = JSON.parseArray(sceneEditInfo.getBoxVideos());
                 for(int i = 0; i < boxVideoArr.size(); i++){