bug

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/ActivityServiceImpl.java

@@ -1403,18 +1403,19 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
             //scoreStuService.deleteRecord(stuId, actId);
             ScoreStu scoreStu = scoreStuService.getOneByStuIdActId(stuId, actId);
             //退还积分记录
-            ScoreStu add = new ScoreStu();
-            add.setDay(DateForStr.getInfoDateStr(new Date()));
-            add.setStuId(stuId);
-            add.setScoreType(ScoreType.STORE_SCORE.getCode());
-            add.setTaskId(TaskType.ACTIVITY_CANCEL.getCode());
-            add.setBusinessId(actId);
-            add.setScoreEvent(TaskType.ACTIVITY_CANCEL.getInfo());
-            add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
-            add.setCreateTime(new Date());
-            add.setSurplusScore(Math.abs(scoreStu.getScoreValue()) + this.scoreStuService.getTotalScore(stuId));
-            scoreStuMapper.insert(add);
-
+            if (scoreStu != null){
+                ScoreStu add = new ScoreStu();
+                add.setDay(DateForStr.getInfoDateStr(new Date()));
+                add.setStuId(stuId);
+                add.setScoreType(ScoreType.STORE_SCORE.getCode());
+                add.setTaskId(TaskType.ACTIVITY_CANCEL.getCode());
+                add.setBusinessId(actId);
+                add.setScoreEvent(TaskType.ACTIVITY_CANCEL.getInfo());
+                add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
+                add.setCreateTime(new Date());
+                add.setSurplusScore(Math.abs(scoreStu.getScoreValue()) + this.scoreStuService.getTotalScore(stuId));
+                scoreStuMapper.insert(add);
+            }
             //TODO 更新用户活动次数
             memberInfoDao.updateActivityFrequency(activityStu.getStuId(), 1, false);
 

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/MemberInfoServiceImpl.java

@@ -270,7 +270,6 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
         } else {
             memberInfoEntity.setVipYN(false);
         }
-
         memberInfoEntity.setPassword("");
 
         Long memberId = memberInfoEntity.getId();
@@ -282,15 +281,21 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
             Integer memberRoleStatus = 0;
             for (SysRoleEntity sysRoleEntity : sysRoleEntities) {
                 Long roleId = sysRoleEntity.getRoleId();
-                if (ObjectUtil.equal(roleId, 38L)) {
+                if (ObjectUtil.equal(roleId, 37L)) {
                     Integer value = MemberRoleStatusEnum.PLATFORM_ADMINISTRATOR.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
-                } else if (ObjectUtil.equal(roleId, 39L)) {
+                }  else if (ObjectUtil.equal(roleId, 38L)) {
                     Integer value = MemberRoleStatusEnum.CAMPUS_AGENT.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
-                } else if (ObjectUtil.equal(roleId, 40L)) {
+                } else if (ObjectUtil.equal(roleId, 39L)) {
                     Integer value = MemberRoleStatusEnum.EXPERT.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
+                } else if (ObjectUtil.equal(roleId, 40L)) {
+                    Integer value = MemberRoleStatusEnum.EXPERT_PLATFORM_ADMINISTRATOR.value();
+                    memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
+                } else if (ObjectUtil.equal(roleId, 41L)) {
+                    Integer value = MemberRoleStatusEnum.EXPERT_CAMPUS_AGENT.value();
+                    memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
                 }
             }
             memberInfoEntity.setMemberRoleStatus(memberRoleStatus);

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/WorkServiceImpl.java

@@ -891,17 +891,19 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
         if (workStu.getFromTo().equals("1")){
             ScoreStu scoreStu = scoreStuService.getOneByStuIdActId(stuId, workId);
             //退还积分记录
-            ScoreStu add = new ScoreStu();
-            add.setDay(DateForStr.getInfoDateStr(new Date()));
-            add.setStuId(stuId);
-            add.setScoreType(ScoreType.STORE_SCORE.getCode());
-            add.setTaskId(TaskType.WORK_CANCEL.getCode());
-            add.setBusinessId(workId);
-            add.setScoreEvent(TaskType.WORK_CANCEL.getInfo());
-            add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
-            add.setCreateTime(new Date());
-            add.setSurplusScore(Math.abs(scoreStu.getScoreValue())+ this.scoreStuService.getTotalScore(stuId));
-            scoreStuMapper.insert(add);
+            if (scoreStu != null){
+                ScoreStu add = new ScoreStu();
+                add.setDay(DateForStr.getInfoDateStr(new Date()));
+                add.setStuId(stuId);
+                add.setScoreType(ScoreType.STORE_SCORE.getCode());
+                add.setTaskId(TaskType.WORK_CANCEL.getCode());
+                add.setBusinessId(workId);
+                add.setScoreEvent(TaskType.WORK_CANCEL.getInfo());
+                add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
+                add.setCreateTime(new Date());
+                add.setSurplusScore(Math.abs(scoreStu.getScoreValue())+ this.scoreStuService.getTotalScore(stuId));
+                scoreStuMapper.insert(add);
+            }
         }
         /*MemberInfoEntity member = memberInfoDao.selectById(stuId);
         member.setFreezeTime(DateFormatUtils.format(now,"yyyy-MM-dd HH:mm:ss"));

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/MemberRoleServiceImpl.java

@@ -67,15 +67,21 @@ public class MemberRoleServiceImpl extends ServiceImpl<MemberRoleMapper, MemberR
         if (CollectionUtil.isNotEmpty(sysRoleEntities)) {
             for (SysRoleEntity sysRoleEntity : sysRoleEntities) {
                 Long roleId = sysRoleEntity.getRoleId();
-                if (ObjectUtil.equal(roleId, 38L)) {
+                if (ObjectUtil.equal(roleId, 37L)) {
                     Integer value = MemberRoleStatusEnum.PLATFORM_ADMINISTRATOR.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
-                } else if (ObjectUtil.equal(roleId, 39L)) {
+                }  else if (ObjectUtil.equal(roleId, 38L)) {
                     Integer value = MemberRoleStatusEnum.CAMPUS_AGENT.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
-                } else if (ObjectUtil.equal(roleId, 40L)) {
+                } else if (ObjectUtil.equal(roleId, 39L)) {
                     Integer value = MemberRoleStatusEnum.EXPERT.value();
                     memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
+                } else if (ObjectUtil.equal(roleId, 40L)) {
+                    Integer value = MemberRoleStatusEnum.EXPERT_PLATFORM_ADMINISTRATOR.value();
+                    memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
+                } else if (ObjectUtil.equal(roleId, 41L)) {
+                    Integer value = MemberRoleStatusEnum.EXPERT_CAMPUS_AGENT.value();
+                    memberRoleStatus = NumberUtil.add(memberRoleStatus, value).intValue();
                 }
             }
         }