提交 3373545c authored 作者: zhouzhigang's avatar zhouzhigang

--no commit message

上级 6b546398
......@@ -27,11 +27,8 @@ import com.zrqx.core.client.sysuser.fg.FgSysuserClient;
import com.zrqx.core.client.vo.sysuser.FgCommentNumAndScoreVo;
import com.zrqx.core.commons.redis.Redis;
import com.zrqx.core.enums.AllResourceTypeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.util.response.CallBack;
import com.zrqx.resource.commons.form.bg.articlelibrary.SaveUpdateArticleLibraryForm;
import com.zrqx.resource.commons.form.fg.organmemberrecord.FgSaveOrganMemberRecordForm;
import com.zrqx.resource.commons.form.fg.videolibrary.FgVideoLookForm;
import com.zrqx.resource.commons.model.recommend.RecommendResource;
import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
import com.zrqx.resource.commons.vo.fg.marketing.FgPromotionInfoOneVO;
......@@ -43,7 +40,6 @@ import com.zrqx.resource.fg.service.organmemberrecord.FgOrganMemberRecordService
import com.zrqx.resource.fg.service.recommend.FgRecommendResourceService;
import com.zrqx.resource.fg.service.record.FgRecordService;
import com.zrqx.resource.fg.service.videolibrary.FgVideoLibraryService;
import com.zrqx.resource.fg.service.videolibrary.FgVideoLookLibraryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -83,7 +79,7 @@ public class FgVideoLibraryController {
@ApiOperation("根据id查找视频")
@GetMapping("/get/{oid}")
public CallBack<FgVideoLibraryVO> echo(String oid,String courseId) {
public CallBack<FgVideoLibraryVO> echo(@PathVariable String oid) {
FgVideoLibraryVO vo = service.selectById(oid,true);
//查看促销活动,修改成活动价格
FgPromotionInfoOneVO info = promotionService.getInfoByResId(vo.getId(), AllResourceTypeEnum.VIDEO.getCode());
......@@ -128,7 +124,7 @@ public class FgVideoLibraryController {
}else {
vo.setIsBuy(0);
}
vo.setTimeSpeed(fgResourceManage.getSpeed(courseId, oid, AllResourceTypeEnum.VIDEO.getCode(), redis.getMemberW().getId()));
//vo.setTimeSpeed(fgResourceManage.getSpeed(courseId, oid, AllResourceTypeEnum.VIDEO.getCode(), redis.getMemberW().getId()));
return CallBack.success(vo);
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论