submit

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

@@ -285,4 +285,10 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("校验是否可以购买")
+    @GetMapping("/check/buy/{goodsId}")
+    public AjaxResult<Boolean> checkBuyGoods(@PathVariable("goodsId") Long goodsId) {
+        return AjaxResult.success(iOrderGoodsService.checkBuyGoods(goodsId));
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/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 Integer buySign;
     private Long tenantId;
 
     @TableField(exist = false)

zhongzheng-system/src/main/java/com/zhongzheng/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 checkBuyGoods(Long goodsId);
 }

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

@@ -635,11 +635,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             }
             goodsVo.setSecAllNum(secLong);
             goodsVo.setStuAllNum(studyLong);
-            if(goodsVo.getStudyStatus()>0){
-                goodsVo.setStudyStatus(2);
-            }else{
-                goodsVo.setStudyStatus(1);
-            }
+//            if(goodsVo.getStudyStatus()>0){
+//                goodsVo.setStudyStatus(2);
+//            }else{
+//                goodsVo.setStudyStatus(1);
+//            }
             if(goodsVo.getGoodsType()==1){
                 //视频商品
                 //获得当前所在班级
@@ -1005,6 +1005,18 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.getHandleStudyList(query);
     }
 
+    @Override
+    public boolean checkBuyGoods(Long goodsId) {
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        if (!"867735392558919680".equals(tenantId)){
+            //只有学校的才校验
+            return true;
+        }
+        Goods g = iGoodsService.getById(goodsId);
+        CourseBusiness business = iCourseBusinessService.getById(g.getBusinessId());
+        return business.getBuySign() == 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"));

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -239,4 +239,6 @@ private static final long serialVersionUID=1L;
     private String passwordAes;
 
     private Integer detectLiveSign;
+
+    private Integer fastForwardSign;
 }

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

@@ -387,9 +387,10 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             throw new CustomException("订单数据错误");
         }
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        User user = iUserService.getById(bo.getUserId());
         //校验是否有快进
         SysTenant tenant = iSysTenantService.getById(Long.valueOf(tenantId));
-        if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1){
+        if (ObjectUtils.isNotNull(tenant) && tenant.getFastForwardSign() == 1 && user.getFastForwardSign() == 1){
             checkFastForward(bo);
         }
         /*GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
@@ -1822,7 +1823,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         return iUserPeriodService.updateById(period);
     }
 
-
     /**
      * 获取最后一次看完的节
      * @param bo