From 384d14ce56375402eb682bc231220926b74dda04 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 31 Aug 2023 10:11:40 +0800
Subject: [PATCH] 退款查询

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |  327 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 280 insertions(+), 47 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 100b886..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,12 +1,13 @@
 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.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;
+import cc.mrbird.febs.mall.conversion.MallMemberBankConversion;
 import cc.mrbird.febs.mall.conversion.MallMemberConversion;
+import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
 import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
@@ -34,10 +35,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author wzy
@@ -59,6 +58,9 @@
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final MallShopApplyMapper mallShopApplyMapper;
     private final MallRegisterAppealMapper mallRegisterAppealMapper;
+    private final MallMemberBankMapper mallMemberBankMapper;
+    private final MallMemberAlipayMapper mallMemberAlipayMapper;
+    private final MallMemberAuthMapper mallMemberAuthMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -67,27 +69,35 @@
     @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())) {
+            String code = registerDto.getCode();
+            boolean flags = commonService.verifyCode(account, code);
+            if (!flags) {
+                throw new FebsException("验证码错误");
             }
         }
 
-        String account = registerDto.getAccount();
-        String code = registerDto.getCode();
-        boolean flags = commonService.verifyCode(account, code);
-        if(!flags) {
-            throw new FebsException("验证码错误");
-        }
-
         mallMember = new MallMember();
+        mallMember.setAccountLogin(accountLogin);
         mallMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
 
         // 判断账号类型
@@ -110,7 +120,7 @@
         mallMember.setName(registerDto.getName());
         mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
         mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
-        mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+        mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
         mallMember.setSex("男");
         mallMember.setBindPhone(registerDto.getAccount());
 
@@ -158,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("用户不存在或账号密码错误");
         }
@@ -192,7 +203,11 @@
 
     @Override
     public FebsResponse forgetPwd(ForgetPwdDto forgetPwdDto) {
-        MallMember mallMember = this.baseMapper.selectInfoByAccount(forgetPwdDto.getAccount());
+        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("账号不存在");
         }
@@ -222,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())) {
@@ -245,6 +261,9 @@
         mallMemberVo.setBalance(wallet.getBalance());
         mallMemberVo.setScore(wallet.getScore());
         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);
     }
@@ -314,23 +333,12 @@
         MallMember mallMember = this.baseMapper.selectById(memberId);
 
         List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
-//        BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId());
-//        TeamListVo own = new TeamListVo();
-//        own.setCreatedTime(mallMember.getCreatedTime());
-//        own.setAmount(ownAmount);
-//        own.setName(mallMember.getName());
-//        own.setPhone(mallMember.getPhone());
-//        own.setInviteId(mallMember.getInviteId());
-//        own.setIsCurrent(1);
-//        own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId()));
-//        own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId()));
-//        own.setId(mallMember.getId());
 
         MyTeamVo myTeamVo = new MyTeamVo();
         myTeamVo.setTeam(list);
         myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
         myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
-        myTeamVo.setMyTeamCnt(list.size());
+        myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
         return new FebsResponse().success().data(myTeamVo);
     }
 
@@ -370,6 +378,10 @@
         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();
         MallMember loginMember = this.baseMapper.selectById(memberId);
@@ -386,12 +398,40 @@
             throw new FebsException("支付密码错误");
         }
 
-        walletService.reduceBalance(transferDto.getAmount(), memberId);
-        String orderNo = MallUtils.getOrderNum("T");
-        this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
+        DataDictionaryCustom cashOutSettingDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.CASHOUT_SETTING.getType(),
+                DataDictionaryEnum.CASHOUT_SETTING.getCode()
+        );
+        CashOutSettingVo cashOutSettingVo = JSONObject.parseObject(cashOutSettingDic.getValue(), CashOutSettingVo.class);
+        BigDecimal insideFee = cashOutSettingVo.getInsideFee().multiply(BigDecimal.valueOf(0.01));
+        //转账手续费
+        BigDecimal insideFeeAmount = transferDto.getAmount().multiply(insideFee).setScale(2, BigDecimal.ROUND_DOWN);
 
-        walletService.addBalance(transferDto.getAmount(), mallMember.getId());
-        this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
+        BigDecimal avaAmount = transferDto.getAmount().subtract(insideFeeAmount).setScale(2, BigDecimal.ROUND_DOWN);
+        walletService.reduceBalance(avaAmount, memberId);
+        String orderNo = MallUtils.getOrderNum("T");
+        this.addMoneyFlow(
+                memberId,
+                avaAmount.negate(),
+                MoneyFlowTypeEnum.TRANSFER.getValue(),
+                orderNo,
+                null,
+                null,
+                mallMember.getId(),
+                null,
+                FlowTypeEnum.BALANCE.getValue());
+
+        walletService.addBalance(avaAmount, mallMember.getId());
+        this.addMoneyFlow(
+                mallMember.getId(),
+                avaAmount,
+                MoneyFlowTypeEnum.TRANSFER.getValue(),
+                orderNo,
+                null,
+                null,
+                memberId,
+                null,
+                FlowTypeEnum.BALANCE.getValue());
     }
 
     @Override
@@ -434,7 +474,7 @@
         MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
         BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
 
-        BigDecimal canMoney = wallet.getBalance();
+        BigDecimal canMoney = wallet.getCommission();
         if (profit != null) {
             if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
                 canMoney = canMoney.subtract(profit);
@@ -479,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));
@@ -494,7 +534,7 @@
         MallShopApply hasApply = mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
         if (hasApply != null) {
             if (!hasApply.getStatus().equals(MallShopApply.APPLY_DISAGREE)) {
-                throw new FebsException("审核中或审核已通过");
+                throw new FebsException("请勿重复提交申请");
             }
         }
 
@@ -527,4 +567,197 @@
 
         mallRegisterAppealMapper.insert(isExist);
     }
+
+    @Override
+    public CashOutSettingVo cashOutSetting() {
+        CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode());
+        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;
+    }
+
+    @Override
+    public List<ShopListVo> findShopListVo(ShopListDto shopListDto) {
+        Page<MallShopApply> page = new Page<>(shopListDto.getPageNow(), shopListDto.getPageSize());
+
+        MallShopApply shopApply = new MallShopApply();
+        shopApply.setStatus(MallShopApply.APPLY_AGREE);
+        IPage<MallShopApply> pageResult = mallShopApplyMapper.selectShopApplyInPage(shopApply, page);
+
+        List<MallShopApply> list = pageResult.getRecords();
+        if (CollUtil.isEmpty(list)) {
+            list = new ArrayList<>();
+        }
+        return MallShopApplyConversion.INSTANCE.entitiesToVOs(list);
+    }
+
+    @Override
+    @Transactional
+    public FebsResponse addMemberBank(AddMemberBankDto addMemberBankDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        MallMemberBank mallMemberBank = MallMemberBankConversion.INSTANCE.dtoToentity(addMemberBankDto);
+        mallMemberBank.setMemberId(member.getId());
+        mallMemberBankMapper.insert(mallMemberBank);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse findMemberBankList(MemberBankListDto memberBankListDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
+        Page<MemberBankListVo> page = new Page<>(memberBankListDto.getPageNum(), memberBankListDto.getPageSize());
+        memberBankListDto.setMemberId(member.getId());
+        IPage<MemberBankListVo> pageResult = mallMemberBankMapper.findMemberBankListInPage(memberBankListDto, page);
+        return new FebsResponse().success().data(pageResult);
+    }
+
+    @Override
+    public FebsResponse findBankDetailsById(Long id) {
+        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id);
+        MemberBankListVo memberBankListVo = MallMemberBankConversion.INSTANCE.entityToVo(mallMemberBank);
+        return new FebsResponse().success().data(memberBankListVo);
+    }
+
+    @Override
+    @Transactional
+    public FebsResponse updateMemberBank(UpdateMemberBankDto updateMemberBankDto) {
+        Long id = updateMemberBankDto.getId();
+        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id);
+        mallMemberBank.setName(updateMemberBankDto.getName());
+        mallMemberBank.setIdType(updateMemberBankDto.getIdType());
+        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();
+    }
+
+    @Override
+    @Transactional
+    public FebsResponse delMemberBank(Long id) {
+        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