From 9b9e43adee86384abdcbc50af29c7ba68b818fb7 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 09:34:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java b/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
index 6f8cae1..5d5b6c2 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/StoreCouponController.java
@@ -1,13 +1,20 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
+import cn.lili.common.context.ThreadContextHolder;
import cn.lili.modules.lmk.domain.form.StoreCouponForm;
+import cn.lili.modules.lmk.domain.query.StoreCouponClaimRecordQuery;
import cn.lili.modules.lmk.domain.query.StoreCouponQuery;
import cn.lili.modules.lmk.domain.query.StoreCouponSingleQuery;
+import cn.lili.modules.lmk.service.StoreCouponClaimRecordService;
import cn.lili.modules.lmk.service.StoreCouponService;
+import cn.lili.modules.promotion.entity.dto.search.MemberCouponSearchParams;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
/**
* 鍟嗗绔敓鎴愬簵閾轰紭鎯犲嵎淇℃伅
@@ -22,6 +29,7 @@
private final StoreCouponService storeCouponService;
+ private final StoreCouponClaimRecordService storeCouponClaimRecordService;
/**
* 鍒涘缓搴楅摵涓庝紭鎯犲嵎鍏宠仈鍏崇郴
* @param storeCoupon
@@ -30,6 +38,15 @@
@PostMapping
public Result addStoreCoupon(@RequestBody StoreCouponForm storeCoupon){
return storeCouponService.addStoreCoupon(storeCoupon);
+ }
+ /**
+ * 淇敼璁㈠崟搴楅摵浼樻儬鍗风姸鎬�
+ * @param id
+ * @return
+ */
+ @PostMapping("/changeStatus/{id}")
+ public Result changeStatus(@PathVariable String id){
+ return storeCouponService.changeStatus(id);
}
/**
@@ -56,4 +73,15 @@
public Result getPageByStoreCoupon(StoreCouponSingleQuery query){
return storeCouponService.getPageByStoreCoupon(query);
}
+
+ @GetMapping("/getPageByStoreCouponClaimRecord")
+ public Result getPageByStoreCouponClaimRecord(StoreCouponClaimRecordQuery query){
+ return storeCouponClaimRecordService.page(query);
+ }
+
+ @ApiOperation(value = "鏌ヨ浼樻儬鍗峰鍑哄垪琛�")
+ @GetMapping("/queryExportCoupon")
+ public void queryExportCoupon(StoreCouponClaimRecordQuery query) {
+ HttpServletResponse response = ThreadContextHolder.getHttpResponse();
+ storeCouponClaimRecordService.queryExportCoupon(response,query);}
}
--
Gitblit v1.8.0