From cf850c5d93b6b1dcfcd6da06faeb3ea7e093ad91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 17:55:47 +0800
Subject: [PATCH] jufu商城

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |  175 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 156 insertions(+), 19 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 54eef92..355679b 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
@@ -1,10 +1,7 @@
 package cc.mrbird.febs.mall.service.impl;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.*;
 import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
@@ -39,6 +36,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author wzy
@@ -61,6 +59,8 @@
     private final MallShopApplyMapper mallShopApplyMapper;
     private final MallRegisterAppealMapper mallRegisterAppealMapper;
     private final MallMemberBankMapper mallMemberBankMapper;
+    private final MallMemberAlipayMapper mallMemberAlipayMapper;
+    private final MallMemberAuthMapper mallMemberAuthMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -69,18 +69,23 @@
     @Transactional(rollbackFor = Exception.class)
     @Override
     public FebsResponse register(RegisterDto registerDto) {
-        MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
+//        MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
+//        if (mallMember != null) {
+//            throw new FebsException("该账号已被占用");
+//        }
+        String accountLogin = registerDto.getAccountLogin();
+        MallMember mallMember = this.baseMapper.selectByAccountLogin(accountLogin);
         if (mallMember != null) {
             throw new FebsException("该账号已被占用");
         }
 
-        List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
-        if (CollUtil.isNotEmpty(mallMembers)) {
-            MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
-            if (registerAppeal == null || registerAppeal.getStatus() != 1) {
-                return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
-            }
-        }
+//        List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
+//        if (CollUtil.isNotEmpty(mallMembers)) {
+//            MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
+//            if (registerAppeal == null || registerAppeal.getStatus() != 1) {
+//                return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
+//            }
+//        }
 
         String account = registerDto.getAccount();
         if (!"admin".equals(registerDto.getRegistType())) {
@@ -92,6 +97,7 @@
         }
 
         mallMember = new MallMember();
+        mallMember.setAccountLogin(accountLogin);
         mallMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
 
         // 判断账号类型
@@ -162,7 +168,8 @@
     public FebsResponse toLogin(LoginDto loginDto) {
         String md5Pwd = SecureUtil.md5(loginDto.getPassword());
 
-        MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
+//        MallMember mallMember = this.baseMapper.selectInfoByAccountAndPwd(loginDto.getAccount(), md5Pwd);
+        MallMember mallMember = this.baseMapper.selectInfoByAccountLoginAndPwd(loginDto.getAccount(), md5Pwd);
         if (mallMember == null) {
             throw new FebsException("用户不存在或账号密码错误");
         }
@@ -196,7 +203,10 @@
 
     @Override
     public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
-        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
+        Long id = LoginUserUtil.getLoginUser().getId();
+        MallMember mallMember = this.baseMapper.selectById(id);
+
+//        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getPhone());
 //        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
         if (mallMember == null) {
             throw new FebsException("账号不存在");
@@ -227,10 +237,11 @@
         MallMember mallMember = this.baseMapper.selectById(id);
 
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
-
-        MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
-        if (referMember != null) {
-            mallMemberVo.setReferrerName(referMember.getName());
+        if(ObjectUtil.isNotEmpty(mallMember.getReferrerId())){
+            MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
+            if (referMember != null) {
+                mallMemberVo.setReferrerName(referMember.getName());
+            }
         }
 
         if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -252,6 +263,7 @@
         mallMemberVo.setPrizeScore(wallet.getPrizeScore());
         mallMemberVo.setTotalScore(wallet.getTotalScore());
         mallMemberVo.setStar(wallet.getStar());
+        mallMemberVo.setVoucherCnt(wallet.getVoucherCnt());
         mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
         return new FebsResponse().success().data(mallMemberVo);
     }
@@ -365,6 +377,10 @@
         MallMember mallMember = this.baseMapper.selectInfoByAccount(transferDto.getAccount());
         if (mallMember == null) {
             throw new FebsException("用户不存在");
+        }
+        Integer insideWith = mallMember.getInsideWith() == null ? 2 :mallMember.getInsideWith();
+        if (1 != insideWith) {
+            throw new FebsException("功能升级中");
         }
 
         Long memberId = LoginUserUtil.getLoginUser().getId();
@@ -503,7 +519,7 @@
         }
 
         MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
-        commissionVo.setCommission(wallet.getCommission());
+        commissionVo.setCommission(wallet.getBalance());
         commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
         commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
         commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
@@ -559,6 +575,17 @@
         if (dic != null) {
             cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
         }
+        DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                GreenScoreEnum.VOUCHER_ON_OFF.getType(), GreenScoreEnum.VOUCHER_ON_OFF.getCode());
+        if(ObjectUtil.isNotEmpty(voucherOnOffDic)){
+            cashOutSettingVo.setVoucherOnOff(voucherOnOffDic.getValue());
+            DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                    GreenScoreEnum.VOUCHER_PERCENT.getType(), GreenScoreEnum.VOUCHER_PERCENT.getCode());
+            if(ObjectUtil.isNotEmpty(voucherPercentDic)){
+                cashOutSettingVo.setVoucherPercent(new BigDecimal(voucherPercentDic.getValue()));
+            }
+        }
+
         return cashOutSettingVo;
     }
 
@@ -613,6 +640,12 @@
         mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
         mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
         mallMemberBank.setPhone(updateMemberBankDto.getPhone());
+        mallMemberBank.setDigitalNo(updateMemberBankDto.getDigitalNo());
+        mallMemberBank.setBankName(updateMemberBankDto.getBankName());
+        mallMemberBank.setSubbranchName(updateMemberBankDto.getSubbranchName());
+        mallMemberBank.setProvince(updateMemberBankDto.getProvince());
+        mallMemberBank.setCity(updateMemberBankDto.getCity());
+        mallMemberBank.setSkhh(updateMemberBankDto.getSkhh());
         mallMemberBankMapper.updateById(mallMemberBank);
         return new FebsResponse().success();
     }
@@ -623,4 +656,108 @@
         mallMemberBankMapper.deleteById(id);
         return new FebsResponse().success();
     }
+
+    @Override
+    public FebsResponse findBankName() {
+        List<String> bankNameList = new ArrayList<>();
+        List<DataDictionaryCustom> typeBank = dataDictionaryCustomMapper.selectDicByType("TYPE_BANK");
+        if(CollUtil.isNotEmpty(typeBank)){
+            bankNameList = typeBank.stream().map(DataDictionaryCustom::getValue).collect(Collectors.toList());
+        }
+        return new FebsResponse().success().data(bankNameList);
+    }
+
+    @Override
+    public FebsResponse pwdForget(ForgetPwdDto forgetPwdDto) {
+        MallMember mallMember = this.baseMapper.selectInfoByAccountNew(forgetPwdDto.getAccountLogin(),forgetPwdDto.getPhone());
+        if(ObjectUtil.isEmpty(mallMember)){
+            throw new FebsException("账号不存在");
+        }
+
+        boolean b = commonService.verifyCode(forgetPwdDto.getAccount(), forgetPwdDto.getCode());
+        if (!b) {
+            throw new FebsException("验证码错误");
+        }
+
+        String pwd = SecureUtil.md5(forgetPwdDto.getPassword());
+        mallMember.setPassword(pwd);
+
+        this.baseMapper.updateById(mallMember);
+        return new FebsResponse().success().message("重置成功");
+    }
+
+    @Override
+    public FebsResponse addMemberAli(AddMemberAliDto addMemberAliDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        MallMemberAlipay mallMemberAlipay = new MallMemberAlipay();
+        mallMemberAlipay.setMemberId(member.getId());
+        mallMemberAlipay.setName(addMemberAliDto.getName());
+        mallMemberAlipay.setAliNum(addMemberAliDto.getAliNum());
+        mallMemberAlipay.setAliPic(addMemberAliDto.getAliPic());
+        mallMemberAlipayMapper.insert(mallMemberAlipay);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse delMemberAli(Long id) {
+        mallMemberAlipayMapper.deleteById(id);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse memberAliDetails(Long id) {
+        MemberAliVo memberAliVo = new MemberAliVo();
+        MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(id);
+        memberAliVo.setId(mallMemberAlipay.getId());
+        memberAliVo.setName(mallMemberAlipay.getName());
+        memberAliVo.setAliNum(mallMemberAlipay.getAliNum());
+        memberAliVo.setAliPic(mallMemberAlipay.getAliPic());
+        return new FebsResponse().success().data(memberAliVo);
+    }
+
+    @Override
+    public FebsResponse updateMemberAli(UpdateMemberAliDto updateMemberAliDto) {
+
+        MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(updateMemberAliDto.getId());
+        mallMemberAlipay.setName(updateMemberAliDto.getName());
+        mallMemberAlipay.setAliNum(updateMemberAliDto.getAliNum());
+        mallMemberAlipay.setAliPic(updateMemberAliDto.getAliPic());
+        mallMemberAlipayMapper.updateById(mallMemberAlipay);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse memberAliList(MemberAliListDto memberAliListDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        Page<MemberAliVo> page = new Page<>(memberAliListDto.getPageNum(), memberAliListDto.getPageSize());
+        memberAliListDto.setMemberId(member.getId());
+        IPage<MemberAliVo> pageResult = mallMemberAlipayMapper.memberAliListInPage(memberAliListDto, page);
+        return new FebsResponse().success().data(pageResult);
+    }
+
+    @Override
+    public FebsResponse memberAuth(MemberAuthDto memberAuthDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        List<MallMemberAuth> mallMemberAuthYes = mallMemberAuthMapper.selectByMemberIdAndStatus(member.getId(),2);
+        if(ObjectUtil.isNotEmpty(mallMemberAuthYes)){
+            throw new FebsException("已实名认证");
+        }
+        List<MallMemberAuth> mallMemberAuthIng = mallMemberAuthMapper.selectByMemberIdAndStatus(member.getId(),1);
+        if(ObjectUtil.isNotEmpty(mallMemberAuthIng)){
+            throw new FebsException("正在实名认证中");
+        }
+
+        MallMemberAuth mallMemberAuth = new MallMemberAuth();
+        mallMemberAuth.setName(memberAuthDto.getName());
+        mallMemberAuth.setCardNum(memberAuthDto.getCardNum());
+        mallMemberAuth.setCardFront(memberAuthDto.getCardFront());
+        mallMemberAuth.setCardBack(memberAuthDto.getCardBack());
+        mallMemberAuth.setStatus(2);
+        mallMemberAuthMapper.insert(mallMemberAuth);
+
+        MallMember mallMember = this.baseMapper.selectById(member.getId());
+        mallMember.setIsAuth(1);
+        this.baseMapper.updateById(mallMember);
+        return new FebsResponse().success();
+    }
 }

--
Gitblit v1.9.1