From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 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..1db74f4 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,11 @@
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.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerVerifyMemberCouponDto;
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 +28,8 @@
@RequestMapping("/coupon")
public class CouponController extends BaseController {
+ @Resource
+ private CouponService couponService;
@Resource
private MemberCouponService memberCouponService;
@@ -36,8 +42,8 @@
* @version 1.0
*/
@PostMapping("/listVoMemberCouponByUserId")
- public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
- List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody MerBaseDto merBaseDto){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(merBaseDto);
return R.ok(appMemberCouponVoList);
}
@@ -55,4 +61,83 @@
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();
+ }
+
+ /**
+ * @description 定时发送优惠券
+ * @author jqs
+ * @date 2023/7/12 11:56
+ * @param couponId
+ * @return R
+ */
+ @PostMapping("/autoTimeSendCoupon")
+ public R autoTimeSendCoupon(@RequestBody String couponId){
+ couponService.autoTimeSendCoupon(couponId);
+ return R.ok();
+ }
+
+ /**
+ * @description 使用优惠券
+ * @author jqs
+ * @date 2023/7/13 19:38
+ * @param memberCouponIds
+ * @return R
+ */
+ @PostMapping("/useMemberCoupon")
+ public R useMemberCoupon(@RequestBody String memberCouponIds){
+ memberCouponService.useMemberCoupon(memberCouponIds);
+ return R.ok();
+ }
+
+
+ /**
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/8/15 11:37
+ * @param merVerifyMemberCouponDto
+ * @return R
+ */
+ @PostMapping("/verifyMemberCoupon")
+ public R sureMemberCoupon(@RequestBody MerVerifyMemberCouponDto merVerifyMemberCouponDto){
+ memberCouponService.sureMemberCoupon(merVerifyMemberCouponDto.getCouponId(),merVerifyMemberCouponDto.getShopId());
+ return R.ok();
+ }
+
+ /**
+ * @description 回退优惠券
+ * @author jqs
+ * @date 2023/7/13 19:38
+ * @param memberCouponIds
+ * @return R
+ */
+ @PostMapping("/backMemberCoupon")
+ public R backMemberCoupon(@RequestBody String memberCouponIds){
+ memberCouponService.backMemberCoupon(memberCouponIds);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1