管理后台续费

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);
+        }
     }