From b933c7cdaea1386d50085b1602e4ee2729ac9af2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 26 May 2025 16:05:14 +0800
Subject: [PATCH] fix(mall): 修复拼团团长详情页面订单信息展示问题- 将 ApiHappyOrderLeaderVo 中的 itemId 字段类型从 String 改为 Long - 在 ApiMallTeamLeaderServiceImpl 中为 apiHappyOrderLeaderVo 设置正确的 itemId值
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 7d47ae3..ff49561 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -271,7 +271,7 @@
HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
new LambdaQueryWrapper<HappyMemberLevel>()
- .select(HappyMemberLevel::getName)
+ .select(HappyMemberLevel::getName, HappyMemberLevel::getIconPng)
.eq(HappyMemberLevel::getCode, mallMember.getDirector())
);
if(happyMemberLevel != null){
@@ -701,6 +701,33 @@
wallet.setBalance(BigDecimal.ZERO);
wallet.setMemberId(mallMember.getId());
mallMemberWalletMapper.insert(wallet);
+
+ //分销员的邀请码赠送优惠卷
+ if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
+ String couponUUID = IdUtil.simpleUUID();
+ //通过邀请人信息，获取能领取的优惠卷信息
+ MallMember refMember = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
+ if(ObjectUtil.isNotEmpty(refMember)){
+ SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(refMember.getId());
+ if(ObjectUtil.isNotEmpty(salemanCoupon)){
+ Long couponId = salemanCoupon.getCouponId();
+ List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(mallMember.getId(), couponId);
+ if(CollUtil.isEmpty(mallMemberCoupons)){
+ //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
+ MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+ MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+ mallMemberCoupon.setCouponId(couponId);
+ mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+ mallMemberCoupon.setMemberId(mallMember.getId());
+ mallMemberCoupon.setCouponUuid(couponUUID);
+ mallMemberCoupon.setInviteId(refMember.getInviteId());
+ mallMemberCoupon.setState(1);
+ mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+ mallMemberCouponMapper.insert(mallMemberCoupon);
+ }
+ }
+ }
+ }
} else {
if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
throw new FebsException("账号已停用");
@@ -726,13 +753,6 @@
authInfo.put("appid", xcxProperties.getXcxAppid());
authInfo.put("member", mallMember);
authInfo.put("rasToken", generateAsaToken(token));
-
- //分销员的邀请码赠送优惠卷
- if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
- GetCouponDto getCouponDto = new GetCouponDto();
- getCouponDto.setInviteId(apiXcxLoginDto.getInviteId());
- scanCoupon(getCouponDto);
- }
febsResponse.success().data(authInfo);
} else {
return febsResponse.fail().message("自动登录失败");
--
Gitblit v1.9.1