From a70577eb2258f67bde70e5f995c286c9aa5fb220 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 02:27:25 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 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 74fc6db..3578a7b 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
@@ -499,8 +499,8 @@
         }
 
         String token = IdUtil.simpleUUID();
-        redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity), 3600);
-        redisUtils.set(redisKey, token, 3600);
+        redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity));
+        redisUtils.set(redisKey, token);
         Map<String, Object> authInfo = new HashMap<>();
         authInfo.put("token", token);
         authInfo.put("rasToken", generateAsaToken(token));
@@ -818,7 +818,7 @@
                 if(DataDictionaryEnum.LEVEL_TM.getCode().equals(identity)){
                     apiMyTeammateInfoListVo.setLevelName("游客");
                 }else{
-                    apiMyTeammateInfoListVo.setLevelName("会员");
+                    apiMyTeammateInfoListVo.setLevelName("Member");
                 }
             }
         }
@@ -999,11 +999,39 @@
         }
         dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);
 
-        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "系统拨付", 9);
+        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "充值", 10);
         dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
         return new FebsResponse().success().message("操作成功");
     }
 
+    @Override
+    public List<AdminMemberIdentityVo> identitySetList() {
+        ArrayList<AdminMemberIdentityVo> objects = new ArrayList<>();
+        List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.LEVEL_AIB.getType());
+        if(CollUtil.isNotEmpty(dataDictionaryCustoms)){
+            for(DataDictionaryCustom dic :dataDictionaryCustoms){
+                if(!DataDictionaryEnum.LEVEL_TM.getCode().equals(dic.getCode())){
+                    AdminMemberIdentityVo adminMemberIdentityVo = new AdminMemberIdentityVo();
+                    adminMemberIdentityVo.setIdentityCode(dic.getCode());
+                    adminMemberIdentityVo.setIdentityValue(dic.getDescription());
+                    objects.add(adminMemberIdentityVo);
+                }
+            }
+        }
+        return objects;
+    }
+
+    @Override
+    public FebsResponse identitySet(DappMemberEntity memberEntity) {
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberEntity.getId());
+        if(ObjectUtil.isEmpty(dappMemberEntity)){
+            return new FebsResponse().fail().message("会员信息不存在");
+        }
+        dappMemberEntity.setIdentity(memberEntity.getIdentity());
+        dappMemberDao.updateById(dappMemberEntity);
+        return new FebsResponse().success();
+    }
+
     public String generateAsaToken(String token) {
         RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
         return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);

--
Gitblit v1.9.1