From b34be29401abfe68c05e7e47af2888f0a54ba12f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 31 Jul 2020 15:34:12 +0800
Subject: [PATCH] 20200731  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 3501806..fc96eb1 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
@@ -149,12 +149,13 @@
 
         member.setRefererId(registerDto.getRefererId());
         member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
-        member.setAccountType(registerDto.getType());
+        member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
         member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
         member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
-        member.setIsForce(0);
+        member.setIsForce(1);
         member.setIsProfit(0);
-        member.setSpread(BigDecimal.ZERO);
+        member.setSpread(BigDecimal.ONE);
+        member.setClosingSpread(BigDecimal.ONE);
         memberDao.insert(member);
 
         String inviteId = ShareCodeUtil.toSerialCode(member.getId());
@@ -223,7 +224,7 @@
             memberLevelRateDao.insert(levelRate);
         }
 
-        return Result.ok(MessageSourceUtils.getString("member_service_0048"));
+        return Result.ok(MessageSourceUtils.getString("home_service_0009"));
     }
 
     @Override
@@ -684,7 +685,7 @@
         MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
         memberCoinAddressEntity.setAddress(address);
         memberCoinAddressEntity.setMemberId(memberId);
-        memberCoinAddressEntity.setIsBiyict(isBiyict);
+        memberCoinAddressEntity.setIsBiyict(MemberCoinAddressEntity.IS_BIYICT_NO);
         memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
         memberCoinAddressEntity.setLabel(remark);
         memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
@@ -900,6 +901,7 @@
                 Map<String, Object> columnMap = new HashMap<>();
                 columnMap.put("symbol", memberSubmitCoinApplyDto.getSymbol());
                 columnMap.put("address", memberSubmitCoinApplyDto.getAddress());
+                columnMap.put("is_biyict", MemberCoinAddressEntity.IS_BIYICT_YES);
                 List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
                 if (CollUtil.isEmpty(selectByMap)) {
                     memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
@@ -917,6 +919,7 @@
                 accountRecord.setContent("提币");
                 accountRecord.setMemberId(memberId);
                 accountRecord.setAmount(coinNumber);
+                accountRecord.setWithdrawId(memberCoinWithdrawEntity.getId());
                 accountRecord.setStatus(MemberAccountMoneyChange.STATUS_WAIT_INTEGER);
                 accountRecord.setSymbol(memberSubmitCoinApplyDto.getSymbol());
                 accountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);

--
Gitblit v1.9.1