From e4e2211615011ac6a8c0c86b98f353b94dc9b1da Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 24 May 2021 10:49:11 +0800 Subject: [PATCH] tt --- .../iformall/service/tt/TtCouponService.java | 4 +++ .../service/tt/impl/TtCouponServiceImpl.java | 30 +++++++++++++++++++ .../controller/tt/TtCouponController.java | 28 +++++++++++++++-- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java index 3ab92b7f7..c848b132b 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java @@ -48,4 +48,8 @@ public interface TtCouponService { @Async void collectCoupon(TenantEntity tenantEntity,Long memberId, Long id); + + ResultData auditPass(Long id); + + ResultData auditRejected(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index 2f0d9ca46..75f3f885c 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -189,4 +189,34 @@ public class TtCouponServiceImpl implements TtCouponService { // e.printStackTrace(); } } + + @Override + public ResultData auditPass(Long id) { + TtCoupon byId = this.getById(id); + if(byId == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程"); + } + if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_EXAMINE.getCode())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不在审核中"); + } + byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode()); + byId.setUpdateDate(new Date()); + ttCouponMapper.updateById(byId); + return new ResultData(); + } + + @Override + public ResultData auditRejected(Long id) { + TtCoupon byId = this.getById(id); + if(byId == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程"); + } + if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_EXAMINE.getCode())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不在审核中"); + } + byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode()); + byId.setUpdateDate(new Date()); + ttCouponMapper.updateById(byId); + return new ResultData(); + } } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java index 502911e74..4f1158933 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java @@ -281,10 +281,10 @@ public class TtCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "") public ResultData puton(@RequestParam Long id) { - logger.debug("[" + getIpAddr() + "] TtCouponController::findById");if (id == null) { + logger.debug("[" + getIpAddr() + "] TtCouponController::findById"); + if (id == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - return ttCouponService.puton(id); } @@ -300,4 +300,28 @@ public class TtCouponController extends BaseController { return ttCouponService.putoff(id); } + @ApiOperation("审批通过") + @GetMapping("/auditPass") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "") + public ResultData auditPass(@RequestParam Long id) { + logger.debug("[" + getIpAddr() + "] TtCouponController::auditPass"); + if (id == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + return ttCouponService.auditPass(id); + } + + @ApiOperation("审批拒绝") + @PostMapping("/auditRejected") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "") + public ResultData auditRejected(@RequestBody TtCoupon record) { + logger.debug("[" + getIpAddr() + "] TtCouponController::auditRejected"); + if (record.getId() == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + return ttCouponService.auditRejected(record.getId()); + } + }