高级会员权益容量设置为50G

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

@@ -184,17 +184,25 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 }
             }
             if(incrementMap.get(responseCamera.getId()) != null){
-                responseCamera.setUserIncrementId(incrementMap.get(responseCamera.getId()).getId());
-                responseCamera.setMemberLevels(incrementMap.get(responseCamera.getId()).getMemberLevels());
-                responseCamera.setSpaceEndStr(DateUserUtil.getDayTime(incrementMap.get(responseCamera.getId()).getIncrementEndTime()));
-                responseCamera.setSpaceEndTime(incrementMap.get(responseCamera.getId()).getIncrementEndTime());
-                String dayTime = incrementMap.get(responseCamera.getId()).getIncrementEndTime();
-                Integer surplusDate = Days.daysBetween(new DateTime(), new DateTime( DateUserUtil.getDate(dayTime))).getDays();
-                if(surplusDate < 31){
-                    responseCamera.setIsExpire(true);
-                    responseCamera.setSurplusDate(surplusDate);
-                }else {
-                    responseCamera.setIsExpire(false);
+                UserIncrement userIncrement = incrementMap.get(responseCamera.getId());
+                if(userIncrement != null){
+                    responseCamera.setUserIncrementId(userIncrement.getId());
+                    responseCamera.setMemberLevels(userIncrement.getMemberLevels());
+                    responseCamera.setSpaceEndStr(DateUserUtil.getDayTime(userIncrement.getIncrementEndTime()));
+                    responseCamera.setSpaceEndTime(userIncrement.getIncrementEndTime());
+
+                    String dayTime = userIncrement.getIncrementEndTime();
+                    Integer surplusDate = Days.daysBetween(new DateTime(), new DateTime( DateUserUtil.getDate(dayTime))).getDays();
+                    if(surplusDate < 31){
+                        responseCamera.setIsExpire(true);
+                        responseCamera.setSurplusDate(surplusDate);
+                    }else {
+                        responseCamera.setIsExpire(false);
+                    }
+                    if("SE".equals(userIncrement.getMemberLevels()) && !responseCamera.getIsExpire()){  //高级会员 50G容量
+                        responseCamera.setTotalSpaceStr("50.00GB");
+                        responseCamera.setTotalSpace("50.00");
+                    }
                 }
             }