Merge branch 'test'

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -178,7 +178,17 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if("aws".equals(CacheUtil.uploadType)){
                 cameraDetail.setCountry(1);//1-国外
             }
-            cameraDetail.setGoodsId(null);
+            Long goodId = null;
+            if(cameraDetail.getType() == 1 || cameraDetail.getType() == 4){
+                goodId = 4L;
+            }
+            if(cameraDetail.getType() == 9){
+                goodId = 9L;
+            }
+            if(cameraDetail.getType() == 10){
+                goodId = 10L;
+            }
+            cameraDetail.setGoodsId(goodId);
 
             if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
                 cameraDetail.setCountry(2);

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

@@ -145,6 +145,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePro::getStatus,-2);
+        plusWr.eq(ScenePlus::getSceneStatus,-2);
         Long totalSpace = cameraDetail.getTotalSpace();
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
         if(userIncrement!=null){
@@ -225,7 +227,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private void getSceneLockedIds(List<Long> lockedIds , List<ScenePro> list, Long beyondSpace, Long accumulateSpace){
         if (list != null && list.size() > 0){
             for (ScenePro scenePro : list){
-                accumulateSpace += scenePro.getSpace();
+                accumulateSpace += scenePro.getSpace()== null ? 0 : scenePro.getSpace();
                 if (accumulateSpace.compareTo(beyondSpace) > 0){
                     break;
                 }
@@ -239,7 +241,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             HashMap<Long, ScenePlusExt> byPlusIds = scenePlusExtService.getByPlusIds(plusIds);
             for (ScenePlus scenePlus : list){
                 ScenePlusExt scenePlusExt = byPlusIds.get(scenePlus.getId());
-                accumulateSpace += scenePlusExt.getSpace();
+                accumulateSpace += scenePlusExt.getSpace() == null ? 0 : scenePlusExt.getSpace();
                 if (accumulateSpace.compareTo(beyondSpace) > 0){
                     break;
                 }

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -44,6 +44,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     IAgentNewLogService agentNewLogService;
     @Autowired
     ICameraIncrementLogService cameraIncrementLogService;
+    @Autowired
+    ISceneProService sceneProService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -113,8 +115,12 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
         IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
 
+        String incrementEndTime = userIncrement.getIncrementEndTime();
+        if(userIncrement.getIsExpired() == 1){
+            incrementEndTime = Dateutils.getDate(new Date());
+        }
         userIncrement.setIsExpired(0);
-        Date date = DateUtil.string2Date(userIncrement.getIncrementEndTime(), DateUtil.DEFAULT_DATE_FORMAT);
+        Date date = DateUtil.string2Date(incrementEndTime, DateUtil.DEFAULT_DATE_FORMAT);
         Date delay = null;
         switch (incrementType.getValidTimeType()){
             case 0 : delay = DateUtil.delay(date, 1, 1); break;
@@ -133,6 +139,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         userService.addDownNum(param);
 
         agentNewLogService.addByUserIncrement(userIncrement);
+        if(userIncrement.getCameraId() != null){
+            sceneProService.lockOrUnLockBySpace(null,userIncrement.getCameraId(),1);
+        }
     }