|
@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
|
|
cameraVo.setResponseUserIncrement(responseUserIncrement);
|
|
cameraVo.setResponseUserIncrement(responseUserIncrement);
|
|
cameraVo.setMemberLevels(userIncrement.getMemberLevels());
|
|
cameraVo.setMemberLevels(userIncrement.getMemberLevels());
|
|
IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
- if(incrementType != null){
|
|
|
|
|
|
+ if(incrementType != null && userIncrement.getIsExpired() == 0){
|
|
if("GB".equals(cameraVo.getUnit())){
|
|
if("GB".equals(cameraVo.getUnit())){
|
|
cameraVo.setTotalSpace(String.valueOf(incrementType.getCameraCapacity()));
|
|
cameraVo.setTotalSpace(String.valueOf(incrementType.getCameraCapacity()));
|
|
cameraVo.setTotalSpaceStr(incrementType.getCameraCapacity()+".00GB");
|
|
cameraVo.setTotalSpaceStr(incrementType.getCameraCapacity()+".00GB");
|