我的消息

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/SaticScheduleTask.java

@@ -1,19 +1,26 @@
 package com.zhongzheng.controller.grade;
 
+import com.zhongzheng.modules.inform.domain.Inform;
+import com.zhongzheng.modules.inform.service.IInformService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 public class SaticScheduleTask {
+
+    @Autowired
+    private IInformService informService;
     //3.添加定时任务
     //@Scheduled(cron = "0/2 * * * * ?")
     //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
+    @Scheduled(fixedRate=5000)
     private void configureTasks() {
-        System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
+        //List<Inform> informs = informService.selectTasks();
     }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonGoodsController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @author hjl
  * @date 2021-10-12
  */
-@Api(value = "商品控制器", tags = {"商品管理"})
+@Api(value = "游客商品管理", tags = {"游客商品管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/app/common/goods")

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CoursePeriodController.java

@@ -89,6 +89,8 @@ public class CoursePeriodController extends BaseController {
     @Log(title = "确认重学", businessType = BusinessType.UPDATE)
     @PostMapping("rebuild")
     public AjaxResult<Void> editRebuild(@RequestBody ClassGradeUserQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(courseService.editRebuild(bo) ? 1 : 0);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -5,12 +5,16 @@ 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.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.goods.bo.*;
 import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsAuditionConfigService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
@@ -39,19 +43,21 @@ public class GoodsController extends BaseController {
 
     private final IGoodsAttachedService iGoodsAttachedService;
 
-
+    private final WxTokenService wxTokenService;
 
 
     /**
      * 获取商品详细信息
      */
-    @ApiOperation("获取题库商品错题和收集题数")
+    @ApiOperation("获取商品详细信息")
     @GetMapping("/{goodsId}")
-    public AjaxResult<GoodsVo> getBankGoodsNum(@PathVariable("goodsId" ) Long goodsId) {
-        return AjaxResult.success(iGoodsService.selectDetail(goodsId));
+    public AjaxResult<GoodsVo> getInfo(@PathVariable("goodsId" ) Long goodsId) {
+        CourseQueryBo bo = new CourseQueryBo();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        bo.setGoodsId(goodsId);
+        return AjaxResult.success(iGoodsService.selectUserDetail(bo));
     }
 
 
-
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMapper.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.course.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseUserVo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseService.java

@@ -4,6 +4,7 @@ package com.zhongzheng.modules.course.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
 import com.zhongzheng.modules.course.bo.CourseEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseUserVo;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -193,7 +193,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                 }
             }
         }
-        if (bo.getRebuild() == 1) {
+        if (bo.getRebuild() != null && bo.getRebuild() == 1) {
             List<CourseUserMenuVo> courseMenuVoss = courseMenuVos.stream().filter(s -> s.getRebuild().equals("1")).collect(Collectors.toList());
             return courseMenuVoss;
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -10,6 +10,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.domain.Question;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
 import com.zhongzheng.modules.course.bo.CourseEditBo;
+import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.mapper.CourseMapper;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -22,4 +22,6 @@ public interface GoodsMapper extends BaseMapper<Goods> {
     GoodsVo selectDetail(Long goodsId);
 
     List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);
+
+    GoodsVo selectUserDetail(CourseQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
 import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
 import com.zhongzheng.modules.goods.bo.*;
@@ -67,4 +68,6 @@ public interface IGoodsService extends IService<Goods> {
 	boolean updateFrontByEditBo(GoodsEditBo bo);
 
 	List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);
+
+	GoodsVo selectUserDetail(CourseQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -7,6 +7,7 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
+import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
 import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
 import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
@@ -342,4 +343,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
         return baseMapper.listGoods(bo);
     }
+
+    @Override
+    public GoodsVo selectUserDetail(CourseQueryBo bo) {
+        GoodsVo goodsVo = goodsMapper.selectUserDetail(bo);
+        return goodsVo;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -71,6 +71,11 @@ public class GoodsVo {
 	@Excel(name = "状态 1有效 0无效")
 	@ApiModelProperty("状态 1有效 0无效")
 	private Integer status;
+
+	/** 班级*/
+	@Excel(name = "班级")
+	@ApiModelProperty("班级")
+	private Long gradeId;
 	/** 有效期开始 */
 	@Excel(name = "有效期开始")
 	@ApiModelProperty("有效期开始")

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

@@ -302,7 +302,7 @@
             course_id = #{id}
     </select>
 
-    <select id="getCourseUserVoInfo" parameterType="Long"  resultMap="CourseUserVo">
+    <select id="getCourseUserVoInfo" parameterType="com.zhongzheng.modules.course.bo.CourseMenuQueryBo"  resultMap="CourseUserVo">
         SELECT
             c.*,
             cet.education_name,

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

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY m.sort
     </select>
 
-    <select id="rebuildCheck" parameterType="map"  resultType="long">
+    <select id="rebuildCheck" parameterType="map"  resultType="Integer">
         SELECT
             COUNT(up.id)
         FROM
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
 
-    <select id="rebuildChapterCheck" parameterType="map"  resultType="long">
+    <select id="rebuildChapterCheck" parameterType="map"  resultType="Integer">
         SELECT
             COUNT(up.id)
         FROM
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
 
-    <select id="rebuildModuleCheck" parameterType="map"  resultType="long">
+    <select id="rebuildModuleCheck" parameterType="map"  resultType="Integer">
         SELECT
             COUNT(up.id)
         FROM

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year" column="year"/>
         <result property="supplyId" column="supply_id"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="gradeId" column="grade_id"/>
         <result property="educationTypeId" column="education_type_id"/>
         <result property="businessId" column="business_id"/>
         <result property="schoolId" column="school_id"/>
@@ -256,4 +257,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and g.goods_status = #{goodsStatus}
         </if>
     </select>
+
+    <select id="selectUserDetail" parameterType="map" resultMap="GoodsResultVo">
+        SELECT
+            g.*,
+            ps.supply_name,
+            cet.education_name,
+            cpt.project_name,
+            cb.business_name,
+            s.school_name,
+            m.category_name,
+            ot.type AS template_type,
+            (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
+            (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code,
+            (SELECT cg.grade_id FROM class_grade_user cgu LEFT JOIN class_grade_goods cgg on cgg.grade_id = cgu.grade_id LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
+            where cgu.user_id = #{userId} and cgg.goods_id=g.goods_id and cg.`status` =1 and unix_timestamp(now()) BETWEEN cg.class_start_time and cg.class_end_time)  as grade_id
+        FROM
+            goods g
+                LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
+                LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+                LEFT JOIN course_business cb ON g.business_id = cb.id
+                LEFT JOIN school s ON s.id = g.school_id
+                LEFT JOIN major m ON g.major_id = m.id
+                LEFT JOIN order_input_template ot ON cb.template_status = ot.id
+        WHERE
+            g.goods_id = #{goodsId}
+    </select>
 </mapper>