From 7109e2fefaa46caffcd36b44828f48e0f8a790ba Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 11 七月 2023 09:36:50 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
index ab5e35b..891e18b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
@@ -2,7 +2,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.member.service.member.MemberCouponService;
+import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +26,8 @@
@RequestMapping("/coupon")
public class CouponController extends BaseController {
+ @Resource
+ private CouponService couponService;
@Resource
private MemberCouponService memberCouponService;
@@ -55,4 +59,30 @@
return R.ok(verifyCouponGetVo);
}
+ /**
+ * @description 核销优惠券
+ * @author jqs
+ * @date 2023/6/28 11:43
+ * @param memberCouponId
+ * @return R<MerVerifyCouponGetVo>
+ */
+ @PostMapping("/sureVerifyCoupon")
+ public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody String memberCouponId)
+ {
+ MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.sureVerifyCoupon(memberCouponId);
+ return R.ok(verifyCouponGetVo);
+ }
+
+ /**
+ * @description 发送用户优惠券礼物
+ * @author jqs
+ * @date 2023/7/7 19:53
+ * @param giftSendDtoList
+ * @return R
+ */
+ @PostMapping("/sendCouponGift")
+ public R sendCouponGift(@RequestBody List<BirthdayGiftSendDto> giftSendDtoList){
+ couponService.sendCouponGift(giftSendDtoList);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1