From 96f1426be1f77c12a1b5a41f44ad45a698579356 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:26 +0800
Subject: [PATCH] 提币添加ERC和TRC区分

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 1 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 591f214..7a556bd 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
@@ -15,9 +15,11 @@
 import com.xcong.excoin.common.system.service.CommonService;
 import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
 import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
+import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
 import com.xcong.excoin.modules.member.dao.*;
 import com.xcong.excoin.modules.member.entity.*;
 import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
@@ -98,6 +100,9 @@
 
     @Resource
     MemberCoinAddressDao memberCoinAddressDao;
+    
+    @Resource
+    MemberCoinAddressInDao memberCoinAddressInDao;
 
     @Resource
     private CommonService commonservice;
@@ -157,12 +162,13 @@
         member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
         member.setIsForce(1);
         member.setIsProfit(0);
+        member.setContractPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
         memberDao.insert(member);
 
         MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
         memberSettingEntity.setSpread(BigDecimal.ONE);
         memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
-        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0030));
+        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
         memberSettingEntity.setMemberId(member.getId());
         memberSettingDao.insert(memberSettingEntity);
 
@@ -904,6 +910,7 @@
                 memberCoinWithdrawEntity.setFeeAmount(memberSubmitCoinApplyDto.getFeeAmount());
                 memberCoinWithdrawEntity.setSymbol(memberSubmitCoinApplyDto.getSymbol());
                 memberCoinWithdrawEntity.setMemberId(memberId);
+                memberCoinWithdrawEntity.setLabel(memberSubmitCoinApplyDto.getLable());
                 memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
 
                 Map<String, Object> columnMap = new HashMap<>();
@@ -1057,6 +1064,7 @@
                 memberCoinWithdrawEntity.setMemberId(memberId);
                 memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
                 memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
+                memberCoinWithdrawEntity.setLabel(memberSubmitCoinApplyInDto.getLable());
                 memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
                 BigDecimal subtract = walletCoin.getAvailableBalance().subtract(coinNumber);
                 walletCoin.setAvailableBalance(subtract);
@@ -1084,6 +1092,56 @@
             return Result.fail(MessageSourceUtils.getString("member_service_0039"));
         }
     }
+
+	@Override
+	public Result memberAddCoinAddressIn(@Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {
+
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        String address = memberAddCoinAddressDto.getAddress();
+        String remark = memberAddCoinAddressDto.getRemark();
+
+        MemberCoinAddressInEntity memberCoinAddressInEntity = new MemberCoinAddressInEntity();
+        memberCoinAddressInEntity.setAccount(address);
+        memberCoinAddressInEntity.setMemberId(memberId);
+        memberCoinAddressInEntity.setContent(remark);
+        memberCoinAddressInDao.insert(memberCoinAddressInEntity);
+        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+    }
+
+	@Override
+	public Result memberDelCoinAddressIn(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+        if (ObjectUtil.isNotEmpty(member)) {
+            Long id = memberDelCoinAddressDto.getId();
+            memberCoinAddressInDao.deleteById(id);
+        }
+        return Result.ok("success");
+    }
+
+	@Override
+	public Result memberCoinAddressInList() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+		List<MemberCoinAddressInEntity> selectByMap = memberCoinAddressInDao.selectByMap(columnMap );
+        List<MemberCoinAddressInListVo> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (MemberCoinAddressInEntity memberCoinAddressInEntity : selectByMap) {
+            	MemberCoinAddressInListVo memberCoinAddressInListVo = new MemberCoinAddressInListVo();
+                memberCoinAddressInListVo.setId(memberCoinAddressInEntity.getId());
+                memberCoinAddressInListVo.setAccount(memberCoinAddressInEntity.getAccount());
+                memberCoinAddressInListVo.setContent(memberCoinAddressInEntity.getContent());
+                arrayList.add(memberCoinAddressInListVo);
+            }
+        }
+        return Result.ok(arrayList);
+    }
+
 }
 
 

--
Gitblit v1.9.1