From c6e21fc6d22a2168fb21a662c16c60fab05a7d75 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 15:28:47 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 6df59ff..f8ca450 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -65,7 +65,7 @@
     private final PlatformBannerMapper platformBannerMapper;
     private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
     private final DappBankDao dappBankDao;
-    private final DappMemberService dappMemberService;
+//    private final DappMemberService dappMemberService;
     private final DappMemberAddressDao dappMemberAddressDao;
 
     private final RedisTemplate<String, Object> redisTemplate;
@@ -600,12 +600,26 @@
         DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
         if(ObjectUtil.isEmpty(dappMemberEntity)){
             memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
+            memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+            memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
         }else{
             BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
+            BigDecimal frozenAmount = dappWalletCoinEntity.getFrozenAmount();
+            BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
             if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
                 memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
             }else{
                 memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
+            }
+            if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
+                memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
+            }else{
+                memberInfoVo.setFrozenAmount(frozenAmount.setScale(2,BigDecimal.ROUND_DOWN));
+            }
+            if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
+                memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+            }else{
+                memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
             }
         }
         return memberInfoVo;
@@ -803,6 +817,7 @@
                 ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
                 apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
                 apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
+                apiAmountTypeVos.add(apiAmountTypeVo);
             }
         }
         return new FebsResponse().success().data(apiAmountTypeVos);
@@ -818,12 +833,10 @@
     }
 
     @Override
-    public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
+    public FebsResponse getBankListInPage(ApiBankListDto apiBankListDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
-        Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
-        apiBankListDto.setMemberId(member.getId());
-        IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
-        return apiBankListVoIPage;
+        List<ApiBankListVo> apiBankListVos = dappBankDao.selectBankListByMemberId(member.getId());
+        return new FebsResponse().success().data(apiBankListVos);
     }
 
     @Override
@@ -833,7 +846,7 @@
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
         }
         //验证资金密码
-        Boolean aBoolean = dappMemberService.validateTransferCode(addBankDto.getTransferCode(), member.getId());
+        Boolean aBoolean = validateTransferCodeInside(addBankDto.getTransferCode(), member.getId());
         if(!aBoolean){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
         }
@@ -854,6 +867,22 @@
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }
 
+    private Boolean validateTransferCodeInside(String transferCode, Long memberId) {
+        boolean flag = false;
+        DappMemberEntity member = dappMemberDao.selectById(memberId);
+        if (ObjectUtil.isEmpty(member)) {
+            return flag;
+        }
+        String transferCodeMember = member.getTransferCode();
+        String transferCodeMd5Pwd = SecureUtil.md5(transferCode);
+        if(transferCodeMd5Pwd.equals(transferCodeMember)){
+            flag = true;
+        }else{
+            return flag;
+        }
+        return flag;
+    }
+
     @Override
     public FebsResponse getBankListInPage() {
         DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -868,7 +897,7 @@
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
         }
         //验证资金密码
-        Boolean aBoolean = dappMemberService.validateTransferCode(apiAddAddressDto.getTransferCode(), member.getId());
+        Boolean aBoolean = validateTransferCodeInside(apiAddAddressDto.getTransferCode(), member.getId());
         if(!aBoolean){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
         }
@@ -878,6 +907,7 @@
         }
         DappMemberAddress dappMemberAddress = new DappMemberAddress();
         dappMemberAddress.setType(apiAddAddressDto.getType());
+        dappMemberAddress.setMemberId(member.getId());
         dappMemberAddress.setAddress(apiAddAddressDto.getAddress());
         dappMemberAddressDao.insert(dappMemberAddress);
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));

--
Gitblit v1.9.1