From 7109e2fefaa46caffcd36b44828f48e0f8a790ba Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 11 七月 2023 09:36:50 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index bb2aea8..af793ed 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -191,6 +191,10 @@
MerCouponGetVo merCouponGetVo = new MerCouponGetVo();
Coupon coupon = this.getById(couponId);
BeanUtils.copyProperties(coupon, merCouponGetVo);
+ if(merCouponGetVo.getSendType()>1){
+ merCouponGetVo.setSendType(2);
+ merCouponGetVo.setSendTarget(merCouponGetVo.getSendType());
+ }
//判断优惠券是否为指定商品
if(coupon.getUseScope()==2){
String relGoodsIds = coupon.getRelGoodsIds();
@@ -757,6 +761,9 @@
coupon.setCouponType(merCouponEditDto.getCouponType());
coupon.setCouponName(merCouponEditDto.getCouponName());
coupon.setSendType(merCouponEditDto.getSendType());
+ if(merCouponEditDto.getSendType()!=1){
+ coupon.setSendType(merCouponEditDto.getSendTarget());
+ }
coupon.setSendTimeType(merCouponEditDto.getSendTimeType());
coupon.setSendTime(merCouponEditDto.getSendTime());
coupon.setMoneyThreshold(merCouponEditDto.getMoneyThreshold());
@@ -886,9 +893,10 @@
* @return List<AppUnGetCouponPageVo>
*/
@Override
- public List<AppUnGetCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto){
-
-
+ public List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto){
+ //获取当前已领取完优惠券
+ List<String> unGetList = couponMapper.listUserUnGetCoupon(appPageDto.getUserId());
+ //List<AppGetAbleCouponPageVo> getAbleCouponPageVoList = couponMapper.getAbleCouponPageVoList( unGetList);
return null;
}
}
--
Gitblit v1.7.1