From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 a2d3a23..75010a6 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
@@ -1,12 +1,16 @@
package com.ruoyi.member.controller.console;
+import com.alibaba.fastjson2.JSON;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +26,7 @@
* @Date 2023/6/27 15:00
* @Version 1.0
*/
+@Slf4j
@RestController
@RequestMapping("/coupon")
public class CouponController extends BaseController {
@@ -40,8 +45,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);
}
@@ -53,7 +58,7 @@
* @return R<MerVerifyCouponGetVo>
*/
@PostMapping("/getVerifyCoupon")
- public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon)
+ public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon)
{
MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.getVerifyCoupon(verifyCoupon);
return R.ok(verifyCouponGetVo);
@@ -67,7 +72,7 @@
* @return R<MerVerifyCouponGetVo>
*/
@PostMapping("/sureVerifyCoupon")
- public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody String memberCouponId)
+ public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody Long memberCouponId)
{
MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.sureVerifyCoupon(memberCouponId);
return R.ok(verifyCouponGetVo);
@@ -108,12 +113,27 @@
*/
@PostMapping("/useMemberCoupon")
public R useMemberCoupon(@RequestBody String memberCouponIds){
+ log.info("修改优惠券使用状态：{}", JSON.toJSONString(memberCouponIds));
memberCouponService.useMemberCoupon(memberCouponIds);
return R.ok();
}
+
/**
- * @description 使用优惠券
+ * @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
--
Gitblit v1.7.1