From 508a977c7765ad789589beb638073531bd9e75a8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 15:42:37 +0800
Subject: [PATCH] refactor(mall): 移除未使用的导入语句

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 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 cc0dee0..d28342a 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
@@ -130,16 +130,26 @@
         //对于邀请码的验证和上级联系人的验证
         Integer count = this.baseMapper.selectCount(null);
         if (count != null && count != 0) {
-            if(!StrUtil.isEmpty(registerDto.getInviteId())){
-                String inviteId = registerDto.getInviteId();
-                MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
-                if (inviteMember == null) {
-                    throw new FebsException("邀请码不存在");
-                }
-                mallMember.setReferrerId(registerDto.getInviteId());
+            if(StrUtil.isEmpty(registerDto.getInviteId())){
+                throw new FebsException("请输入邀请码");
             }
+            String inviteId = registerDto.getInviteId();
+            MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
+            if (inviteMember == null) {
+                throw new FebsException("邀请码不存在");
+            }
+            mallMember.setReferrerId(registerDto.getInviteId());
+//            if(!StrUtil.isEmpty(registerDto.getInviteId())){
+//                String inviteId = registerDto.getInviteId();
+//                MallMember inviteMember = this.baseMapper.selectInfoByInviteId(inviteId);
+//                if (inviteMember == null) {
+//                    throw new FebsException("邀请码不存在");
+//                }
+//                mallMember.setReferrerId(registerDto.getInviteId());
+//            }
         }
         mallMember.setName(account);
+        mallMember.setAvatar("https://res.runstep.cc/rslogo.png");
         mallMember.setAccountStatus(YesOrNoEnum.YES.getValue());
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
         mallMember.setSex("男");
@@ -485,7 +495,7 @@
          * 用户的等级level是否允许兑换碳币
          */
         RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel()));
-        if(ObjectUtil.isEmpty(runVip) || runVip.getChangeState() != YesOrNoEnum.YES.getValue()){
+        if(ObjectUtil.isEmpty(runVip) || runVip.getWithdrawState() != YesOrNoEnum.YES.getValue()){
             throw new FebsException("请先升级会员");
         }
 
@@ -573,6 +583,8 @@
         /**
          *  减少碳币,增加进行中提现记录
          */
+        walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
+
         BigDecimal withdrawalAmount = withdrawalDto.getAmount().multiply(balanceToCoin).setScale(2, BigDecimal.ROUND_DOWN);
         BigDecimal fee = balanceToCoinPercent.multiply(withdrawalAmount).setScale(2, BigDecimal.ROUND_DOWN);
         BigDecimal withdrawalAmountReal = withdrawalAmount.subtract(fee);
@@ -585,9 +597,9 @@
         withdraw.setAmountFee(fee);
         withdraw.setName(mallMemberPayment.getBank());
         withdraw.setType(mallMemberPayment.getBankNo());
+        withdraw.setWithdrawTimes(withdrawalDto.getAmount());
         mallMemberWithdrawMapper.insert(withdraw);
 
-        walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
         this.runVipMoneyFlowAdd(
                 loginMember.getId(),
                 loginMember.getId(),

--
Gitblit v1.9.1