From ff55c5334fc35594d2f0c680c29afd309cf367a2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 22 May 2025 10:51:36 +0800
Subject: [PATCH] feat(mall): 添加商品佣金设置并调整相关功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 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 e732db2..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){
@@ -704,9 +704,29 @@
 
                     //分销员的邀请码赠送优惠卷
                     if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
-                        GetCouponDto getCouponDto = new GetCouponDto();
-                        getCouponDto.setInviteId(apiXcxLoginDto.getInviteId());
-                        scanCoupon(getCouponDto);
+                        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())) {

--
Gitblit v1.9.1