From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +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/miniapp/AppCouponController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
index 9a73c81..959450a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -3,9 +3,13 @@
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.AppMemberCouponPageDto;
import com.ruoyi.member.domain.vo.AppGetAbleCouponPageVo;
+import com.ruoyi.member.domain.vo.AppMemberCouponPageVo;
import com.ruoyi.member.service.coupon.CouponService;
+import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
@@ -37,22 +41,42 @@
@Resource
private MemberService memberService;
+ @Resource
+ private MemberCouponService memberCouponService;
+
@RequestMapping(value = "/pageAppUserGetAbleCoupon", method = RequestMethod.POST)
@ApiOperation(value = "用户分页获取可领取优惠券列表")
public R<Page<AppGetAbleCouponPageVo>> pagePlatformMerCoupon(@RequestBody AppPageDto appPageDto) {
Long userId = SecurityUtils.getUserId();
- if(userId!=null){
- Member member = memberService.getByUserId(userId);
- if(member!=null&&member.getRelationShopId()!=null){
- }
- }
+ Member member = memberService.getByUserId(userId);
appPageDto.setUserId(userId);
Page<AppGetAbleCouponPageVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
- List<AppGetAbleCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto);
+ List<AppGetAbleCouponPageVo> unGetCouponPageVoList = couponService.pageAppUserGetAbleCoupon(page,appPageDto,member);
return R.ok(page.setRecords(unGetCouponPageVoList));
}
+ @RequestMapping(value = "/appGetCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "用户领取优惠券")
+ public R appGetCoupon(@RequestBody AppBaseGetDto appBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ Member member = memberService.getByUserId(userId);
+ Long shopId = member.getRelationShopId();
+ appBaseGetDto.setUserId(userId);
+ couponService.appGetCoupon(appBaseGetDto.getId(),userId,shopId);
+ return R.ok();
+ }
+ @RequestMapping(value = "/pageAppUserGetCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "用户分页获取已领取优惠券列表")
+ public R<Page<AppMemberCouponPageVo>> pageAppUserGetCoupon(@RequestBody AppMemberCouponPageDto appMemberCouponPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ appMemberCouponPageDto.setUserId(userId);
+ Page<AppMemberCouponPageVo> page = new Page<>();
+ page.setSize(appMemberCouponPageDto.getPageSize());
+ page.setCurrent(appMemberCouponPageDto.getPageNum());
+ List<AppMemberCouponPageVo> memberCouponPageVoList = memberCouponService.pageAppUserGetCoupon(page,appMemberCouponPageDto);
+ return R.ok(page.setRecords(memberCouponPageVoList));
+ }
}
--
Gitblit v1.7.1