Merge branch 'pre' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConsoleQueryBo.java

@@ -95,5 +95,7 @@ public class ConsoleQueryBo extends BaseEntity {
 
 	/** 考试登记状态 0 待登记 1正常 2缺考 3作弊 4替考 */
 	private Integer examStatus;
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -203,6 +203,8 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         update.setCurrentStatus(2L);
         update.setUpdateTime(DateUtils.getNowTime());
         this.updateById(update);
+        //同步身份证到用户信息
+        getUserPicInfo(addProfile);
         return this.save(addProfile);
     }
 
@@ -467,7 +469,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
             //审核通过同步身份证到用户信息
         }
         //审核承诺书发送消息
-        sendAuiditSMS(update);
+    //    sendAuiditSMS(update);
 
         return this.updateById(update);
     }
@@ -479,24 +481,32 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         String keyValue = bo.getKeyValue();
         if (Validator.isNotEmpty(keyValue)) {
             Map<String, String> maps = JSONObject.parseObject(keyValue, Map.class);
-            String recent_photos, idcard_face_photo, idcard_national_photo,work_unit = null;
+            String recent_photos, idcard_face_photo, idcard_national_photo,work_unit;
             LambdaUpdateWrapper<User> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
             objectLambdaUpdateWrapper.eq(User::getUserId, bo.getUserId());
             if (maps.containsKey("recent_photos")) {
                 recent_photos = JSONObject.parseObject(String.valueOf(maps.get("recent_photos")), UserProfileFit.class).getValue();
-                objectLambdaUpdateWrapper.set(User::getOneInchPhotos, recent_photos);
+                if(Validator.isNotEmpty(recent_photos)){
+                    objectLambdaUpdateWrapper.set(User::getOneInchPhotos, recent_photos);
+                }
             }
             if (maps.containsKey("idcard_face_photo")) {
                 idcard_face_photo = JSONObject.parseObject(String.valueOf(maps.get("idcard_face_photo")), UserProfileFit.class).getValue();
-                objectLambdaUpdateWrapper.set(User::getIdCardImg1, idcard_face_photo);
+                if(Validator.isNotEmpty(idcard_face_photo)){
+                    objectLambdaUpdateWrapper.set(User::getIdCardImg1, idcard_face_photo);
+                }
             }
             if (maps.containsKey("idcard_national_photo")) {
                 idcard_national_photo = JSONObject.parseObject(String.valueOf(maps.get("idcard_national_photo")), UserProfileFit.class).getValue();
-                objectLambdaUpdateWrapper.set(User::getIdCardImg2, idcard_national_photo);
+                if(Validator.isNotEmpty(idcard_national_photo)){
+                    objectLambdaUpdateWrapper.set(User::getIdCardImg2, idcard_national_photo);
+                }
             }
             if (maps.containsKey("work_unit")) {
                 work_unit = JSONObject.parseObject(String.valueOf(maps.get("work_unit")), UserProfileFit.class).getValue();
-                objectLambdaUpdateWrapper.set(User::getCompanyName, work_unit);
+                if(Validator.isNotEmpty(work_unit)){
+                    objectLambdaUpdateWrapper.set(User::getCompanyName, work_unit);
+                }
             }
             objectLambdaUpdateWrapper.set(User::getUpdateTime, DateUtils.getNowTime());
             iUserService.update(null, objectLambdaUpdateWrapper);

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

@@ -142,6 +142,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         GoodsVo goodsVo =  iGoodsService.queryById(bo.getGoodsId());
         CourseAddBo addBo = new CourseAddBo();
         addBo.setCourseName(goodsVo.getGoodsName());
+        addBo.setStatus(1);
         addBo.setEducationTypeId(goodsVo.getEducationTypeId());
         addBo.setProjectId(goodsVo.getProjectId());
         addBo.setBusinessId(goodsVo.getBusinessId());
@@ -149,7 +150,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         GoodsCourseAddBo courseAddBo = new GoodsCourseAddBo();
         courseAddBo.setCourseId(courseId);
         courseAddBo.setGoodsId(bo.getGoodsId());
-        courseAddBo.setShow(0); //隐藏课程
+        courseAddBo.setCourseShow(0); //隐藏课程
         courseAddBo.setSort(0);
         iGoodsCourseService.insertByAddBo(courseAddBo); //绑定商品和节
         boolean result = false;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseMenuVo.java

@@ -72,6 +72,10 @@ public class CourseMenuVo {
 	private Integer examType;
 	@ApiModelProperty("赠送卷名称")
 	private String freeExamName;
+	@ApiModelProperty("编码")
+	private String code;
+	@ApiModelProperty("发布状态")
+	private Long publishStatus;
 	/** 章模块关系 */
 	@Excel(name = "章模块关系")
 	@ApiModelProperty("章模块关系")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseVo.java

@@ -112,4 +112,7 @@ public class CourseVo {
 	private Long updateTime;
 	@ApiModelProperty("商品列表")
 	private List<CourseGoodsVo> goodsList;
+	/** 1显示 0隐藏 */
+	@ApiModelProperty("1显示 0隐藏")
+	private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.goods.bo;
 
+import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -122,8 +123,10 @@ public class GoodsAddBo {
     @ApiModelProperty("试卷拍照设置")
     private GoodsPhotoExamConfigAddBo goodsPhotographExamConfig;
     @ApiModelProperty("讲义id")
-
     private Long handoutsId;
+    /** 菜单列表 */
+    @ApiModelProperty("模块章菜单列表")
+    private List<CourseMenuAddBo> menuList;
 
     /** 补考或前培开始时间 */
     @ApiModelProperty("补考或前培开始时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseAddBo.java

@@ -29,5 +29,5 @@ public class GoodsCourseAddBo {
     private Integer sort;
     /** 1显示 0隐藏 */
     @ApiModelProperty("1显示 0隐藏")
-    private Integer show;
+    private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseEditBo.java

@@ -35,5 +35,5 @@ public class GoodsCourseEditBo {
 
     /** 1显示 0隐藏 */
     @ApiModelProperty("1显示 0隐藏")
-    private Integer show;
+    private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseQueryBo.java

@@ -49,5 +49,5 @@ public class GoodsCourseQueryBo extends BaseEntity {
 
 	/** 1显示 0隐藏 */
 	@ApiModelProperty("1显示 0隐藏")
-	private Integer show;
+	private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.goods.bo;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -139,6 +140,13 @@ public class GoodsEditBo {
     @ApiModelProperty("试听列表")
     private List<GoodsAuditionConfigEditBo> auditionList;
 
+    /** 菜单列表 */
+    @ApiModelProperty("模块章菜单列表")
+    private List<CourseMenuAddBo> menuList;
+
+    @ApiModelProperty("隐藏绑定的课程ID")
+    private Long courseId;
+
     /** 播放设置 */
     @ApiModelProperty("播放设置")
     private GoodsPlayConfigAddBo playConfig;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsCourse.java

@@ -34,5 +34,5 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
     /** 1显示 0隐藏 */
-    private Integer show;
+    private Integer courseShow;
 }

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

@@ -11,6 +11,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.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
@@ -217,7 +218,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         }
         boolean result = this.save(add);
         //课程列表
-        if(bo.getCourseList()!=null){
+        if(bo.getCourseList()!=null&&bo.getCourseList().size()>0){
             Collection<GoodsCourse> coll = new HashSet<>();
             for(int i=0;i<bo.getCourseList().size();i++){
                 GoodsCourseAddBo item = bo.getCourseList().get(i);
@@ -229,7 +230,13 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
             iGoodsCourseService.saveBatch(coll);
         }
-
+        //模块章列表
+        if(bo.getMenuList()!=null&&bo.getMenuList().size()>0){
+            CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+            menuListAddBo.setGoodsId(add.getGoodsId());
+            menuListAddBo.setMenuList(bo.getMenuList());
+            iCourseMenuService.insertByGoodsAddBo(menuListAddBo);
+        }
         return result;
     }
 
@@ -312,7 +319,13 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(bo.getGoodsPhotographExamConfig()!=null){
             update.setGoodsPhotoExamConfig(JSON.toJSONString(bo.getGoodsPhotographExamConfig()));
         }
-
+        //模块章列表
+        if(bo.getMenuList()!=null&&bo.getMenuList().size()>0){
+            CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+            menuListAddBo.setCourseId(bo.getCourseId());
+            menuListAddBo.setMenuList(bo.getMenuList());
+            iCourseMenuService.updateByEditBo(menuListAddBo);
+        }
         return this.updateById(update);
     }
 

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

@@ -40,5 +40,5 @@ public class GoodsCourseVo {
 	/** 1显示 0隐藏 */
 	@Excel(name = "1显示 0隐藏")
 	@ApiModelProperty("1显示 0隐藏")
-	private Integer show;
+	private Integer courseShow;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -9,6 +9,7 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.bank.mapper.QuestionMapper;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.course.domain.CourseModule;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -38,6 +39,7 @@ import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,6 +92,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private IUserSubscribeService iUserSubscribeService;
+
 
     @Override
     public OrderGoodsVo queryById(Long orderGoodsId) {
@@ -161,6 +166,12 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         if(bo.getStatus()==0){
             GoodsVo goodsVo = iGoodsService.selectDetail(orderGoods.getGoodsId());
             if(goodsVo.getGoodsType()==1){
+                ConsoleQueryBo consoleQueryBo = new ConsoleQueryBo();
+                consoleQueryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
+                Integer usNum = iUserSubscribeService.getConsoleTestSubscribeNum(consoleQueryBo);
+                if(usNum>0){
+                    throw new CustomException("已预约了考试，不符合关闭条件");
+                }
                 //视频商品
                 LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
                 objectLambdaUpdateWrapper.eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId());
@@ -179,7 +190,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 UserExamGoodsQueryBo examGoodsQueryBo = new UserExamGoodsQueryBo();
                 examGoodsQueryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
                 if(!iUserExamGoodsService.canRefund(examGoodsQueryBo)){
-                    throw new CustomException("补考次数/前培次数已经被使用，不符号关闭条件");
+                    throw new CustomException("补考次数/前培次数已经被使用，不符合关闭条件");
                 }
                 //减去考试和前培次数
                 UserExamGoodsQueryBo examGoodsQueryBo1 = new UserExamGoodsQueryBo();

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN goods g ON up.goods_id = g.goods_id
         WHERE 1=1
         and up.type_status = 1
+        and up.current_status = 1
         <if test="periodStatus != null">
             and up.`status` = #{periodStatus}
         </if>

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

@@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examType" column="exam_type"/>
         <result property="freeExamId" column="free_exam_id"/>
         <result property="freeExamName" column="free_exam_name"/>
+        <result property="code" column="code"/>
+        <result property="publishStatus" column="publish_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseUserMenuVo" id="CourseUserMenuVo">
@@ -58,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             m.*,
             CASE
-
                 WHEN m.type = 1 THEN
                     cm.module_name
                 WHEN m.type = 2 THEN
@@ -67,6 +68,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     cs.`name`
                 END menu_name,
             CASE
+                WHEN m.type = 1 THEN
+                cm.publish_status
+                WHEN m.type = 2 THEN
+                cc.publish_status
+                WHEN m.type = 3 THEN
+                cs.publish_status
+                END publish_status,
+            CASE
+                WHEN m.type = 1 THEN
+                cm.code
+                WHEN m.type = 2 THEN
+                cc.code
+                WHEN m.type = 3 THEN
+                cs.code
+                END code,
+            CASE
 
                 WHEN m.type = 1 THEN
                     0

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

@@ -246,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and us.user_id = #{userId}
           and us.result = 1
           and us.goods_id = #{goodsId}
+          and us.order_goods_id = #{orderGoodsId}
     </select>
 
     <select id="countApplySubscribe" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="integer">
@@ -256,6 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             1 =1
           and us.subscribe_status = 1
+
           and us.apply_id = #{applyId}
     </select>
 
@@ -270,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and us.exam_status = 0
           and subscribe_status = 1
           and us.goods_id = #{goodsId}
+          and us.order_goods_id = #{orderGoodsId}
     </select>
     <select id="selectExamUserApplyVo" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultMap="ExamUserApplyVo">
         SELECT

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="courseId" column="course_id"/>
         <result property="sort" column="sort"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsCourseVo" id="GoodsCourseVoResult">
@@ -17,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
         <result property="sort" column="sort"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseVo" id="CourseResultVo">
@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="categoryName" column="category_name"/>
         <result property="subjectName" column="subject_name"/>
         <result property="sort" column="g_sort"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
 
@@ -69,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.school_name,
         m.category_name,
         cs.subject_name,
-               gc.sort as g_sort
+               gc.sort as g_sort,
+        gc.course_show
         FROM
         goods_course gc
         LEFT JOIN course c ON gc.course_id = c.course_id

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN `order` o ON o.order_sn = og.order_sn
         WHERE
             1 = 1
+          and o.status = 1
             <if test="refundStatusList != null and refundStatusList.size()!=0 ">
                 AND og.refund_status in
                 <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">

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

@@ -323,6 +323,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN goods g ON us.goods_id = g.goods_id
         WHERE
         1=1
+        <if test="orderGoodsId != null">
+            AND us.order_goods_id = #{orderGoodsId}
+        </if>
         <if test="businessId != null">
             AND g.business_id = #{businessId}
         </if>