From be1dad48a522d05dadfc816209d0270548cbbc50 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 25 Jan 2024 23:21:10 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 0f41b1b..bf4b5ca 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
@@ -14,6 +14,8 @@
 import cc.mrbird.febs.mall.vo.*;
 import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
 import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.vip.entity.MallVipConfig;
+import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
@@ -74,6 +76,8 @@
     private final MallMemberCouponMapper mallMemberCouponMapper;
     private final MallGoodsMapper mallGoodsMapper;
 
+    private final MallVipConfigMapper mallVipConfigMapper;
+
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -126,7 +130,6 @@
         mallMember.setName(registerDto.getName());
         mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
-        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
         mallMember.setSex("男");
         mallMember.setBindPhone(registerDto.getAccount());
 
@@ -282,6 +285,10 @@
         mallMemberVo.setChildCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);
 
         MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
+
+        MallVipConfig mallVipConfig = mallVipConfigMapper.selectVipConfigByCode(mallMember.getLevel());
+
+        mallMemberVo.setVipInfo(mallVipConfig);
         mallMemberVo.setBalance(wallet.getBalance());
 //        mallMemberVo.setScore(wallet.getScore());
         mallMemberVo.setPrizeScore(wallet.getPrizeScore());
@@ -714,6 +721,13 @@
         if (apiXcxSaveInfoDto.getBirthday() != null) {
             mallMember.setBirthday(apiXcxSaveInfoDto.getBirthday());
         }
+
+        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
+        if (CollUtil.isNotEmpty(configs)) {
+            MallVipConfig mallVipConfig = configs.get(0);
+            mallMember.setLevel(mallVipConfig.getCode());
+        }
+
         mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
         this.baseMapper.updateById(mallMember);
         return new FebsResponse().success();

--
Gitblit v1.9.1