Merge branch 'hotfix-29203-20220711' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProV3.java

@@ -224,5 +224,7 @@ public class SceneProV3 implements Serializable {
     @TableLogic
     private Integer tbStatus;
 
+    private Integer isUpgrade;
+
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -542,8 +542,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(sceneProV3.getRecStatus().equals("I")){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
         }
-        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
-            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
+        if((SceneStatus.SUCCESS.code() != sceneProV3.getStatus() && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus())
+        || (sceneProV3.getIsUpgrade() != null && sceneProV3.getIsUpgrade()== 2)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
         }
         if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -112,7 +112,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
             throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
         }
         if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
-            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
+            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()
+            || (sceneProV3.getIsUpgrade() != null && sceneProV3.getIsUpgrade()== 2)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
         }
         if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){