From eb57efc4e28a2771fec52a261d0a74ca73dffec2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 15:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 2d943f5..4b51ad0 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,6 +7,7 @@
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;
@@ -187,19 +188,29 @@
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() {
+ public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> activeList(QueryActivePointCouponDTO dto) {
// 设置只查询积分优惠券的
- QueryCouponDTO dto=new QueryCouponDTO();
dto.setCategory(CouponCategoryEnum.POINT.getStatus());
dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getList(dto), CouponTemplatePointVO.class));
+ 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));
+ }
+
private void valid(CreateCouponTemplatePointDTO dto){
@@ -222,4 +233,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