From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
index 1ec073e..a5e8aef 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.promotion.controller.forepart.vo.CouponMemberVO;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.domain.CouponMember;
import com.ruoyi.promotion.service.ICouponMemberService;
@@ -34,14 +35,20 @@
@PostMapping("/getCouponMemberList")
@ApiOperation(value = "用户端-获取用户优惠卷")
- public R<PageDTO<CouponMember>> getCouponMemberList(@RequestBody CouponMemberDTO couponMemberDTO) {
+ public R<PageDTO<CouponMemberVO>> getCouponMemberList(@RequestBody CouponMemberDTO couponMemberDTO) {
return R.ok(iCouponMemberService.getCouponMemberList(couponMemberDTO));
}
@PostMapping("/getCouponMember")
@ApiOperation(value = "用户端-获取用户下单优惠卷")
- public R<List<CouponMember>> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO) {
+ public R<List<CouponMemberVO>> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO) {
return R.ok(iCouponMemberService.getCouponMemberl(couponMemberDTO));
}
+ @PostMapping("/updCouponMember")
+ @ApiOperation(value = "用户端-获取用户下单获取优惠卷")
+ public R<List<CouponMemberVO>> updCouponMember1(@RequestBody CouponMemberDTO couponMemberDTO) {
+ return R.ok(iCouponMemberService.updCouponMember1(couponMemberDTO));
+ }
+
}
--
Gitblit v1.7.1