From 9e530fa2aee385cb331e3c76d0765e78c40e35f7 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 10 十月 2024 13:44:08 +0800
Subject: [PATCH] 1.增加基类是ID是string且是逻辑删的 2.财务报表-合伙人报表
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java
index 547b8af..fb33a94 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java
@@ -53,16 +53,29 @@
@Autowired
CustomerMapper customerMapper;
- @GetMapping("/home/list")
+// @GetMapping("/home/list")
+// @ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
+// public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
+// // 活动优惠券
+// dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
+// // 已经发布
+// dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
+// // 首页弹窗
+// dto.setGetType(CouponGetTypeEnum.HOME.getType());
+// return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
+// }
+
+ @GetMapping("/home/alert")
@ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
- public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
+ public ResponseEntity<ReturnDataDTO<CouponTemplateVO>> homeAlert(QueryActivityEffectCouponDTO dto) {
// 活动优惠券
dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
// 已经发布
dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
// 首页弹窗
dto.setGetType(CouponGetTypeEnum.HOME.getType());
- return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
+ // 如果当前人员已经领取过的话，则不返回
+ return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponTemplateService.getHomeActivityEffectAlert(dto), CouponTemplateAppVO.class));
}
@GetMapping("/activy/list")
--
Gitblit v1.9.3