diff --git a/src/main/java/vvpkassistant/pk/controller/PkController.java b/src/main/java/vvpkassistant/pk/controller/PkController.java index 617d644..f912e55 100644 --- a/src/main/java/vvpkassistant/pk/controller/PkController.java +++ b/src/main/java/vvpkassistant/pk/controller/PkController.java @@ -80,42 +80,7 @@ public class PkController { //pk文章详情 @PostMapping("pkInfoDetail") public ResponseData pkInfoDetail(@RequestBody Map map) { - Integer id = map.get("id"); - Integer userId = map.get("userId"); - Integer from = map.get("from"); // 1 首页 2 聊天 - - PkInfoModel pkInfoModel = pkDao.selectById(id); - if (pkInfoModel == null) { - return ResponseData.error(ResponseInfo.ERROR.getCode(),"该信息不存在"); - } - - if (from == 1) { - if (pkInfoModel.getPkTime() > VVTools.currentTimeStamp()) { - // 判断是否是自己发布的数据 如果不是,就隐藏主播id - if (pkInfoModel.getSenderId().equals(userId)) { - pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); - } else { - // 查询是否存在未完成的pk记录 - Integer isHave = pkDao.checkIfUnfinishedPKExistsWithAnchor(userId, pkInfoModel.getAnchorId()); - if (isHave > 0) { - pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); - }else { - pkInfoModel.setDisPlayId(VVTools.replaceChar(pkInfoModel.getAnchorId(), '*')); - } - } - return ResponseData.success(pkInfoModel); - }else { - return ResponseData.error(ResponseInfo.ERROR.getCode(),"当前信息已无效"); - } - }else{ - Integer isHave = pkDao.checkIfUnfinishedPKExistsWithAnchor(userId, pkInfoModel.getAnchorId()); - if (isHave > 0) { - pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); - }else { - pkInfoModel.setDisPlayId(VVTools.replaceChar(pkInfoModel.getAnchorId(), '*')); - } - return ResponseData.success(pkInfoModel); - } + return ResponseData.success(pkService.pkInfoDetail(map)); } //删除自己的pk数据 (单个) diff --git a/src/main/java/vvpkassistant/pk/service/PKService.java b/src/main/java/vvpkassistant/pk/service/PKService.java index d10cc07..0066f77 100644 --- a/src/main/java/vvpkassistant/pk/service/PKService.java +++ b/src/main/java/vvpkassistant/pk/service/PKService.java @@ -19,4 +19,6 @@ public interface PKService extends IService { PkRecord createPKRecord(PkRecord record); List getPKList(Map map); + + PkInfoModel pkInfoDetail(Map map); } diff --git a/src/main/java/vvpkassistant/pk/service/PKServiceImpl.java b/src/main/java/vvpkassistant/pk/service/PKServiceImpl.java index b57ba20..83b2674 100644 --- a/src/main/java/vvpkassistant/pk/service/PKServiceImpl.java +++ b/src/main/java/vvpkassistant/pk/service/PKServiceImpl.java @@ -200,4 +200,44 @@ public class PKServiceImpl extends ServiceImpl implement } return pkModels; } + + @Override + public PkInfoModel pkInfoDetail(Map map) { + Integer id = map.get("id"); + Integer userId = map.get("userId"); + Integer from = map.get("from"); // 1 首页 2 聊天 + + PkInfoModel pkInfoModel = pkInfoDao.selectById(id); + if (pkInfoModel == null) { + throw new BusinessException(ErrorCode.SYSTEM_ERROR, "该信息不存在"); + } + + if (from == 1) { + if (pkInfoModel.getPkTime() > VVTools.currentTimeStamp()) { + // 判断是否是自己发布的数据 如果不是,就隐藏主播id + if (pkInfoModel.getSenderId().equals(userId)) { + pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); + } else { + // 查询是否存在未完成的pk记录 + Integer isHave = pkInfoDao.checkIfUnfinishedPKExistsWithAnchor(userId, pkInfoModel.getAnchorId()); + if (isHave > 0) { + pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); + } else { + pkInfoModel.setDisPlayId(VVTools.replaceChar(pkInfoModel.getAnchorId(), '*')); + } + } + return pkInfoModel; + } else { + throw new BusinessException(ErrorCode.SYSTEM_ERROR,"当前信息已无效"); + } + } else { + Integer isHave = pkInfoDao.checkIfUnfinishedPKExistsWithAnchor(userId, pkInfoModel.getAnchorId()); + if (isHave > 0) { + pkInfoModel.setDisPlayId(pkInfoModel.getAnchorId()); + } else { + pkInfoModel.setDisPlayId(VVTools.replaceChar(pkInfoModel.getAnchorId(), '*')); + } + return pkInfoModel; + } + } }