Merge branch 'lyh-bug-increment-exp' into test

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -282,13 +282,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long cameraDetailSpace = 0L;
         if(payStatus == 1){ //解封
             sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() !=1).collect(Collectors.toList());
+            Collections.reverse(sceneVos);
             beyondSpace =  totalSpace - usedSpace;
             Long space = getSceneLockedIds(lockedIds, sceneVos, beyondSpace, accumulateSpace);
             cameraDetailSpace  = usedSpace + space;
         }else {
             sceneVos = sceneVos.stream().filter(entity -> entity.getPayStatus() ==1).collect(Collectors.toList());
             beyondSpace =  usedSpace - totalSpace;
-            Collections.reverse(sceneVos);
             Long space = getSceneLockedIds(lockedIds,sceneVos, beyondSpace, accumulateSpace);
             if(lockedIds.size() <=0 &&  sceneVos.size() >0){
                 space = sceneVos.get(0).getSpace();

src/main/java/com/fdkankan/ucenter/vo/response/SimpleSceneVo.java

@@ -1,10 +1,16 @@
 package com.fdkankan.ucenter.vo.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.util.Date;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class SimpleSceneVo {
     private Long id;
     private String num;