fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -105,10 +105,10 @@ public class OssServiceImpl implements OssService {
     public String generateRandomFilename(OssRequest ossRequest) {
         String prefixName = "";
         if(Validator.isNotEmpty(ossRequest.getUserId())&&ossRequest.getUserId().longValue()>0){
-            prefixName = prefixName + ossRequest.getUserId()+"/";
+            prefixName = prefixName + ossRequest.getUserId();
         }
         if(Validator.isNotEmpty(ossRequest.getGradeId())&&ossRequest.getGradeId().longValue()>0){
-            prefixName = prefixName + ossRequest.getGradeId()+"/";
+            prefixName = prefixName + "/" + ossRequest.getGradeId();
         }
         String RandomFilename = "";
         //生成随机数
@@ -124,28 +124,28 @@ public class OssServiceImpl implements OssService {
         RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
         switch(ossRequest.getImageStatus()){
             case 0 :
-                RandomFilename = "avatar"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "avatar"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 1 :
-                RandomFilename = "IDNumber"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDNumber"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 2 :
-                RandomFilename = "QuestionBank"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "QuestionBank"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 3 :
-                RandomFilename = "guide"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "guide"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 4 :
-                RandomFilename = "advertising"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "advertising"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 5 :
-                RandomFilename = "IDCard"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDCard"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 6 :
-                RandomFilename = "file"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "file"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
             case 7 :
-                RandomFilename = "certificate"+"/"+prefixName+sdf.format(new Date())+"/"+now;
+                RandomFilename = "certificate"+"/"+prefixName+(Validator.isNotEmpty(prefixName)?"":(sdf.format(new Date())+"/"+now));
                 break;
         }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -141,7 +141,10 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private Integer sort;
 	@ApiModelProperty("课程排序")
 	private Integer courseSort;
-
+	/** 节类型 1录播 2直播 3回放 */
+	@Excel(name = "节类型 1录播 2直播 3回放")
+	@ApiModelProperty("节类型 1录播 2直播 3回放")
+	private Integer sectionType;
 	/** 审核时间 */
 	@Excel(name = "审核照片")
 	@ApiModelProperty("审核照片")

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

@@ -548,7 +548,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         gradeUserTempQueryBo.setStatus(ClassGradeUserTemp.STATUS_LOCK);
         List<ClassGradeUserTempVo> list1 = iClassGradeUserTempService.queryList(gradeUserTempQueryBo);
         if(list1!=null&&list1.size()>0){
-            throw new CustomException("购买商品尚有订单未支付",510);
+            throw new CustomException("当前所购买商品，存在订单未支付",510);
         }
         return true;
     }
@@ -568,7 +568,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
         Long num1 = iOrderGoodsService.getBuyGoodsReadyPay(bo);
         if(num1.longValue()>0){
-            throw new CustomException("购买商品尚有订单未支付",510);
+            throw new CustomException("当前所购买商品，存在订单未支付",510);
         }
         return false;
     }

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

@@ -298,6 +298,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 UserStudyRecord update = BeanUtil.toBean(lastVo, UserStudyRecord.class);
                 update.setUpdateTime(DateUtils.getNowTime());
                 this.updateById(update);
+                add.setRecordId(update.getRecordId());
             }
         }else{
             this.save(add);
@@ -484,6 +485,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             section.setGoodsId(bo.getGoodsId());
             section.setGradeId(bo.getGradeId());
             section.setUserId(bo.getUserId());
+            section.setCourseId(bo.getCourseId());
             section.setStudyStatus(baseMapper.getStudyStatus(section));
         }
         return sectionList;

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

@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studyEndTime" column="study_end_time"/>
         <result property="durationTime" column="duration_time"/>
         <result property="courseSort" column="course_sort"/>
+        <result property="sectionType" column="section_type"/>
     </resultMap>
 
 
@@ -1066,7 +1067,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        1 as type
+        1 as type,
+        NULL as section_type
         FROM
         course_menu cm
         where 1=1
@@ -1079,7 +1081,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        2 as type
+        2 as type,
+        NULL as section_type
         FROM
         course_menu cm
         LEFT JOIN goods_course gc on gc.course_id = cm.course_id
@@ -1091,9 +1094,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
-        3 as type
+        3 as type,
+        cs.section_type
         FROM
         course_menu cm
+        LEFT JOIN course_section cs on cm.menu_id = cs.section_id
         where 1=1
         <if test="courseId != null and courseId !='' ">
             and cm.course_id=#{courseId}
@@ -1105,9 +1110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         ccs.sort,
         ccs.section_id AS id,
+        cs.section_type,
         3 AS type
         FROM
         course_chapter_section ccs
+        LEFT JOIN course_section cs on ccs.section_id = cs.section_id
         WHERE
         1 = 1
         <if test="chapterId != null and chapterId !='' ">