Merge branch 'feature-容量计算方式改造-20230624-dsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -244,10 +244,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
 
             scenePlus.setPayStatus(PayStatus.PAY.code());
-            //如果相机容量不足，需要把场景的paystatus改为容量不足状态
-            if (cameraType != 14) {
-                scenePlus.setPayStatus(commonService.getPayStatus(scenePlus.getCameraId(), space));
-            }
+
             scenePlus.setUpdateTime(new Date());
             scenePlus.setSceneStatus(SceneStatus.NO_DISPLAY.code());
 
@@ -342,14 +339,18 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             String pushToken = fdageData.getString("pushToken");
             this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
-            //更新场景主表
-            scenePlusService.updateById(scenePlus);
-
             //删除计算目录
             if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
                 CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
             }
 
+            //更新场景主表
+            //如果相机容量不足，需要把场景的paystatus改为容量不足状态
+            if (cameraType != 14) {
+                scenePlus.setPayStatus(commonService.getPayStatus(scenePlus.getCameraId(), space));
+            }
+            scenePlusService.updateById(scenePlus);
+
             //国际环境需要发邮件通知
             if("eur".equals(env)){
                 commonService.sendEmail(sceneCode);