From c71055635df3d75e5dc838a9b66036c591913a13 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 08 七月 2023 18:37:12 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 dc08ba2..749e80c 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
@@ -3,9 +3,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
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.MgtCouponListDto;
+import com.ruoyi.member.domain.vo.MerCouponGetVo;
import com.ruoyi.member.domain.vo.MerCouponPageVo;
+import com.ruoyi.member.domain.vo.MgtCouponSimpleListVo;
import com.ruoyi.member.service.coupon.CouponService;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,7 +40,7 @@
private CouponService couponService;
@RequestMapping(value = "/pagePlatformMerCoupon", method = RequestMethod.POST)
- @ApiOperation(value = "平台分页获取优惠券列表")
+ @ApiOperation(value = "商户分页获取平台优惠券列表")
public R<Page<MerCouponPageVo>> pagePlatformMerCoupon(@RequestBody MerPageDto merPageDto) {
Long userId = SecurityUtils.getUserId();
merPageDto.setUserId(userId);
@@ -44,7 +51,49 @@
return R.ok(page.setRecords(couponPageVoList));
}
+ @RequestMapping(value = "/pageShopMerCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "商户分页获取商户优惠券列表")
+ public R<Page<MerCouponPageVo>> pageShopMerCoupon(@RequestBody MerCouponPageDto merPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merPageDto.setUserId(userId);
+ Page<MerCouponPageVo> page = new Page<>();
+ page.setSize(merPageDto.getPageSize());
+ page.setCurrent(merPageDto.getPageNum());
+ List<MerCouponPageVo> couponPageVoList = couponService.pageShopMerCoupon(page,merPageDto);
+ return R.ok(page.setRecords(couponPageVoList));
+ }
+ @RequestMapping(value = "/getMerCouponVo", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取优惠券编辑信息")
+ public R<MerCouponGetVo> getMerCouponVo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ MerCouponGetVo couponGetVo = couponService.getMerCouponVo(mgtBaseGetDto.getId());
+ return R.ok(couponGetVo);
+ }
+ @RequestMapping(value = "/editMerCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "商户编辑优惠券")
+ public R editMerCoupon(@RequestBody MerCouponEditDto merCouponEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ merCouponEditDto.setUserId(userId);
+ couponService.editMerCoupon(merCouponEditDto);
+ return R.ok();
+ }
+ @RequestMapping(value = "/deleteMerCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "商户删除优惠券")
+ public R deleteMerCoupon(@RequestBody MerBaseGetDto merBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBaseGetDto.setUserId(userId);
+ couponService.deleteMerCoupon(merBaseGetDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/listMerCouponSimpleVo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取优惠券选择列表")
+ public R<List<MgtCouponSimpleListVo>> listMgtCouponSimpleVo(@RequestBody MgtCouponListDto mgtCouponListDto) {
+ List<MgtCouponSimpleListVo> mgtCouponSimpleListVoList = couponService.listMgtCouponSimpleVo(mgtCouponListDto);
+ return R.ok(mgtCouponSimpleListVoList);
+ }
}
--
Gitblit v1.7.1