1

src/main/java/com/fdkankan/tk/service/impl/SceneServiceImpl.java

@@ -32,22 +32,13 @@ public class SceneServiceImpl implements ISceneService {
     @Override
     public List<SceneVo> getListByNumList(List<String> numList) {
         SceneParam param = new SceneParam();
+        param.setPageSize(99999);
         param.setNumList(numList);
-        param.setStatus(null);
-        param.setPageNum(1);
-        param.setType(0);
-        param.setPageSize(9999);
-        JSONArray list = fdkkList(param);
-        param.setType(1);
-        JSONArray list1 = fdkkList(param);
-        list.addAll(list1);
-        param.setType(4);
-        JSONArray list2 = fdkkList(param);
-        list.addAll(list2);
-        param.setType(6);
-        JSONArray list3 = fdkkList(param);
-        list.addAll(list3);
-        return overSceneVo(list);
+        Page<SceneVo> voPage = scenePlusService.pageList(param);
+        for (SceneVo vo : voPage.getRecords()) {
+           vo.setStatus( setLaserStatus(vo.getStatus(), vo.getPayStatus()));
+        }
+        return voPage.getRecords();
     }
 
     private JSONArray fdkkList(SceneParam param ){
@@ -67,7 +58,9 @@ public class SceneServiceImpl implements ISceneService {
         String userName = JwtUtil.getUserName(token);
         param.setUserName(userName);
         Page<SceneVo> voPage = scenePlusService.pageList(param);
-
+        for (SceneVo vo : voPage.getRecords()) {
+            vo.setStatus( setLaserStatus(vo.getStatus(), vo.getPayStatus()));
+        }
         return PageInfo.PageInfo(voPage);
     }
 

src/main/resources/mapper/tk/ScenePlusMapper.xml

@@ -10,7 +10,7 @@
                   and (s.scene_source in (0,1,3)
                   or (s.scene_source in (4,5) and e.is_obj = 1))
         <if test="param.status != null and param.status ==2">
-            and s.scene_status = -2 and s.pay_status = 1
+            and s.scene_status = -2
         </if>
         <if test="param.sceneName!= null and param.sceneName !=''">
             and s.title  like concat ('%', #{param.sceneName} ,'%')