submit

zhichen-api/src/main/java/com/zhichen/controller/order/OrderController.java

@@ -285,4 +285,10 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("屏幕检测")
+    @GetMapping("/screen/check/{orderGoodsId}")
+    public AjaxResult<Boolean> screenCheck(@PathVariable("orderGoodsId") Long orderGoodsId) {
+        return AjaxResult.success(iOrderGoodsService.screenCheck(orderGoodsId));
+    }
+
 }

zhichen-system/src/main/java/com/zhichen/modules/course/domain/CourseBusiness.java

@@ -78,6 +78,8 @@ private static final long serialVersionUID=1L;
     private Integer reminderSign;
     /** 是否需要增强拍照标签：1开启 0关闭 */
     private Integer photoSign;
+    /** 开启屏幕检测：0否 1是 */
+    private Long screenCheckSign;
     private Long tenantId;
 
     @TableField(exist = false)

zhichen-system/src/main/java/com/zhichen/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -4090,41 +4090,41 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Override
     public Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo) {
         //查询旧系统是否有学习
-        String businessName = iGoodsService.getGoodsBusinessName(bo.getGoodsId());
-        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
-            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
-            if (ObjectUtils.isNotNull(orderGoods)){
-                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
-                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
-                        .eq(ClassGradeUser::getUserId, bo.getUserId())
-                        .eq(ClassGradeUser::getStatus, 1)
-                        .last("limit 1"));
-                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
-                    //重修
-                    return 0L;
-                }
-            }
-            User user = iUserService.getById(bo.getUserId());
-            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
-            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
-            String respone = "";
-            try {
-                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
-                JSONObject jsonObject1 = JSONObject.parseObject(respone);
-                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
-                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
-                    //旧系统正在学习中
-                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
-                }
-            } catch (Exception e) {
-                throw new CustomException(e.getMessage());
-            }
-            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
-            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
-                Goods goods = iGoodsService.getById(goodsIds.get(0));
-                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
-            }
-        }
+//        String businessName = iGoodsService.getGoodsBusinessName(bo.getGoodsId());
+//        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
+//            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
+//            if (ObjectUtils.isNotNull(orderGoods)){
+//                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
+//                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
+//                        .eq(ClassGradeUser::getUserId, bo.getUserId())
+//                        .eq(ClassGradeUser::getStatus, 1)
+//                        .last("limit 1"));
+//                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
+//                    //重修
+//                    return 0L;
+//                }
+//            }
+//            User user = iUserService.getById(bo.getUserId());
+//            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
+//            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
+//            String respone = "";
+//            try {
+//                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
+//                JSONObject jsonObject1 = JSONObject.parseObject(respone);
+//                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
+//                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
+//                    //旧系统正在学习中
+//                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
+//                }
+//            } catch (Exception e) {
+//                throw new CustomException(e.getMessage());
+//            }
+//            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
+//            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
+//                Goods goods = iGoodsService.getById(goodsIds.get(0));
+//                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+//            }
+//        }
         return 0L;
     }
 

zhichen-system/src/main/java/com/zhichen/modules/order/service/IOrderGoodsService.java

@@ -150,4 +150,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
     List<TopOldOrderRepDetailVo> listRepByOrderSn(TopOrderRepGoodsQueryBo queryBo);
 
     List<HandleStudyVo> getHandleStudyList(HandleStudyQuery query);
+
+    Boolean screenCheck(Long orderGoodsId);
 }

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

@@ -1005,6 +1005,18 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.getHandleStudyList(query);
     }
 
+    @Override
+    public Boolean screenCheck(Long orderGoodsId) {
+        OrderGoods orderGoods = getById(orderGoodsId);
+        if (ObjectUtils.isNull(orderGoods)){
+            throw new CustomException("订单信息获取有误！");
+        }
+        Goods goods = iGoodsService.getById(orderGoods.getGoodsId());
+        CourseBusiness courseBusiness = iCourseBusinessService.getById(goods.getBusinessId());
+
+        return courseBusiness.getScreenCheckSign() == 1;
+    }
+
     private boolean checkUnique(Long GoodsId,Long UserId) {
         ShoppingCart info = iShoppingCartService.getOne(new LambdaQueryWrapper<ShoppingCart>()
                 .eq(ShoppingCart::getUserId,UserId).eq(ShoppingCart::getGoodsId,GoodsId).last("limit 1"));