拥有课程获得

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

@@ -6,11 +6,14 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityAdvertisingQueryBo;
 import com.zhongzheng.modules.activity.service.IActivityAdvertisingService;
 import com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -35,6 +38,8 @@ public class ActivityAdvertisingController extends BaseController {
 
     private final IActivityAdvertisingService iActivityAdvertisingService;
 
+    private final com.zhongzheng.framework.web.service.WxTokenService WxTokenService;
+
     /**
      * 查询广告发布储存列表
      */

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

@@ -5,6 +5,8 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
@@ -17,6 +19,7 @@ import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
 import com.zhongzheng.modules.order.bo.CouponQueryBo;
 import com.zhongzheng.modules.order.service.ICouponService;
 import com.zhongzheng.modules.order.vo.CouponVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -45,6 +48,8 @@ public class ActivityConfigurationController extends BaseController {
 
     private final ICouponService couponService;
 
+    private final WxTokenService WxTokenService;
+
     /**
      * 查询活动配置列表
      */
@@ -63,6 +68,8 @@ public class ActivityConfigurationController extends BaseController {
     @ApiOperation("領取活動發送請求")
     @PostMapping("/receive")
     public AjaxResult<Void> receive(ActivityConfigurationUseAddBo bo) {
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityConfigurationUseServiceImpl.receive(bo) ? 1 : 0);
     }
 
@@ -74,6 +81,8 @@ public class ActivityConfigurationController extends BaseController {
     @GetMapping("/listCoupon")
     public TableDataInfo<CouponVo> listCoupon(CouponQueryBo bo) {
         startPage();
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         List<CouponVo> list = couponService.queryIssueListCoupon(bo);
         return getDataTable(list);
     }

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

@@ -5,11 +5,14 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.activity.bo.ActivityTaskQueryBo;
 import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
 import com.zhongzheng.modules.activity.service.IActivityTaskService;
 import com.zhongzheng.modules.activity.service.IActivityTaskUserService;
 import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -37,6 +40,8 @@ public class ActivityTaskController extends BaseController {
 
     private final IActivityTaskUserService activityTaskUserService;
 
+    private final com.zhongzheng.framework.web.service.WxTokenService WxTokenService;
+
 
     /**
      * 查询任务積分列表
@@ -45,6 +50,7 @@ public class ActivityTaskController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ActivityTaskVo> list(ActivityTaskQueryBo bo) {
         startPage();
+
         List<ActivityTaskVo> list = iActivityTaskService.queryList(bo);
         return getDataTable(list);
     }
@@ -56,6 +62,8 @@ public class ActivityTaskController extends BaseController {
     @Log(title = "签到获得积分", businessType = BusinessType.UPDATE)
     @PostMapping("/signIn")
     public AjaxResult<Void> userTask(@RequestBody ActivityTaskUserAddBo bo) {
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.userTask(bo) ? 1 : 0);
     }
 
@@ -66,6 +74,8 @@ public class ActivityTaskController extends BaseController {
     @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);
     }
 
@@ -78,6 +88,8 @@ public class ActivityTaskController extends BaseController {
     @Log(title = "邀请朋友", businessType = BusinessType.UPDATE)
     @PostMapping("/invitation")
     public AjaxResult<Void> invitation(@RequestBody ActivityTaskUserAddBo bo){
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.invitation(bo) ? 1 : 0);
     }
 
@@ -88,6 +100,8 @@ public class ActivityTaskController extends BaseController {
     @Log(title = "每日分享", businessType = BusinessType.UPDATE)
     @PostMapping("/share")
     public AjaxResult<Void> share(@RequestBody ActivityTaskUserAddBo bo){
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.share(bo) ? 1 : 0);
     }
 
@@ -98,6 +112,8 @@ public class ActivityTaskController extends BaseController {
     @Log(title = "学习时长", businessType = BusinessType.UPDATE)
     @PostMapping("/learnTime")
     public AjaxResult<Void> learnTime(@RequestBody ActivityTaskUserAddBo bo){
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(activityTaskUserService.learnTime(bo) ? 1 : 0);
     }
 
@@ -108,6 +124,8 @@ public class ActivityTaskController extends BaseController {
     @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/activity/PlanController.java

@@ -3,10 +3,14 @@ package com.zhongzheng.controller.activity;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.controller.wx.WxLoginController;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.activity.bo.ActivityTaskQueryBo;
 import com.zhongzheng.modules.activity.service.IActivityTaskService;
 import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserPlanService;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
 import io.swagger.annotations.Api;
@@ -35,15 +39,30 @@ public class PlanController extends BaseController {
 
     private final IUserPlanService userPlanService;
 
+    private final WxTokenService WxTokenService;
+
     /**
      * 查询任务積分列表
      */
     @ApiOperation("生成学习计划")
     @GetMapping("/generate")
     public AjaxResult<UserPlanVo> list(UserPlanQueryBo bo) throws ParseException {
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(userPlanService.generate(bo));
     }
 
+    /**
+     * 查询任务積分列表
+     */
+    @ApiOperation("生成学习计划")
+    @GetMapping("/userPlan")
+    public AjaxResult<UserPlanVo> userPlan(UserPlanQueryBo bo) throws ParseException {
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(userPlanService.userPlan(bo));
+    }
+
 
 
 }

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

@@ -3,7 +3,10 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.user.bo.OrderPossessUserQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IOrderPossessUserService;
 import com.zhongzheng.modules.user.vo.OrderPossessUserVo;
 import lombok.RequiredArgsConstructor;
@@ -41,6 +44,8 @@ public class OrderPossessUserController extends BaseController {
 
     private final IOrderPossessUserService iOrderPossessUserService;
 
+    private final com.zhongzheng.framework.web.service.WxTokenService WxTokenService;
+
     /**
      * 查询【请填写功能名称】列表
      */
@@ -48,6 +53,8 @@ public class OrderPossessUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public AjaxResult<OrderPossessUserVo> list(OrderPossessUserQueryBo bo) {
+        ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         OrderPossessUserVo list = iOrderPossessUserService.queryList(bo);
         return  AjaxResult.success(list);
     }

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

@@ -58,4 +58,6 @@ public interface IUserPlanService extends IService<UserPlan> {
 	 * @return
 	 */
 	UserPlanVo generate(UserPlanQueryBo bo) throws ParseException;
+
+	UserPlanVo userPlan(UserPlanQueryBo bo);
 }

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

@@ -136,23 +136,53 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                 userPlan.setStudyNum(0L);
                 userPlan.setCreateTime(DateUtils.getNowTime());
                 userPlan.setUpdateTime(DateUtils.getNowTime());
-
+                if (bo.getStatus() != null){
+                    userPlan.setStatus(bo.getStatus());
+                }
                 boolean save = this.save(userPlan);
             }
             return userPlanVo;
         }else{
             UserPlanVo userPlanVo = generateSelfBo(bo);
+            if (bo.getStatus() != null && bo.getStatus() == 1) {
+                UserPlan userPlan = new UserPlan();
+                String s = JSON.toJSONString(userPlanVo.getCalendarStudyVo());
+                String s1 = JSON.toJSONString(userPlanVo);
+
+                userPlan.setStudyDay(bo.getStudyDay());
+                userPlan.setStudyCount(s1);
+                userPlan.setUserId(bo.getUserId());
+                userPlan.setSchedule(s);
+                userPlan.setExamDate(bo.getExamDate());
+                userPlan.setReminderTime(bo.getReminderTime());
+                userPlan.setPitchNum(userPlanVo.getPitchNum());
+                userPlan.setStudyNum(0L);
+                userPlan.setCreateTime(DateUtils.getNowTime());
+                userPlan.setUpdateTime(DateUtils.getNowTime());
+                userPlan.setStartTime(bo.getStartTime());
+                userPlan.setEndTime(bo.getEndTime());
+                userPlan.setStudyDay(bo.getStudyDay());
+                if (bo.getStatus() != null){
+                    userPlan.setStatus(bo.getStatus());
+                }
+                boolean save = this.save(userPlan);
+            }
             return userPlanVo;
         }
     }
 
+    @Override
+    public UserPlanVo userPlan(UserPlanQueryBo bo) {
+        return this.queryById(bo.getUserId());
+    }
+
     private UserPlanVo generateSelfBo(UserPlanQueryBo bo) throws ParseException {
 
 
         //获得当前课程最近一个考试计划  考生考生计划或者最近考试计划
         List<CoursePlanVo> coursePlanVo = baseMapper.selectByListCourse(bo);
 
-        UserPlanVo userPlanVo1 = new UserPlanVo();
+        UserPlanVo userPlanVo1 = null;
         for (CoursePlanVo planVo : coursePlanVo) {
             if (userPlanVo1 == null) {
                 userPlanVo1 = generateList(bo, planVo);