学习计划

zhongzheng-api/src/main/java/com/zhongzheng/controller/plan/UserPlanController.java

@@ -7,6 +7,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.*;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -108,13 +109,13 @@ public class UserPlanController extends BaseController {
     /**
      * 查询学习计划列表
      */
-    @ApiOperation("查询学员能生成学习计划的商品")
+    @ApiOperation("查询学员拥有商品能生成学习计划的商品")
     @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/listGoods")
-    public TableDataInfo<CourseVo> listCourse(UserPlanQueryBo bo) {
+    public TableDataInfo<GoodsVo> listGoods(UserPlanQueryBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
-        List<CourseVo> list = iUserPlanService.listCourse(bo);
+        List<GoodsVo> list = iUserPlanService.listGoods(bo);
         return getDataTable(list);
     }
 }

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

@@ -74,7 +74,7 @@ public class UserPlanEditBo {
 
     /** 生成计划的课程 */
     @ApiModelProperty("生成计划的课程")
-    private Long[] courseId;
+    private Long[] goodsId;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserPlanMapper.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.mapper;
 
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.user.bo.UserPlanEditBo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 import com.zhongzheng.modules.user.domain.UserPlan;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 public interface UserPlanMapper extends BaseMapper<UserPlan> {
 
-    Integer selectCountCourse(UserPlanEditBo bo);
+    List<GoodsVo> listGoods(UserPlanQueryBo bo);
 
-    List<CourseVo> listCourse(UserPlanQueryBo bo);
+    Integer selectCountGoods(UserPlanEditBo bo);
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.service;
 
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.user.domain.UserPlan;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
@@ -53,5 +54,5 @@ public interface IUserPlanService extends IService<UserPlan> {
 
     UserPlanVo listPlan(UserPlanEditBo bo);
 
-	List<CourseVo> listCourse(UserPlanQueryBo bo);
+	List<GoodsVo> listGoods(UserPlanQueryBo bo);
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -118,10 +119,11 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     }
 
     @Override
-    public List<CourseVo> listCourse(UserPlanQueryBo bo) {
-        return baseMapper.listCourse(bo);
+    public List<GoodsVo> listGoods(UserPlanQueryBo bo) {
+        return baseMapper.listGoods(bo);
     }
 
+
     /**
      * 保存前的数据校验
      *
@@ -129,9 +131,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
      */
     private void validEntityPlanBeforeSave(UserPlanEditBo bo){
         //判断是否课程已被生成过课程
-        Integer rank = baseMapper.selectCountCourse(bo);
+        Integer rank = baseMapper.selectCountGoods(bo);
         if (rank > 0){
-            throw new IllegalArgumentException("您当前有课程的计划，请到计划修改上修改计划");
+            throw new IllegalArgumentException("您当前商品的拥有计划，请到计划修改上修改计划");
         }
 
     }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSubjectMapper.xml

@@ -76,10 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <if test="educationId != null and educationId!=0 ">
-            and (SELECT COUNT(p.id) FROM course_subject_project t LEFT JOIN course_project_type p on t.project_id = p.id where p.education_id = #{educationId} ) > 0
+            and (SELECT COUNT(p.id) FROM course_subject_project t LEFT JOIN course_project_type p on t.project_id = p.id where p.education_id = #{educationId} AND t.subject_id = s.id ) > 0
         </if>
         <if test="projectId != null and projectId!=0 ">
-            and (SELECT COUNT(t.id) FROM course_subject_project t  where t.project_id = #{projectId}) > 0
+            and (SELECT COUNT(t.id) FROM course_subject_project t  where t.project_id = #{projectId} AND t.subject_id = s.id) > 0
         </if>
         <if test="subjectName != null and subjectName!='' ">
             AND s.subject_name = #{subjectName}

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamApplyVo" id="ExamApplyVo">
-        <result property="applyId" column="exam_apply_id"/>
+        <result property="applyId" column="apply_id"/>
         <result property="applyUrl" column="apply_url"/>
         <result property="applyName" column="apply_name"/>
         <result property="applyIntroduce" column="apply_introduce"/>

zhongzheng-system/src/main/resources/mapper/modules/user/UserPlanMapper.xml

@@ -21,18 +21,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyNum" column="study_num"/>
     </resultMap>
 
-    <select id="selectCountCourse" parameterType="com.zhongzheng.modules.user.bo.UserPlanEditBo"  resultType="int">
-        SELECT COUNT(c.source_id)
-        FROM user_plan_cource c LEFT JOIN user_plan u ON u.plan_id = c.plan_id
-        WHERE 1=1 and u.status=1
-        <if test="courseId != null and courseId !=''">
-            and c.source_id in
-            <foreach collection="courseId" open="(" separator="," close=")" item="courseId">
-                #{courseId}
-            </foreach>
-        </if>
-        <if test="userId != null and userId !=''">
-            and u.user_id = #{userId}
-        </if>
+    <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
+        <result property="goodsId" column="goods_id"/>
+        <result property="year" column="year"/>
+        <result property="supplyId" column="supply_id"/>
+        <result property="goodsType" column="goods_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="lowestPrice" column="lowest_price"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="validityStartTime" column="validity_start_time"/>
+        <result property="validityEndTime" column="validity_end_time"/>
+        <result property="studyStartTime" column="study_start_time"/>
+        <result property="studyEndTime" column="study_end_time"/>
+        <result property="certificateIds" column="certificate_ids"/>
+        <result property="introduce" column="introduce"/>
+        <result property="suitableObject" column="suitable_object"/>
+        <result property="buyNote" column="buy_note"/>
+        <result property="pcDetailHtml" column="pc_detail_html"/>
+        <result property="mobileDetailHtml" column="mobile_detail_html"/>
+        <result property="goodsStatus" column="goods_status"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="classHours" column="class_hours"/>
+        <result property="standPriceJson" column="stand_price_json"/>
+        <result property="code" column="code"/>
+        <result property="projectId" column="project_id"/>
+        <result property="goodsAuditionConfig" column="goods_audition_config"/>
+        <result property="goodsPhotographConfig" column="goods_photograph_config"/>
+        <result property="goodsAuditionExamConfig" column="goods_audition_exam_config"/>
+        <result property="goodsPlayConfig" column="goods_play_config"/>
+        <result property="goodsExamConfig" column="goods_exam_config"/>
+
+        <result property="supplyName" column="supply_name"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="handoutsId" column="handouts_id"/>
+        <result property="templateType" column="template_type"/>
+        <result property="period" column="period"/>
+        <result property="makeStartTime" column="make_start_time"/>
+        <result property="makeEndTime" column="make_end_time"/>
+        <result property="studyCount" column="study_count"/>
+        <result property="makeGoodsName" column="make_goods_name"/>
+        <result property="makeGoodsCode" column="make_goods_code"/>
+    </resultMap>
+
+
+
+    <select id="listGoods" parameterType="com.zhongzheng.modules.user.bo.UserPlanQueryBo"  resultMap="GoodsResultVo">
+        SELECT
+            g.*
+        FROM
+            goods g
+                LEFT JOIN order_goods og ON g.goods_id = og.goods_id
+                LEFT JOIN `order` o ON o.order_sn = og.order_sn
+        WHERE
+            o.user_id = #{userId}
+          AND og.refund_status in (0,3)
+          and og.`status`= 1
+          and og.pay_status in(2,3)
+          and g.goods_type =1
     </select>
 </mapper>