From b8715584ed46116e201a8bee1a33e9e93fe61fc6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 21 May 2021 10:47:10 +0800 Subject: [PATCH] tt --- .../service/tt/impl/TtCouponServiceImpl.java | 3 ++- .../controller/tt/TtCouponController.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) 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 28fa30ab0..301f63d1d 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 @@ -138,7 +138,8 @@ public class TtCouponServiceImpl implements TtCouponService { if(byId == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程"); } - if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode())){ + if(!byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode()) + && !byId.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许上架或者已上架"); } byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); 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 fda0143a4..ff30eeb5d 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java @@ -83,6 +83,17 @@ public class TtCouponController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); record.updateTenantInfo(tenantEntity); + if(record.getId() != null){ + TtCoupon coupon = ttCouponService.getById(record.getId()); + if (null == coupon || EnumDelFlag.YES.getCode().equals(record.getIsDel())) { + return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除"); + } + if(!coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_DRAFT.getCode()) + && !coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode())){ + return new ResultData(ErrorCode.SYS_SERVER_ERROR,"该课程状态不允许修改"); + } + } + if(record.getMerchantId() == null){ WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); @@ -174,9 +185,7 @@ public class TtCouponController extends BaseController { } TenantEntity tenantEntity = getTenantInfo(); record.updateTenantInfo(tenantEntity); - if(EnumDelFlag.YES.getCode().equals(record.getIsDel())){ - return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除"); - } + TtCoupon coupon = ttCouponService.getById(record.getId()); if (null == coupon || EnumDelFlag.YES.getCode().equals(record.getIsDel())) { return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到课程,或课程已删除"); @@ -191,6 +200,7 @@ public class TtCouponController extends BaseController { record.setMerchantId(list.get(0).getId()); } } + if(record.getMerchantId() == null){ return new ResultData(ErrorCode.SYS_SERVER_ERROR,"找不到作者"); }