From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
index 212b96f..f5d5e86 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -1,10 +1,9 @@
package com.ruoyi.member.service.impl.member;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
-import com.ruoyi.member.service.coupon.CouponService;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.goods.Goods;
@@ -35,8 +34,6 @@
@Resource
private RemoteGoodsService remoteGoodsService;
- @Resource
- private CouponService couponService;
/**
* @description: TODO
@@ -86,13 +83,12 @@
merVerifyCouponGetVo.setGoodsList(goodsList);
}
merVerifyCouponGetVo.setMemberCouponId(memberCoupon.getId());
- Coupon coupon = couponService.getById(memberCoupon.getCouponId());
- // 设置优惠券来源
- if (coupon.getCouponFrom() == 1) {
- merVerifyCouponGetVo.setCouponFrom("平台");
- } else {
+ if (memberCoupon.getShopId()!=null&&memberCoupon.getShopId()>0) {
merVerifyCouponGetVo.setCouponFrom("商户");
+ } else {
+ merVerifyCouponGetVo.setCouponFrom("平台");
}
+ merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
return merVerifyCouponGetVo;
}
@@ -127,11 +123,10 @@
merVerifyCouponGetVo.setGoodsList(goodsList);
}
merVerifyCouponGetVo.setMemberCouponId(memberCoupon.getId());
- Coupon coupon = couponService.getById(memberCoupon.getCouponId());
- if (coupon.getCouponFrom()==1) {
- merVerifyCouponGetVo.setCouponFrom("平台");
- } else {
+ if (memberCoupon.getShopId()!=null&&memberCoupon.getShopId()>0) {
merVerifyCouponGetVo.setCouponFrom("商户");
+ } else {
+ merVerifyCouponGetVo.setCouponFrom("平台");
}
memberCoupon.setCouponStatus(2);
memberCoupon.setUseTime(new Date());
@@ -139,4 +134,22 @@
merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
return merVerifyCouponGetVo;
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/6/29 11:42
+ * @param userId
+ * @param couponId
+ * @return Integer
+ */
+ @Override
+ public Integer totalMemberCouponByUserAndCoupon(Long userId,String couponId){
+ LambdaQueryWrapper<MemberCoupon> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(MemberCoupon::getUserId,userId);
+ queryWrapper.eq(MemberCoupon::getCouponId,couponId);
+ Integer total = this.count(queryWrapper);
+ return total;
+ }
+
}
--
Gitblit v1.7.1