From 86f2368f146af23c9e16507f790752e79858a29f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 22 Feb 2024 22:34:31 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 88d2416..0bce76e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -21,6 +21,8 @@
import cc.mrbird.febs.pay.model.MemberWithdrawalDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
@@ -75,6 +77,8 @@
private final MallAgentRecordMapper mallAgentRecordMapper;
private final MallSalesmanMapper mallSalesmanMapper;
private final SalemanCouponMapper salemanCouponMapper;
+ private final MallMemberCouponMapper mallMemberCouponMapper;
+ private final MallGoodsCouponMapper mallGoodsCouponMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -697,16 +701,29 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void modifyReferer(MallMember member) {
- MallMember referer = this.baseMapper.selectInfoByInviteId(member.getReferrerId());
+ if(StrUtil.isEmpty(member.getReferrerId())){
+ this.baseMapper.updateReferrerId(member.getId());
+ return;
+ }
+ String referrerId = member.getReferrerId();//新的推荐人邀请码
+ //获取新推荐人信息
+ MallMember referer = this.baseMapper.selectInfoByInviteId(referrerId);
if (referer == null) {
throw new FebsException("推荐人不存在");
}
- String refererId = member.getReferrerId();
+ member = this.baseMapper.selectById(member.getId());//修改的用户
- member = this.baseMapper.selectById(member.getId());
-
- String beforeReferer = member.getReferrerId();
- member.setReferrerId(refererId);
+ if(member.getInviteId().equals(referrerId)){
+ throw new FebsException("自己不能推荐自己");
+ }
+ String refererId = referer.getInviteId();//新推荐人的邀请码
+ if(StrUtil.isNotEmpty(referer.getReferrerIds())){
+ if (referer.getReferrerIds().contains(member.getInviteId())) {
+ throw new FebsException("修改的推荐关系不符合规则");
+ }
+ }
+// String beforeReferer = member.getReferrerId();
+ member.setReferrerId(refererId);//更新用户的上级推荐人为新推荐人的邀请码refererId
String refererIds = refererIds(refererId);
member.setReferrerIds(refererIds);
this.baseMapper.updateById(member);
@@ -911,4 +928,25 @@
return ids;
}
+
+ @Override
+ public FebsResponse addMemberCoupon(MallMember member) {
+ MallGoodsCoupon existCoupon = mallGoodsCouponMapper.selectById(member.getCouponId());
+ if(existCoupon == null) {
+ return new FebsResponse().fail().message("优惠券不存在");
+ }
+
+ MallMemberCoupon memberCoupon = new MallMemberCoupon();
+ memberCoupon.setCouponId(existCoupon.getId());
+ memberCoupon.setCouponName(existCoupon.getName());
+ memberCoupon.setInviteId(member.getInviteId());
+ memberCoupon.setCouponUuid(IdUtil.simpleUUID());
+ memberCoupon.setState(1);
+ memberCoupon.setFromType(4);
+ memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), existCoupon.getExpireDay()));
+ memberCoupon.setMemberId(member.getId());
+ mallMemberCouponMapper.insert(memberCoupon);
+
+ return new FebsResponse().success().message("操作成功");
+ }
}
--
Gitblit v1.9.1