wangzongkui пре 6 месеци
родитељ
комит
8cb7d9455e

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

@@ -1412,7 +1412,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
             add.setScoreEvent(TaskType.ACTIVITY_CANCEL.getInfo());
             add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
             add.setCreateTime(new Date());
-            add.setSurplusScore(scoreStu.getScoreValue() + this.scoreStuService.getTotalScore(stuId));
+            add.setSurplusScore(Math.abs(scoreStu.getScoreValue()) + this.scoreStuService.getTotalScore(stuId));
             scoreStuMapper.insert(add);
 
             //TODO 更新用户活动次数

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

@@ -899,7 +899,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkDao, WorkEntity> implements
         add.setScoreEvent(TaskType.WORK_CANCEL.getInfo());
         add.setScoreValue(Math.abs(scoreStu.getScoreValue()));
         add.setCreateTime(new Date());
-        add.setSurplusScore(scoreStu.getScoreValue() + this.scoreStuService.getTotalScore(stuId));
+        add.setSurplusScore(Math.abs(scoreStu.getScoreValue())+ this.scoreStuService.getTotalScore(stuId));
         scoreStuMapper.insert(add);
 
         /*MemberInfoEntity member = memberInfoDao.selectById(stuId);

+ 1 - 1
renren-admin/src/main/java/io/renren/modules/qyh/service/impl/ApiAuthServiceImpl.java

@@ -299,7 +299,7 @@ public class ApiAuthServiceImpl implements ApiAuthService {
                 }
 
                 TaskManage taskManage = taskManageService.getById(TaskType.INVITE_FRIEND.getCode(), false);
-                ScoreStu scoreStuInfo = new ScoreStu();
+                ScoreStu scoreStuInfo =  null;
                 String day = new SimpleDateFormat("yyyyMMdd").format(new Date());
                 if (taskManage.getTaskType() != 2){
                     scoreStuInfo = scoreStuService.queryDayTask(day, memberInfoInviteCode.getId(), TaskType.OPEN_VIP.getCode());

+ 2 - 1
renren-admin/src/main/java/io/renren/modules/qyh/service/impl/ApiMyInvitationServiceImpl.java

@@ -94,7 +94,8 @@ public class ApiMyInvitationServiceImpl implements ApiMyInvitationService {
         myInvitationStatisticsVO.setUserMembership(userMembership);
         List<MemberInfoEntity> memberInfoEntities = memberInfoDao.selectList(new LambdaQueryWrapper<MemberInfoEntity>()
             .select(MemberInfoEntity::getId).eq(MemberInfoEntity::getPInviteCode, inviteCode)
-            .eq(MemberInfoEntity::getIsDeleted, "1").between(MemberInfoEntity::getCreateTime, startTime, endTime));
+            .eq(MemberInfoEntity::getIsDeleted, "1").between(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)
+                        ,MemberInfoEntity::getCreateTime, startTime, endTime));
         if (CollectionUtil.isNotEmpty(memberInfoEntities)) {
             List<Long> memberIdList =
                 memberInfoEntities.stream().map(MemberInfoEntity::getId).collect(Collectors.toList());

+ 1 - 1
renren-admin/src/main/resources/mapper/qyh/OrderDao.xml

@@ -26,7 +26,7 @@
         <where>
             <if test="memberIdList != null and memberIdList.size > 0">
                 and member_id in
-                <foreach item="process" collection="memberIdList" open="(" separator="," close=")">
+                <foreach item="memberId" collection="memberIdList" open="(" separator="," close=")">
                     #{memberId}
                 </foreach>
             </if>