update:添加测试数据，修改空指针问题

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -506,6 +506,18 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         } else {
             teacherHomeVo.setLiveing(YesOrNoEnum.NO);
         }
+        
+        //针对录屏用户30483特殊处理
+        if(30483 == userId.longValue()) {
+        	teacherHomeVo.setBrowse(teacherHomeVo.getBrowse() + 38000);     	
+        	teacherHomeVo.setFansNum(teacherHomeVo.getFansNum() + 6500);
+        	teacherHomeVo.setMusicAlbumNum(teacherHomeVo.getMusicAlbumNum() + 8);
+        	teacherHomeVo.setMusicSheetNum(teacherHomeVo.getMusicSheetNum() + 200);
+        	teacherHomeVo.setStudentNums(teacherHomeVo.getStudentNums() + 25);
+        	teacherHomeVo.setExpTime(teacherHomeVo.getExpTime() + 125);
+        	teacherHomeVo.setUnExpTime(teacherHomeVo.getUnExpTime() + 80);
+        }
+        
         return HttpResponseResult.succeed(teacherHomeVo);
     }
 
@@ -1469,34 +1481,38 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
         if (teacherId != null) {
             Teacher teacher = getById(teacherId);
-            if (teacher.getIsSettlement() !=null && !teacher.getIsSettlement()) {
-                accountTenantTo.setIncomeTenant(0L);
-            } else if (teacher.getTenantId() != null && teacher.getTenantId() > 0) {
-                accountTenantTo.setIncomeTenant(teacher.getTenantId());
-                if (ESettlementFrom.TEACHER.equals(teacher.getSettlementFrom())) {
+            if(teacher != null) {
+                if (teacher.getIsSettlement() !=null && !teacher.getIsSettlement()) {
+                    accountTenantTo.setIncomeTenant(0L);
+                } else if (teacher.getTenantId() != null && teacher.getTenantId() > 0) {
+                    accountTenantTo.setIncomeTenant(teacher.getTenantId());
+                    if (ESettlementFrom.TEACHER.equals(teacher.getSettlementFrom())) {
+                        accountTenantTo.setIncomeTeacher(true);
+                    }
+                } else {
+                    // 分润给老师
+                    accountTenantTo.setIncomeTenant(-1L);
                     accountTenantTo.setIncomeTeacher(true);
                 }
-            } else {
-                // 分润给老师
-                accountTenantTo.setIncomeTenant(-1L);
-                accountTenantTo.setIncomeTeacher(true);
             }
         }
 
 
         if (recomUserId != null) {
             Teacher teacher = getById(recomUserId);
-            if (teacher.getIsSettlement() !=null && !teacher.getIsSettlement()) {
-                accountTenantTo.setShareTenant(0L);
-            } else if (teacher.getTenantId() != null && teacher.getTenantId() > 0) {
-                accountTenantTo.setShareTenant(teacher.getTenantId());
-                if (ESettlementFrom.TEACHER.equals(teacher.getSettlementFrom())) {
+            if(teacher != null) {
+                if (teacher.getIsSettlement() !=null && !teacher.getIsSettlement()) {
+                    accountTenantTo.setShareTenant(0L);
+                } else if (teacher.getTenantId() != null && teacher.getTenantId() > 0) {
+                    accountTenantTo.setShareTenant(teacher.getTenantId());
+                    if (ESettlementFrom.TEACHER.equals(teacher.getSettlementFrom())) {
+                        accountTenantTo.setShareTeacher(true);
+                    }
+                } else {
+                    // 分润给老师
+                    accountTenantTo.setShareTenant(-1L);
                     accountTenantTo.setShareTeacher(true);
                 }
-            } else {
-                // 分润给老师
-                accountTenantTo.setShareTenant(-1L);
-                accountTenantTo.setShareTeacher(true);
             }
         }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -67,6 +67,15 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
             throw new BizException("用户没有开通账户");
         }
         detail = dealUserAccountVo(detail);
+        
+        if(30483 == id.longValue()) {
+        	detail.setAmountFrozen(detail.getAmountFrozen().add(new BigDecimal(0)));
+        	detail.setAmountRecorded(detail.getAmountRecorded().add(new BigDecimal(5200)));
+        	detail.setAmountShare(detail.getAmountShare().add(new BigDecimal(5200)));
+        	detail.setAmountTotal(detail.getAmountTotal().add(new BigDecimal(5200)));
+        	detail.setAmountUnrecorded(detail.getAmountUnrecorded().add(new BigDecimal(0)));
+        	detail.setAmountUsable(detail.getAmountUsable().add(new BigDecimal(5200)));
+        }
         return detail;
     }