From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
index 749e80c..22ef651 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
@@ -5,14 +5,19 @@
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.member.domain.dto.MerCouponEditDto;
 import com.ruoyi.member.domain.dto.MerCouponPageDto;
+import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
 import com.ruoyi.member.domain.dto.MgtCouponListDto;
 import com.ruoyi.member.domain.vo.MerCouponGetVo;
 import com.ruoyi.member.domain.vo.MerCouponPageVo;
+import com.ruoyi.member.domain.vo.MetAuditCouponTotalVo;
 import com.ruoyi.member.domain.vo.MgtCouponSimpleListVo;
 import com.ruoyi.member.service.coupon.CouponService;
+import com.ruoyi.member.service.member.MemberCouponService;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
 import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
 import com.ruoyi.system.api.domain.dto.MerPageDto;
 import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.vo.MerMemberCouponVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +43,10 @@
 
     @Resource
     private CouponService couponService;
+
+    @Resource
+    private MemberCouponService memberCouponService;
+
 
     @RequestMapping(value = "/pagePlatformMerCoupon", method = RequestMethod.POST)
     @ApiOperation(value = "商户分页获取平台优惠券列表")
@@ -96,4 +105,27 @@
         List<MgtCouponSimpleListVo> mgtCouponSimpleListVoList = couponService.listMgtCouponSimpleVo(mgtCouponListDto);
         return R.ok(mgtCouponSimpleListVoList);
     }
+
+    /**
+     * @description: 获取用户优惠券
+     * @author jqs34
+     * @date 2023/5/3 1:45
+     * @version 1.0
+     */
+    @RequestMapping(value = "/listMerShopGoodsMemberCoupon", method = RequestMethod.POST)
+    @ApiOperation(value = "商户获取用户已领取优惠券")
+    public R<List<MerMemberCouponVo>> listMerShopGoodsMemberCoupon(@RequestBody MerGoodsCouponListDto merGoodsCouponListDto){
+        List<MerMemberCouponVo> merMemberCouponVoList = memberCouponService.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
+        return R.ok(merMemberCouponVoList);
+    }
+
+
+    @RequestMapping(value = "/getMetAuditCouponTotal", method = RequestMethod.POST)
+    @ApiOperation(value = "商户获取优惠券审核统计")
+    public R<MetAuditCouponTotalVo> getMetAuditCouponTotal(@RequestBody MerBaseDto merBaseDto) {
+        Long userId = SecurityUtils.getUserId();
+        merBaseDto.setUserId(userId);
+        MetAuditCouponTotalVo auditCouponTotalVo = couponService.getMetAuditCouponTotal(merBaseDto.getShopId());
+        return R.ok(auditCouponTotalVo);
+    }
 }

--
Gitblit v1.7.1