Merge branch 'dev-v4.2.0-20220519' into test

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

@@ -371,27 +371,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public SceneInfoVO getSceneInfo(@Var SceneInfoParamVO param) throws Exception{
         SceneInfoReqType sceneInfoReqType = SceneInfoReqType.get(param.getReqType());
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
-        String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + param.getNum();
-        Result<SceneProV3> result = fdkankanMiniClient
-            .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
-                new FdkkMiniReqErrorCallback());
-        SceneProV3 sceneProV3 = result.getData();
-        if(sceneProV3 == null || sceneProV3.getId() == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        if(sceneProV3.getRecStatus().equals("I")){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
-        }
-        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
-            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
-        }
-        if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
-        }
-
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
         switch (sceneInfoReqType){
             //如果是编辑页面请求，查数据库
             case EDIT:
@@ -527,6 +506,27 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
      **/
     private SceneInfoVO getSceneInfo4View(String num) throws Exception{
 
+        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
+        String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + num;
+        Result<SceneProV3> result = fdkankanMiniClient
+            .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
+                new FdkkMiniReqErrorCallback());
+        SceneProV3 sceneProV3 = result.getData();
+        if(sceneProV3 == null || sceneProV3.getId() == null){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        if(sceneProV3.getRecStatus().equals("I")){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
+        }
+        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
+            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+        }
+        if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
+        }
+        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
+
 //        ScenePro scenePro = sceneProService.findBySceneNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(Objects.isNull(scenePlus)){

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

@@ -28,6 +28,7 @@ import com.fdkankan.scene.bean.UserIncrementBean;
 import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCallback;
 import com.fdkankan.scene.entity.ScenePlus;
+import com.fdkankan.scene.entity.SceneProV3;
 import com.fdkankan.scene.httpclient.FdkankanMiniClient;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
 import com.fdkankan.scene.service.ISceneEditInfoService;
@@ -72,6 +73,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private String bucket;
     @Value("${http.host.4dkankanMini}")
     private String fkankanMiniHost;
+    @Value("${http.api-v4.getSceneProByNum}")
+    private String URL_GET_SCENEPRO_BY_NUM;
     @Autowired
     ISceneProService sceneProService;
     @Autowired
@@ -96,6 +99,27 @@ public class SceneEditServiceImpl implements ISceneEditService {
     @Override
     public SceneAuthVO getAuth(BaseSceneParamVO param, String token) throws Exception{
 
+        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
+        String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + param.getNum();
+        Result<SceneProV3> result = fdkankanMiniClient
+            .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
+                new FdkkMiniReqErrorCallback());
+        SceneProV3 sceneProV3 = result.getData();
+        if(sceneProV3 == null || sceneProV3.getId() == null){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        if(sceneProV3.getRecStatus().equals("I")){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
+        }
+        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
+            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+        }
+        if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
+        }
+        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
+
         ScenePlus scenePlus = scenePlusService.getOne(
             new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getNum, param.getNum())
                 .eq(ScenePlus::getPayStatus, PayStatus.PAY.code()));
@@ -144,7 +168,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
 //            }
 //        }
         // TODO: 2022/4/25 v3v4共存过渡期结束需要删除，恢复上面注释内容 ------------------------------------------start
-        String url = fkankanMiniHost + URL_ISLOGIN + param.getNum();
+        url = fkankanMiniHost + URL_ISLOGIN + param.getNum();
         Result<Map<String, Object>> isLoginResult = fdkankanMiniClient
             .getIsLogin(url, token, new FdkkMiniReqSuccessCallback(),
                 new FdkkMiniReqErrorCallback());