From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期五, 06 九月 2024 18:59:51 +0800 Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架,及当前优惠券的已经发放的情况下不可再次下发 --- src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java index 762b64a..fe543b1 100644 --- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java +++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java @@ -53,7 +53,7 @@ CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO(); BeanUtils.copyProperties(dto, couponTemplateBO); - // 设置成积分优惠券 + // 设置成会员优惠券 couponTemplateBO.setCategory(CouponCategoryEnum.MEMBER.getStatus()); couponTemplateService.createCouponTemplate(couponTemplateBO); @@ -78,7 +78,7 @@ BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO); BeanUtils.copyProperties(dto, couponTemplateBO); - // 设置成积分优惠券 + // 设置成会员优惠券 couponTemplateBO.setCategory(CouponCategoryEnum.MEMBER.getStatus()); couponTemplateService.updateCouponTemplate(couponTemplateBO); @@ -110,7 +110,7 @@ public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVipVO>>> page( Page page, QueryCouponDTO dto ) { - // 设置只查询积分优惠券的 + // 设置只查询会员优惠券的 dto.setCategory(CouponCategoryEnum.MEMBER.getStatus()); Page<CouponTemplateVO> resultPage = couponTemplateService.getPage(page, dto); return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(resultPage, CouponTemplateVipVO.class)); @@ -125,6 +125,34 @@ return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getList(dto), CouponTemplateVipVO.class)); } + @PutMapping("/active/{id}") + @ApiOperation(value = "发布", notes = "发布") + public ResponseEntity<ReturnDataDTO> active(@PathVariable String id) { + + CouponTemplateDO couponTemplateDO = couponTemplateService.getById(id); + if (null == couponTemplateDO) { + throw new ValidationException("优惠券不存在"); + } + + couponTemplateService.activeCouponTemplate(id); + + return returnData(R.SUCCESS.getCode(), null); + } + + @PutMapping("/expire/{id}") + @ApiOperation(value = "下架", notes = "下架") + public ResponseEntity<ReturnDataDTO> expire(@PathVariable String id) { + + CouponTemplateDO couponTemplateDO = couponTemplateService.getById(id); + if (null == couponTemplateDO) { + throw new ValidationException("优惠券不存在"); + } + + couponTemplateService.expireCouponTemplate(id); + + return returnData(R.SUCCESS.getCode(), null); + } + private void valid(CreateCouponTemplateVipDTO dto){ -- Gitblit v1.9.3