change 4 anni fa
parent
commit
120f8ea6f6

+ 7 - 7
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskUserServiceImpl.java

@@ -149,7 +149,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
 
         //增加用户积分,并判断是否达到对应等级,更新等级
         UserVo userVo = userService.queryById(bo.getUserId());
-        ActivityTaskVo activityTaskVo = activityTaskService.queryById(bo.getTaskId());
+        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
 
         //签到逻辑连续签到获得累加积分,断了为初始积分
         LambdaQueryWrapper<ActivityTaskUser> lqw =Wrappers.lambdaQuery();;
@@ -255,7 +255,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
         }
         validReceiver(bo);
 
-        ActivityTaskVo activityTaskVo = activityTaskService.queryById(bo.getTaskId());
+        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(bo.getTaskId());
 
         //增加用户积分
         UserVo userVo = userService.queryById(bo.getUserId());
@@ -428,7 +428,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
         switch (bo.getTaskType()){
             //每日签到逻辑,当日有领取即无法签到
             case 0:
-                LambdaQueryChainWrapper<ActivityTaskUser> lqw = lambdaQuery();
+                LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
                 lqw.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
                 lqw.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
                 lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
@@ -439,7 +439,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
                 break;
                 //完善信息  按照百分比求得乘以分数得到奖励分数
             case 1:
-                LambdaQueryChainWrapper<ActivityTaskUser> useWan = lambdaQuery();
+                LambdaQueryWrapper<ActivityTaskUser> useWan = Wrappers.lambdaQuery();
                 useWan.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
                 useWan.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
                 List<ActivityTaskUser> listWan = this.list(useWan);
@@ -455,7 +455,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
                 break;
             case 3:
                 //每日分享,大于三次达到上线
-                LambdaQueryChainWrapper<ActivityTaskUser> useMei = lambdaQuery();
+                LambdaQueryWrapper<ActivityTaskUser> useMei = Wrappers.lambdaQuery();
                 useMei.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
                 useMei.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
                 useMei.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
@@ -480,7 +480,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
                 }
                 break;
             case 5:
-                LambdaQueryChainWrapper<ActivityTaskUser> practice = lambdaQuery();
+                LambdaQueryWrapper<ActivityTaskUser> practice = Wrappers.lambdaQuery();
                 practice.eq(bo.getTaskType() !=null,ActivityTaskUser::getTaskType,bo.getTaskType());
                 practice.eq(bo.getUserId() !=null,ActivityTaskUser::getUserId,bo.getUserId());
                 practice.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
@@ -537,7 +537,7 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
     private static int getContinuousSignInDay(List<SignIn> signInList) {
         //continuousDay 连续签到数
         int continuousDay = 1;
-        boolean todaySignIn = false;
+        boolean todaySignIn = true;
         Date today = new Date();
         for (int i = 0; i < signInList.size(); i++) {
             SignIn signIn = signInList.get(i);

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -291,6 +291,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             UserPlan userPlan = new UserPlan();
             userPlan.setPlanId(bo.getPlanId());
             userPlan.setStatus(0);
+            userPlan.setUpdateTime(DateUtils.getNowTime());
             int i = baseMapper.updateById(userPlan);
         }else {
             //自定义学习计划,自动生成计划