From 745320cbb4edfa4fbc8f0f95483a4ee7893d5769 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 22 四月 2021 20:18:08 +0800 Subject: [PATCH] 3.9.2完善 --- src/main/java/com/yeshi/buwan/controller/api/VideoInfoController.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/controller/api/VideoInfoController.java b/src/main/java/com/yeshi/buwan/controller/api/VideoInfoController.java index 15409f4..be5adc0 100644 --- a/src/main/java/com/yeshi/buwan/controller/api/VideoInfoController.java +++ b/src/main/java/com/yeshi/buwan/controller/api/VideoInfoController.java @@ -8,6 +8,7 @@ import com.yeshi.buwan.dto.order.PPTVVideoPrice; import com.yeshi.buwan.pptv.PPTVApiUtil; import com.yeshi.buwan.pptv.PPTVUtil; +import com.yeshi.buwan.pptv.entity.PPTVProgram; import com.yeshi.buwan.pptv.entity.PPTVSeries; import com.yeshi.buwan.service.inter.LoginUserService; import com.yeshi.buwan.service.inter.juhe.PPTVService; @@ -72,9 +73,9 @@ @RequestMapping("getPPVideoInfo") @ResponseBody - public String getPPVideoInfo(AcceptData acceptData, String loginUid, String infoId) { + public String getPPVideoInfo(AcceptData acceptData, String loginUid, String cid,String vid) { //鑾峰彇PPTV鐨勮棰戣鎯� - PPTVSeries series = pptvService.getSeriesDetail(infoId); + PPTVSeries series = pptvService.selectSeriesBySeriesCode(cid); if (series == null) { return JsonUtilV2.loadFalseJson("褰撳墠褰辩墖涓嶅瓨鍦�"); } @@ -82,13 +83,15 @@ return JsonUtilV2.loadFalseJson("褰撳墠褰辩墖宸蹭笅绾�"); } - if (series.getGoodsInfo() == null || StringUtil.isNullOrEmpty(series.getGoodsInfo().getGoodsNo())) { - PPTVSeries detail = PPTVApiUtil.getDetail(series.getSeriesCode()); + PPTVProgram pptvProgram=pptvService.selectProgramById(vid); + + if (pptvProgram.getGoodsInfo() == null || StringUtil.isNullOrEmpty(pptvProgram.getGoodsInfo().getGoodsNo())) { + PPTVSeries detail = PPTVApiUtil.getDetail(cid); series.setGoodsInfo(detail.getGoodsInfo()); - pptvService.updateSeriesGoodsInfo(series.getInfoID(), series.getGoodsInfo()); + pptvService.updateProgramGoodsInfo(series.getInfoID(), series.getGoodsInfo()); } - if (series.getGoodsInfo() == null || StringUtil.isNullOrEmpty(series.getGoodsInfo().getGoodsNo())) { + if (pptvProgram.getGoodsInfo() == null || StringUtil.isNullOrEmpty(pptvProgram.getGoodsInfo().getGoodsNo())) { return JsonUtilV2.loadFalseJson("褰撳墠褰辩墖涓嶈兘璐拱"); } @@ -111,8 +114,8 @@ videoInfo.setCategory(com.yeshi.buwan.util.StringUtil.join(typeSets, " ")); videoInfo.setActors(series.getActor()); videoInfo.setDirectors(series.getDirector()); - if (series.getSeries() != null && series.getSeries().size() > 0 && !StringUtil.isNullOrEmpty(series.getSeries().get(0).getDuration())) - videoInfo.setDuration(getDurationDesc(Integer.parseInt(series.getSeries().get(0).getDuration()))); + if (pptvProgram!=null && !StringUtil.isNullOrEmpty(pptvProgram.getDuration())) + videoInfo.setDuration(getDurationDesc(Integer.parseInt(pptvProgram.getDuration()))); videoInfo.setDesc(series.getDescription()); Gson gson = new GsonBuilder().create(); -- Gitblit v1.8.0