送积分bug

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

@@ -1663,8 +1663,10 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
     public MemberInfoEntity activeCampusAgent(Long activityId) {
         ActivityEntity activityEntity = activityDao.selectById(activityId);
         Long memberId = activityEntity.getMemberId();
-        MemberInfoEntity memberInfoEntity = memberInfoDao.memberById(memberId);
-        if (ObjectUtil.isNotNull(memberInfoEntity)) {
+        //MemberInfoEntity memberInfoEntity = memberInfoDao.memberById(memberId);
+        MemberInfoEntity memberInfoEntity = new MemberInfoEntity();
+        SysUserEntity sysUserEntity = sysUserDao.selectById(memberId);
+        if (ObjectUtil.isNotNull(sysUserEntity)) {
             CampusAgentEntity campusAgentEntity = campusAgentService.loadByMemberId(memberId, false);
             if (ObjectUtil.isNotNull(campusAgentEntity)) {
                 memberInfoEntity.setName(campusAgentEntity.getShowName());
@@ -1679,15 +1681,11 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
 
             }
             Integer memberRoleStatus = memberRoleService.getMemberRoleStatus(memberId);
-            memberInfoEntity.setMemberRoleStatus(memberRoleStatus);
-        } else {
-            SysUserEntity entity = sysUserDao.selectById(memberId);
-            memberInfoEntity = new MemberInfoEntity();
             memberInfoEntity.setId(memberId);
-            memberInfoEntity.setName(entity.getName());
-            memberInfoEntity.setSex(entity.getSex());
-            memberInfoEntity.setMemberphoto(entity.getImg());
-            memberInfoEntity.setMemberRoleStatus(MemberRoleStatusEnum.PLATFORM_ADMINISTRATOR.value());
+            memberInfoEntity.setName(sysUserEntity.getName());
+            memberInfoEntity.setSex(sysUserEntity.getSex());
+            memberInfoEntity.setMemberphoto(sysUserEntity.getImg());
+            memberInfoEntity.setMemberRoleStatus(memberRoleStatus);
         }
         return memberInfoEntity;
     }
@@ -2049,10 +2047,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                             scoreStu.setScoreValue(taskScore);
                             scoreStu.setScoreEvent(TaskType.ACTIVITY.getInfo());
                             scoreStu.setCreateTime(new Date());
-                            ScoreStu scoreOne = scoreStuService.getOneByStuIdActId(activityStuEntity.getStuId(), activityStuEntity.getActivityId());
-                            if (null == scoreOne){
-                                scoreStuService.save(scoreStu);
-                            }
+                            scoreStuService.save(scoreStu);
                         }
                     }
                     baseMapper.update(null, new LambdaUpdateWrapper<ActivityEntity>().set(ActivityEntity::getIsPublish, "0")

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

@@ -127,9 +127,9 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
     private TaskManageService taskManageService;
 
     public static void main(String[] args) {
-        Map params = new HashMap();
-        params.put("myDataPermissions", true);
-        System.out.println(MapUtil.getBool(params, "myDataPermissions"));
+        String nowDate = DateFormatUtils.format(new Date(),"yyyy-MM-dd");
+        String nowTime = DateFormatUtils.format(new Date(),"HH:mm");
+        System.out.println(nowTime);
     }
 
     @Override
@@ -1834,10 +1834,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
                             scoreStu.setScoreValue(taskScore);
                             scoreStu.setScoreEvent(TaskType.WORK_ACTIVITY.getInfo());
                             scoreStu.setCreateTime(new Date());
-                            ScoreStu scoreOne = scoreStuService.getOneByStuIdActId(workStuEntity.getStuId(), workStuEntity.getWorkId());
-                            if (null == scoreOne){
-                                scoreStuService.save(scoreStu);
-                            }
+                            scoreStuService.save(scoreStu);
                         }
                     }
                     baseMapper.update(null, new LambdaUpdateWrapper<WorkEntity>().set(WorkEntity::getIsPublish, "0")