From 5bb359883bda6f15b6a6937a2c17ac9bbc67ab8e Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期日, 22 九月 2024 17:17:24 +0800 Subject: [PATCH] add:会员成长值规则 --- src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java index 5fbb65b..50a553a 100644 --- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java +++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java @@ -7,10 +7,12 @@ import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.config.exception.ValidationException; import com.mzl.flower.dto.request.coupon.*; +import com.mzl.flower.dto.response.coupon.CouponPointStatisVO; import com.mzl.flower.dto.response.coupon.CouponTemplatePointVO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponTemplateDO; import com.mzl.flower.enums.CouponCategoryEnum; +import com.mzl.flower.enums.CouponStatusEnum; import com.mzl.flower.enums.CouponTypeEnum; import com.mzl.flower.enums.CouponUsageTypeEnum; import com.mzl.flower.service.coupon.CouponTemplateService2; @@ -63,8 +65,9 @@ @PutMapping("/{id}") @ApiOperation(value = "修改", notes = "修改") - public ResponseEntity<ReturnDataDTO> update(@Validated @RequestBody CreateCouponTemplatePointDTO dto) { + public ResponseEntity<ReturnDataDTO> update(@PathVariable String id,@Validated @RequestBody CreateCouponTemplatePointDTO dto) { // 信息校验 + dto.setId(id); valid(dto); CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getId()); @@ -73,6 +76,7 @@ } CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO(); + BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO); BeanUtils.copyProperties(dto, couponTemplateBO); // 设置成积分优惠券 @@ -151,9 +155,9 @@ return returnData(R.SUCCESS.getCode(), null); } - @PutMapping("/batch/expire") + @PostMapping("/batch/expire") @ApiOperation(value = "批量下架", notes = "批量下架") - public ResponseEntity<ReturnDataDTO> expireBatch(BatchCouponTemplateDTO dto) { + public ResponseEntity<ReturnDataDTO> expireBatch(@RequestBody BatchCouponTemplateDTO dto) { couponTemplateService.expireBatchCouponTemplate(dto); @@ -163,9 +167,9 @@ - @PutMapping("/batch/active") + @PostMapping("/batch/active") @ApiOperation(value = "批量发布", notes = "批量发布") - public ResponseEntity<ReturnDataDTO> activeBatch(BatchCouponTemplateDTO dto) { + public ResponseEntity<ReturnDataDTO> activeBatch(@RequestBody BatchCouponTemplateDTO dto) { couponTemplateService.activeBatchCouponTemplate(dto); @@ -173,9 +177,9 @@ } - @DeleteMapping("/batch/del") + @PostMapping("/batch/del") @ApiOperation(value = "批量删除", notes = "批量删除") - public ResponseEntity<ReturnDataDTO> deleteBatch(BatchCouponTemplateDTO dto) { + public ResponseEntity<ReturnDataDTO> deleteBatch(@RequestBody BatchCouponTemplateDTO dto) { couponTemplateService.deleteBatchCouponTemplate(dto); return returnData(R.SUCCESS.getCode(), null); @@ -186,8 +190,27 @@ public ResponseEntity<ReturnDataDTO> statistics(QueryCouponStatisticsDTO dto) { QueryCouponStatisticsBO queryCouponStatisticsBO=new QueryCouponStatisticsBO(); BeanUtils.copyProperties(dto,queryCouponStatisticsBO); - CouponTemplateVO couponTemplateVO = couponTemplateService.statisCouponTemplatePoint(queryCouponStatisticsBO); - return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponTemplateVO, CouponTemplatePointVO.class)); + CouponPointStatisVO vo = couponTemplateService.statisCouponTemplatePoint(queryCouponStatisticsBO); + return returnData(R.SUCCESS.getCode(), vo); + } + + @GetMapping("/active/list") + @ApiOperation(value = "查询-全部", notes = "查询-全部") + public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> activeList(QueryActivePointCouponDTO dto) { + // 设置只查询积分优惠券的 + dto.setCategory(CouponCategoryEnum.POINT.getStatus()); + dto.setStatus(CouponStatusEnum.ACTIVE.getStatus()); + return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getPointList(dto), CouponTemplatePointVO.class)); + } + + @GetMapping("/active/page") + @ApiOperation(value = "查询-分页", notes = "查询-分页") + public ResponseEntity<ReturnDataDTO<Page<CouponTemplatePointVO>>> activePage(Page page, QueryActivePointCouponDTO dto) { + // 设置只查询积分优惠券的 + dto.setCategory(CouponCategoryEnum.POINT.getStatus()); + dto.setStatus(CouponStatusEnum.ACTIVE.getStatus()); + Page<CouponTemplateVO> resultPage = couponTemplateService.getPointPage(page, dto); + return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(resultPage, CouponTemplatePointVO.class)); } @@ -212,4 +235,15 @@ } + + + + @PostMapping("/exchange") + @ApiOperation(value = "小程序-积分优惠券兑换", notes = "小程序-积分优惠券兑换") + public ResponseEntity<ReturnDataDTO> exchangeCoupon(@Validated @RequestBody ExchangeCouponDTO dto) { + couponTemplateService.exchangeCoupon(dto); + return returnData(R.SUCCESS.getCode(), null); + + + } } -- Gitblit v1.9.3