fix 导入预约考试

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

@@ -162,5 +162,7 @@ public class ClassGradeVo {
 	@Excel(name = "是否学时推送 0未推送 1推送")
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	private Integer periodPlush;
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 
 }

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

@@ -179,6 +179,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
     public String insertByAddBoImport(UserSubscribeAddBo bo) throws ParseException {
         UserSubscribe add = BeanUtil.toBean(bo, UserSubscribe.class);
+        if(Validator.isEmpty(add.getOrderGoodsId())){
+            throw new CustomException("缺失订单商品ID");
+        }
         //判断当前时间是否超过了选择时间
         Date date = new Date();
         Long times = add.getApplySiteExamTime()*1000;//时间戳
@@ -205,6 +208,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Override
     public Long insertByAddBo(UserSubscribeAddBo bo) throws ParseException {
         UserSubscribe add = BeanUtil.toBean(bo, UserSubscribe.class);
+        if(Validator.isEmpty(add.getOrderGoodsId())){
+            throw new CustomException("缺失订单商品ID");
+        }
         //判断当前时间是否超过了选择时间
         Date date = new Date();
         Long times = add.getApplySiteExamTime()*1000;//时间戳
@@ -722,6 +728,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            userSubscribeAddBo.setOrderGoodsId(classGradeVo.getOrderGoodsId());
             //查询剩余考试次数
             ExamApplyQueryBo examApplyQueryBo = new ExamApplyQueryBo();
             examApplyQueryBo.setUserId(userId);
@@ -947,6 +954,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+            userSubscribeAddBo.setOrderGoodsId(classGradeVo.getOrderGoodsId());
+            
             //查询剩余考试次数
             ExamApplyQueryBo examApplyQueryBo = new ExamApplyQueryBo();
             examApplyQueryBo.setUserId(userId);

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

@@ -220,6 +220,7 @@
         <result property="learnStatus" column="learn_status"/>
         <result property="officialStatus" column="official_status"/>
         <result property="periodPlush" column="period_plush"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
 
@@ -584,7 +585,8 @@
             cg.official_learning_url,
             cg.interface_push_id,
             cgu.official_status,
-            cgu.period_plush
+            cgu.period_plush,
+            cgu.order_goods_id
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id