From cf59c548d06bcb8dd824a97403658ca90164abfd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 23 Jan 2024 10:06:08 +0800
Subject: [PATCH] Merge branch 'blnka' into blnka-vip

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index c1e5fcc..a69a704 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -235,6 +235,13 @@
         return memberService.getCoupon(getCouponDto);
     }
 
+
+    @ApiOperation(value = "扫码推销员领取优惠卷")
+    @PostMapping(value = "/scanCoupon")
+    public FebsResponse scanCoupon(@RequestBody GetCouponDto getCouponDto) {
+        return memberService.scanCoupon(getCouponDto);
+    }
+
     @ApiOperation(value = "优惠卷列表")
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
@@ -244,6 +251,15 @@
         return memberService.memberCoupon(mallMemberCouponDto);
     }
 
+    @ApiOperation(value = "创建订单优惠卷列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
+    })
+    @PostMapping(value = "/memberPayCoupon")
+    public FebsResponse memberPayCoupon(@RequestBody MallMemberCouponDto mallMemberCouponDto) {
+        return memberService.memberPayCoupon(mallMemberCouponDto);
+    }
+
     @ApiOperation(value = "优惠卷详情", notes = "优惠卷详情")
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)

--
Gitblit v1.9.1