From 5a547e709d7ca95cb9b10107d600340b48e09ed2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 18:12:52 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index a02656c..34ce013 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -166,7 +166,6 @@
         member.setRefererId(registerDto.getRefererId());
         member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
         member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
-        member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
         member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
         member.setIsForce(1);
         member.setIsProfit(0);
@@ -174,9 +173,9 @@
         memberDao.insert(member);
 
         MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
-        memberSettingEntity.setSpread(BigDecimal.ONE);
-        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
-        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
+        memberSettingEntity.setSpread(BigDecimal.valueOf(0.5));
+        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(2));
+        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0085));
         memberSettingEntity.setMemberId(member.getId());
         memberSettingDao.insert(memberSettingEntity);
 
@@ -861,9 +860,11 @@
         List<MemberCoinInfoVo> arrayList = new ArrayList<>();
         if (CollUtil.isNotEmpty(selectByMap)) {
             for (PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
-                MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
-                memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
-                arrayList.add(memberCoinInfoVo);
+                if ("XCH".equals(platformSymbolsCoinEntity.getName()) || "USDT".equals(platformSymbolsCoinEntity.getName())) {
+                    MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
+                    memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
+                    arrayList.add(memberCoinInfoVo);
+                }
             }
         }
         memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
@@ -925,6 +926,7 @@
     }
 
     @Override
+    @Transactional
     public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
         //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
@@ -1097,7 +1099,11 @@
                 addressIn = address;
 			} else {
                 MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
-                addressIn = memberCoinAddressEntity.getAddress();
+                if(StrUtil.isEmpty(memberCoinAddressEntity.getAddress())){
+                    addressIn = selectMemberInfoByAccount.getInviteId();
+                }else{
+                    addressIn = memberCoinAddressEntity.getAddress();
+                }
             }
         	
             MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());

--
Gitblit v1.9.1