From e28f4db774879138d947b32f7e9f1ec8e5e56077 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 12 Jun 2026 15:00:03 +0800
Subject: [PATCH] feat(mall): 优化用户注册登录及订单管理功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   47 ++++++++++++++++++++++-------------------------
 1 files changed, 22 insertions(+), 25 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 760eb53..6f04506 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
@@ -65,30 +65,13 @@
     private final MallMemberWalletMapper mallMemberWalletMapper;
     private final ICommonService commonService;
     private final RedisUtils redisUtils;
-    private final MallOrderInfoMapper mallOrderInfoMapper;
-    private final MallShoppingCartMapper mallShoppingCartMapper;
     private final MallMoneyFlowMapper mallMoneyFlowMapper;
-    private final IApiMallMemberWalletService walletService;
-    private final MallMemberPaymentMapper mallMemberPaymentMapper;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final MallShopApplyMapper mallShopApplyMapper;
-    private final MallRegisterAppealMapper mallRegisterAppealMapper;
-    private final MallTeamLeaderMapper mallTeamLeaderMapper;
-    private final SpringContextHolder springContextHolder;
     private final MallAgentRecordMapper mallAgentRecordMapper;
-    private final IMallMoneyFlowService mallMoneyFlowService;
-    private final IMallMemberCollectionService mallMemberCollectionService;
-    private final IMallMemberFootprintService mallMemberFootprintService;
-    private final SalemanCouponMapper salemanCouponMapper;
     private final CouponGoodsMapper couponGoodsMapper;
-    private final MallGoodsCouponMapper mallGoodsCouponMapper;
     private final MallMemberCouponMapper mallMemberCouponMapper;
-    private final MallGoodsMapper mallGoodsMapper;
-
-    private final MallVipConfigMapper mallVipConfigMapper;
-    private final MallStoreMapper mallStoreMapper;
-    private final MallStoreItemMapper mallStoreItemMapper;
-    private final MallStoreMemberMapper mallStoreMemberMapper;
+    private final MallAddressInfoMapper mallAddressInfoMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -106,13 +89,26 @@
          * 验证两次密码是否一致
          */
         String password = registerDto.getPassword();
+        String confirmPassword = registerDto.getConfirmPassword();
+        if (!password.equals(confirmPassword)) {
+            throw new FebsException("The two passwords are inconsistent");
+        }
         mallMember = new MallMember();
-        mallMember.setName(account);
+        mallMember.setName(registerDto.getLastName() + registerDto.getFirstName());
+        mallMember.setPhone(registerDto.getPhoneNumber());
         mallMember.setEmail(registerDto.getAccount());
         mallMember.setPassword(SecureUtil.md5(password));
         mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
         this.baseMapper.insert(mallMember);
+
+        MallAddressInfo mallAddressInfo = new MallAddressInfo();
+        mallAddressInfo.setMemberId(mallMember.getId());
+        mallAddressInfo.setName(registerDto.getLastName());
+        mallAddressInfo.setFristName(registerDto.getFirstName());
+        mallAddressInfo.setPhone(registerDto.getPhoneNumber());
+        mallAddressInfoMapper.insert(mallAddressInfo);
+
 
         MallMemberWallet wallet = new MallMemberWallet();
         wallet.setBalance(BigDecimal.ZERO);
@@ -208,6 +204,7 @@
         MallMemberVo mallMemberVo = new MallMemberVo();
         mallMemberVo.setName(mallMember.getName());
         mallMemberVo.setEmail(mallMember.getEmail());
+        mallMemberVo.setPhoneNumber(mallMember.getPhone());
         mallMemberVo.setAvatar(mallMember.getAvatar());
         return new FebsResponse().success().data(mallMemberVo);
     }
@@ -220,10 +217,6 @@
         MallMember mallMember = this.baseMapper.selectById(memberId);
         if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
             mallMember.setName(modifyMemberInfoDto.getName());
-        }
-
-        if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
-            mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
         }
 
         this.baseMapper.updateById(mallMember);
@@ -400,8 +393,6 @@
 
     @Override
     public FebsResponse salesService() {
-        LoginUserUtil.getLoginUser().getId();
-
         MallSalesServiceVo mallSalesServiceVo = new MallSalesServiceVo();
 
         List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(
@@ -419,6 +410,12 @@
                 if (SalesServiceEnums.EMAIL.getCode().equals(dataDictionaryCustom.getCode())){
                     mallSalesServiceVo.setEmail(dataDictionaryCustom.getValue());
                 }
+                if (SalesServiceEnums.WORKINGHOURS.getCode().equals(dataDictionaryCustom.getCode())){
+                    mallSalesServiceVo.setWorkingHours(dataDictionaryCustom.getValue());
+                }
+                if (SalesServiceEnums.ADDRESS.getCode().equals(dataDictionaryCustom.getCode())){
+                    mallSalesServiceVo.setAddress(dataDictionaryCustom.getValue());
+                }
             }
 
         }

--
Gitblit v1.9.1