fix 拥有课程

zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityTaskController.java

@@ -70,14 +70,14 @@ public class ActivityTaskController extends BaseController {
     /**
      * 完善信息
      */
-    @ApiOperation("完善信息")
+  /*  @ApiOperation("完善信息")
     @Log(title = "完善信息", businessType = BusinessType.UPDATE)
     @PostMapping("/information")
     public AjaxResult<Void> information(@RequestBody ActivityTaskUserAddBo bo) throws IllegalAccessException {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.information(bo) ? 1 : 0);
-    }
+    }*/
 
 
 
@@ -120,13 +120,13 @@ public class ActivityTaskController extends BaseController {
     /**
      * 模拟考试
      */
-    @ApiOperation("模拟考试")
+ /*   @ApiOperation("模拟考试")
     @Log(title = "模拟考试", businessType = BusinessType.UPDATE)
     @PostMapping("/practiceTest")
     public AjaxResult<Void> practiceTest(@RequestBody ActivityTaskUserAddBo bo){
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.practiceTest(bo) ? 1 : 0);
-    }
+    }*/
 
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/OrderPossessUserController.java

@@ -52,7 +52,7 @@ public class OrderPossessUserController extends BaseController {
     /**
      * 查询【请填写功能名称】列表
      */
-    @ApiOperation("查询【请填写功能名称】列表")
+    @ApiOperation("查询用户拥有课程列表")
     @GetMapping("/list")
     public AjaxResult<OrderPossessUserVo> list(OrderPossessUserQueryBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskUserMapper.java

@@ -12,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityTaskUserMapper extends BaseMapper<ActivityTaskUser> {
 
+    int insertAdd(ActivityTaskUser add);
 }

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();;
@@ -169,6 +169,9 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
         //连续签到的天数，不包括今天，即第一天1积分第二天2积分
         int continuousSignInDay = getContinuousSignInDay(signIn);
         //天数*每次累加分数得出今天分数
+        if (continuousSignInDay == 0){
+            continuousSignInDay =1;
+        }
         int fen = activityTaskVo.getAccIntegral()*continuousSignInDay;
         Long score = userVo.getIntegral()+fen;
 
@@ -183,6 +186,8 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
         //增加用户积分和等级
         userVo.setUserLevel(list1.getGrade());
         increaseUser(userVo,score);
+        add.setUserId(bo.getUserId());
+        add.setTaskId(activityTaskVo.getId());
 
         return this.save(add);
     }
@@ -255,7 +260,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 +433,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 +444,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 +460,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 +485,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 +542,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);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserAddBo.java

@@ -21,7 +21,7 @@ public class OrderPossessUserAddBo {
     @ApiModelProperty("用户ID")
     private Long userId;
     /** 解锁类型 0课程 1题库  2考试重点 */
-    @ApiModelProperty("解锁类型 0课程 1题库  2考试重点")
+    @ApiModelProperty("解锁类型 1课程 2题库  3考试重点")
     private Integer typeId;
     @ApiModelProperty("来源id  0 订单购买  1订单活动购买  2 等级解锁")
     private Integer sourceId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserEditBo.java

@@ -27,7 +27,7 @@ public class OrderPossessUserEditBo {
     private Integer sourceId;
 
     /** 解锁类型 0课程 1题库  2考试重点 */
-    @ApiModelProperty("解锁类型 0课程 1题库  2考试重点")
+    @ApiModelProperty("解锁类型 1课程 2题库  3考试重点")
     private Integer typeId;
 
     /** 拥有的课程id或题库id或考试重点 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/OrderPossessUserQueryBo.java

@@ -37,7 +37,7 @@ public class OrderPossessUserQueryBo extends BaseEntity {
 
 
 	/** 解锁类型 0课程 1题库  2考试重点 */
-	@ApiModelProperty("解锁类型 1课程 2题库  0考试重点")
+	@ApiModelProperty("解锁类型 1课程 2题库  3考试重点")
 	private Integer typeId;
 	/** 拥有的课程id或题库id或考试重点 */
 	@ApiModelProperty("拥有的课程id或题库id或考试重点")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/OrderPossessUser.java

@@ -29,7 +29,7 @@ private static final long serialVersionUID=1L;
     /** 来源id  0 订单购买  1订单活动购买  2 等级解锁 */
     private Integer sourceId;
 
-    /** 解锁类型 0课程 1题库  2考试重点 */
+    /** 解锁类型 解锁类型 1课程 2题库  3考试重点 */
     private Integer typeId;
 
     /** 拥有的课程id或题库id或考试重点 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/OrderPossessUserServiceImpl.java

@@ -62,15 +62,15 @@ public class OrderPossessUserServiceImpl extends ServiceImpl<OrderPossessUserMap
     @Override
     public OrderPossessUserVo queryList(OrderPossessUserQueryBo bo) {
         OrderPossessUserVo orderPossessUserVo = BeanUtil.toBean(bo, OrderPossessUserVo.class);
-        if (bo.getTypeId() == 0){
+        if (bo.getTypeId() == 1){
             List<Course> courses= baseMapper.selectByCource(bo);
             List<CourseVo> coursesVO = entityCourseVo(courses);
             orderPossessUserVo.setCourseVoList(coursesVO);
-       }else if (bo.getTypeId() == 1){
+       }else if (bo.getTypeId() == 2){
            List<QuestionBank> questionBankList= baseMapper.selectByBank(bo);
             List<QuestionBankVo> questionBankVos = entityQuestionBankVo(questionBankList);
             orderPossessUserVo.setQuestionBankList(questionBankVos);
-       }else if (bo.getTypeId() == 2){
+       }else if (bo.getTypeId() == 3){
             List<ExamNote> examNoteVos = baseMapper.selectByEmphasis(bo);
             List<ExamNoteVo> ExamNoteVos = entityExamNoteVo(examNoteVos);
             orderPossessUserVo.setExamNoteList(ExamNoteVos);

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

@@ -12,6 +12,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.exam.vo.ExamArrangementTimeVo;
 import com.zhongzheng.modules.user.domain.UserPlanCource;
 import com.zhongzheng.modules.user.service.IUserPlanCourceService;
+import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.CalendarStudyVo;
 import com.zhongzheng.modules.user.vo.CoursePlanVo;
 import com.zhongzheng.modules.user.vo.DayStudyVo;
@@ -50,6 +51,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     @Autowired
     private IUserPlanCourceService userPlanCourceService;
 
+    @Autowired
+    private IUserStudyRecordService userStudyRecordService;
+
     @Override
     public UserPlanVo queryById(Long userId){
         UserPlan db = this.baseMapper.selectById(userId);
@@ -253,8 +257,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             bo.setCourseId(array);
             List<CoursePlanVo> coursePlanVo = baseMapper.selectByListCourse(bo);
 
-            //获得当天的学习课程节数
+
             coursePlanVo.stream().forEach(s -> {
+                //获得当天学习课程节数
                 calendarStudyVos.stream().filter(c -> c.getMonth()==cal.get(Calendar.MONTH) + 1).forEach(c -> {
                     c.getDayStudyList().stream()
                             .filter(g -> g.getDate() == cal.get(Calendar.DAY_OF_MONTH))
@@ -266,6 +271,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                                 }
                             });
                 });
+
+                //更新当天学习节数是否已经完成
+
+                //int studyCount = userStudyRecordService.selectUserStudy(bo.getUserId(),s.getCourseId(),startTime,endTime);
             });
 
             userPlanVo.setCoursePlanVo(coursePlanVo);
@@ -282,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 {
             //自定义学习计划，自动生成计划

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/OrderPossessUserVo.java

@@ -28,8 +28,8 @@ public class OrderPossessUserVo {
 	private Long userId;
 
 	/** 解锁类型 0课程 1题库  2考试重点 */
-	@Excel(name = "解锁类型 0课程 1题库  2考试重点")
-	@ApiModelProperty("解锁类型 0课程 1题库  2考试重点")
+	@Excel(name = "解锁类型 1课程 2题库  3考试重点")
+	@ApiModelProperty("解锁类型 1课程 2题库  3考试重点")
 	private Integer typeId;
 	/** 拥有的课程id或题库id或考试重点 */
 	@Excel(name = "拥有的课程id或题库id或考试重点")

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskUserMapper.xml

@@ -14,4 +14,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+
+    <insert id="insertAdd" parameterType="map">
+        insert into activity_task_time (
+            task_id,
+            start_range,
+            end_range,
+            integral
+        )values(
+                   #{taskId},
+                   #{startRange},
+                   #{endRange},
+                   #{integral}
+               )
+    </insert>
 </mapper>