Merge branch 'project-jp-2.2.0' into project-jp

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

@@ -265,8 +265,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             Map<String, String> uploadFiles = getUploadFiles(scenePlus,path,cameraType,fdageData);
 
             String rebuild = message.getRebuild();
+            log.info("rebuild状态:{}", rebuild);
             //新拍场景默认是已支付状态，补拍、重算的场景，支付状态无需改变
             if("0".equals(rebuild)){
+                log.info("是新拍");
                 scenePlus.setPayStatus(PayStatus.PAY.code());
             }
             scenePlus.setUpdateTime(new Date());

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -976,7 +976,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlus.setId(oldScene.getId());
             scenePlus.setSceneStatus(SceneStatus.wait.code());
             scenePlus.setRecStatus(RecStatus.VALID.code());
-            scenePlus.setPayStatus(PayStatus.NOT_PAY.code());
             scenePlus.setCreateTime(Calendar.getInstance().getTime());
 
             ScenePlusExt oldSceneExt = scenePlusExtService.getScenePlusExtByPlusId(oldScene.getId());