From d071926dc82b991b762aaefea03c6d21621c415e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 18:18:36 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 6cb1639..0d97b5a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -935,7 +935,17 @@
         memberEntity.setPassword(SecureUtil.md5(newTransferPassword));
         dappMemberDao.updateById(memberEntity);
 
+//        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+//        redisUtils.del(redisKey);
+
         String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
         redisUtils.del(redisKey);
 
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -969,13 +979,23 @@
         memberEntity.setPassword(SecureUtil.md5(newPassword));
         dappMemberDao.updateById(memberEntity);
 
+//        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+//        redisUtils.del(redisKey);
+
         String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
         redisUtils.del(redisKey);
 
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }
     @Override
-    public BigDecimal updateLSYJYLFC(List<String> refererIdList,BigDecimal totalProfit,long id) {
+    public BigDecimal updateLSYJ(List<String> refererIdList,BigDecimal totalProfit,long id) {
         //计算盈利分成
         BigDecimal profitSharingTotal = BigDecimal.ZERO;
         if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
@@ -1187,10 +1207,17 @@
                     profitSharingTotal = profitSharingTotal.add(multiply);
                 }
             }
-
-
         }
+        return profitSharingTotal;
+    }
+
+    @Override
+    public BigDecimal updateYLFC(List<String> refererIdList, BigDecimal totalProfit, long id) {
         //计算流水佣金
+        BigDecimal profitSharingTotal = BigDecimal.ZERO;
+        if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
+            return profitSharingTotal;
+        }
         if(CollUtil.isNotEmpty(refererIdList)){
             String LEVEL_AIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_AIB.getCode());
             if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){

--
Gitblit v1.9.1