Merge branch 'bug-eur-36825'

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -75,6 +75,8 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     @Autowired
     IIncrementTypeService incrementTypeService;
     @Autowired
+    IUserIncrementService userIncrementService;
+    @Autowired
     IOrderService orderService;
 
     @Override
@@ -288,6 +290,18 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         if(user == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }
+        if(param.getIncrementId() != null){
+            UserIncrement userIncrement = userIncrementService.getById(param.getIncrementId());
+            if(userIncrement == null){
+                throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+
+            }
+            IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+            if(incrementType == null){
+                throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+            }
+            return incrementOrderService.insertIncrementOrder(user, param,incrementType);
+        }
         IncrementType incrementType = incrementTypeService.getById(param.getIncrementType());
         if(incrementType == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);

src/main/java/com/fdkankan/ucenter/service/impl/SceneCommonService.java

@@ -220,4 +220,20 @@ public class SceneCommonService {
         }
 
     }
+
+    public void delLink(String path) {
+        String panPath = path +"/panorama";
+        File file = new File(panPath);
+        if(file.exists()){
+            File[] files = file.listFiles();
+            if(files == null || files.length == 0){
+                return;
+            }
+            for (File file1 : files) {
+                String linkPath =file1.getPath() + "/capture";
+                log.info("delLink--filePath:{}",linkPath);
+                org.apache.commons.io.FileUtils.deleteQuietly(new File(linkPath));
+            }
+        }
+    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -844,6 +844,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         fYunFileServiceInterface.copyFileInBucket(sourcePath,targetPath);
         File fileData = new File(SceneResourcePath.nasBasePath + sourcePath);
         if(fileData.exists()){
+            if(targetPath.contains("images")){
+                sceneCommonService.delLink(fileData.getPath());
+            }
             cn.hutool.core.io.FileUtil.copyContent(fileData,new File(SceneResourcePath.nasBasePath + targetPath),true);
         }
     }