From c80fa36ef5e9cfc48a368939e61c9e89a6b5ecc8 Mon Sep 17 00:00:00 2001 From: 姜友瑶 <935090232@qq.com> Date: Mon, 13 Jun 2022 16:29:24 +0800 Subject: [PATCH] fix:排除删除会员方法 --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java index 9e78b10..b30f76c 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java @@ -220,9 +220,11 @@ freeze.setOrderItemId(taocan.getId().toString()); freeze.setVipId(taocan.getVipId()); SysProjuseFreeze freezeProj = sysProjuseFreezeDao.selectByOrderItemId(freeze); - Date dateAfter = DateUtil.nextNDate(taocan.getFailTime(), freezeProj.getGapDays()); - - taocan.setFailTime(dateAfter); + // todo 因为目前没有在冻结的时候插入冻结记录,所以这里暂时这样处理 + if(freezeProj!=null){ + Date dateAfter = DateUtil.nextNDate(taocan.getFailTime(), freezeProj.getGapDays()); + taocan.setFailTime(dateAfter); + } break; default: return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择无效或者冻结的套餐"); @@ -606,4 +608,9 @@ public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse) { return sysProjUseDao.selectTaoCanListWithProj(sysProjUse); } + + @Override + public int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId) { + return sysProjUseDao.selectTaocanCountForCourseAndInfinite(taocanId, vipId); + } } \ No newline at end of file -- Gitblit v1.9.1