相机登录返回容量单位和权益类型

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

@@ -426,6 +426,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 vo.setBalance(Integer.valueOf(detailEntity.getBalance()));
                 vo.setChildName(cameraEntity.getChildName());
                 vo.setSnCode(cameraEntity.getSnCode());
+                vo.setUnit(detailEntity.getUnit());
                 if (detailEntity.getType() != 0){
                     if("GB".equals(detailEntity.getUnit())){
                         vo.setUsedSpace(Double.valueOf(FileSizeUtil.formetFileSize(detailEntity.getUsedSpace().longValue(), FileSizeUtil.SIZETYPE_GB)).intValue() +"" );

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

@@ -16,6 +16,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sensitive.Variable;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.mapper.IUserIncrementMapper;
 import com.fdkankan.ucenter.mapper.IUserMapper;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.util.DateUserUtil;
@@ -59,6 +60,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Autowired
     IUserIncrementService userIncrementService;
     @Autowired
+    IIncrementTypeService incrementTypeService;
+    @Autowired
     IReceiverInfoService receiverInfoService;
     @Autowired
     RedisUtil redisUtil;
@@ -327,6 +330,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
             BeanUtils.copyProperties(userIncrement,responseUserIncrement);
             cameraVo.setResponseUserIncrement(responseUserIncrement);
+            cameraVo.setMemberLevels(userIncrement.getMemberLevels());
         }
         if("10".equals(cameraVo.getCameraType()) ){ //深时权益
             cameraVo.setUsedSpace("0");