From 4e43b6496e163787ea7397ca422c9e081ac2857a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 15:42:32 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |  324 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 248 insertions(+), 76 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 795bc5c..658e0b7 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;
@@ -26,6 +28,7 @@
 import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyInDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
@@ -97,6 +100,9 @@
 
     @Resource
     MemberCoinAddressDao memberCoinAddressDao;
+    
+    @Resource
+    MemberCoinAddressInDao memberCoinAddressInDao;
 
     @Resource
     private CommonService commonservice;
@@ -106,6 +112,8 @@
 
     @Resource
     AppVersionDao appVersionDao;
+    @Resource
+    private MemberSettingDao memberSettingDao;
 
     @Resource
     private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
@@ -152,10 +160,17 @@
         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.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.0055));
+        memberSettingEntity.setMemberId(member.getId());
+        memberSettingDao.insert(memberSettingEntity);
 
         String inviteId = ShareCodeUtil.toSerialCode(member.getId());
         member.setInviteId(inviteId);
@@ -177,6 +192,15 @@
         member.setRefererIds(ids);
         memberDao.updateById(member);
 
+        MemberWalletContractSimulateEntity walletContractSimulate = new MemberWalletContractSimulateEntity();
+        walletContractSimulate.setMemberId(member.getId());
+        walletContractSimulate.setAvailableBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+        walletContractSimulate.setTotalBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+        walletContractSimulate.setFrozenBalance(AppContants.INIT_MONEY);
+        walletContractSimulate.setBorrowedFund(AppContants.INIT_MONEY);
+        walletContractSimulate.setWalletCode(CoinTypeEnum.USDT.name());
+        memberWalletContractSimulateDao.insert(walletContractSimulate);
+
         //初始化合约钱包
         MemberWalletContractEntity walletContract = new MemberWalletContractEntity();
         walletContract.setMemberId(member.getId());
@@ -187,18 +211,8 @@
         walletContract.setWalletCode(CoinTypeEnum.USDT.name());
         memberWalletContractDao.insert(walletContract);
 
-        MemberWalletContractSimulateEntity walletContractSimulate = new MemberWalletContractSimulateEntity();
-        walletContractSimulate.setMemberId(member.getId());
-        walletContractSimulate.setAvailableBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
-        walletContractSimulate.setTotalBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
-        walletContractSimulate.setFrozenBalance(AppContants.INIT_MONEY);
-        walletContractSimulate.setBorrowedFund(AppContants.INIT_MONEY);
-        walletContractSimulate.setWalletCode(CoinTypeEnum.USDT.name());
-        memberWalletContractSimulateDao.insert(walletContractSimulate);
-
-
-        // 初始化币币钱包
         for (CoinTypeEnum coinTypeEnum : CoinTypeEnum.values()) {
+            // 初始化币币钱包
             MemberWalletCoinEntity walletCoin = new MemberWalletCoinEntity();
             walletCoin.setWalletCode(coinTypeEnum.name());
             walletCoin.setMemberId(member.getId());
@@ -330,12 +344,12 @@
         //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         MemberEntity member = memberDao.selectById(memberId);
-		if(MemberEntity.CERTIFY_STATUS_ING.equals(member.getCertifyStatus())) {
-			return Result.fail(MessageSourceUtils.getString("member_service_4000"));
-		}
+        if (MemberEntity.CERTIFY_STATUS_ING.equals(member.getCertifyStatus())) {
+            return Result.fail(MessageSourceUtils.getString("member_service_4000"));
+        }
         if (ObjectUtil.isNotEmpty(member)) {
 
-        	MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
+            MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
 
             if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
                 return Result.fail(MessageSourceUtils.getString("member_service_0055"));
@@ -365,13 +379,13 @@
 
             String idCardNo = memberAuthenticationDto.getIdCardNo();
             if (StrUtil.isBlank(idCardNo)) {
-            	return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
             }
             memberAuthenticationEntity.setIdcardNo(idCardNo);
             //同一个身份证号码不能重复实名认证
             int count = memberAuthenticationDao.findMemberbyIdCardNoCount(idCardNo);
             if (count > 0) {
-            	return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
             }
             if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
                     || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
@@ -383,14 +397,14 @@
             memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
 
             Map<String, Object> columnMap = new HashMap<>();
-        	columnMap.put("member_id", memberId);
-        	List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
-        	if(CollUtil.isEmpty(selectByMap)) {
-        		memberAuthenticationDao.insert(memberAuthenticationEntity);
-        	}else {
-        		memberAuthenticationEntity.setId(selectByMap.get(0).getId());
-        		memberAuthenticationDao.updateById(memberAuthenticationEntity);
-        	}
+            columnMap.put("member_id", memberId);
+            List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
+            if (CollUtil.isEmpty(selectByMap)) {
+                memberAuthenticationDao.insert(memberAuthenticationEntity);
+            } else {
+                memberAuthenticationEntity.setId(selectByMap.get(0).getId());
+                memberAuthenticationDao.updateById(memberAuthenticationEntity);
+            }
 
             member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
             member.setIdcardNo(idCardNo);
@@ -487,14 +501,14 @@
 
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("member_id", memberId);
-		List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
-				if(memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
-					return Result.fail(MessageSourceUtils.getString("member_service_0097"));
-				}
-			}
-		}
+        List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
+                if (memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
+                    return Result.fail(MessageSourceUtils.getString("member_service_0097"));
+                }
+            }
+        }
         String account = memberPaymethodDto.getAccount();
         String bank = memberPaymethodDto.getBank();
         String name = memberPaymethodDto.getName();
@@ -575,7 +589,7 @@
     @Override
     @Transactional
     public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
-    	//获取用户ID
+        //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         String phone = memberBindPhoneDto.getPhone();
         String code = memberBindPhoneDto.getCode();
@@ -588,13 +602,13 @@
             }
             Map<String, Object> columnMap = new HashMap<>();
             columnMap.put("phone", phone);
-			List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
-            if(CollUtil.isEmpty(selectByMap)) {
-            	member.setPhone(phone);
-            	memberDao.updateById(member);
-            	return Result.ok(MessageSourceUtils.getString("member_service_0014"));
-            }else {
-            	return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+            List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap);
+            if (CollUtil.isEmpty(selectByMap)) {
+                member.setPhone(phone);
+                memberDao.updateById(member);
+                return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+            } else {
+                return Result.fail(MessageSourceUtils.getString("member_service_1400"));
             }
         }
 
@@ -605,7 +619,7 @@
     @Transactional
     public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
 
-    	//获取用户ID
+        //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         String email = memberBindEmailDto.getEmail();
         String code = memberBindEmailDto.getCode();
@@ -614,15 +628,15 @@
         boolean flag = commonservice.verifyCode(email, code);
         if (ObjectUtil.isNotEmpty(member)) {
             if (flag) {
-            	Map<String, Object> columnMap = new HashMap<>();
+                Map<String, Object> columnMap = new HashMap<>();
                 columnMap.put("email", email);
-    			List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
-                if(CollUtil.isEmpty(selectByMap)) {
-                	member.setEmail(email);
+                List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap);
+                if (CollUtil.isEmpty(selectByMap)) {
+                    member.setEmail(email);
                     memberDao.updateById(member);
                     return Result.ok(MessageSourceUtils.getString("member_service_0018"));
-                }else {
-                	return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+                } else {
+                    return Result.fail(MessageSourceUtils.getString("member_service_1400"));
                 }
             }
         }
@@ -684,7 +698,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());
@@ -758,10 +772,10 @@
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("member_id", memberId);
         List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
-        if(CollUtil.isEmpty(selectByMap)) {
-        	memberPersonCenterInfoVo.setMemberPaymentMethod(0);
-        }else {
-        	memberPersonCenterInfoVo.setMemberPaymentMethod(1);
+        if (CollUtil.isEmpty(selectByMap)) {
+            memberPersonCenterInfoVo.setMemberPaymentMethod(0);
+        } else {
+            memberPersonCenterInfoVo.setMemberPaymentMethod(1);
         }
 
         if (StrUtil.isNotEmpty(member.getPhone())) {
@@ -822,16 +836,16 @@
         List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
 
 
-		List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
+        List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
         if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
             return Result.fail(MessageSourceUtils.getString("member_service_0087"));
         }
-        for(PlatformFeeSettingEntity platformFeeSettingEntity : feeSettingByTypeAndSymbolLable) {
-        	MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
-        	memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
-        	memberAvivableCoinInfoVo.setFee(platformFeeSettingEntity.getFeePrice());
-        	memberAvivableCoinInfoVo.setLable(platformFeeSettingEntity.getLable());
-        	arrayList.add(memberAvivableCoinInfoVo);
+        for (PlatformFeeSettingEntity platformFeeSettingEntity : feeSettingByTypeAndSymbolLable) {
+            MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
+            memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
+            memberAvivableCoinInfoVo.setFee(platformFeeSettingEntity.getFeePrice());
+            memberAvivableCoinInfoVo.setLable(platformFeeSettingEntity.getLable());
+            arrayList.add(memberAvivableCoinInfoVo);
         }
 
         return Result.ok(arrayList);
@@ -900,6 +914,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);
@@ -951,22 +966,179 @@
         return Result.ok("");
     }
 
+    @Override
+    public Result getAppVersionInfo() {
+        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+        Map<String, Object> columnMap = new HashMap<>();
+        List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
+        List<Object> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (AppVersionEntity appVersionEntity : selectByMap) {
+                AppVersionVo appVersionVo = new AppVersionVo();
+                if ("37059551".equals(memberEntity.getInviteId())) {
+                    appVersionVo.setAddress("www.baidu.com");
+                    appVersionVo.setType(appVersionEntity.getType());
+                    appVersionVo.setVersion(appVersionEntity.getVersion());
+                } else {
+                    appVersionVo.setAddress(appVersionEntity.getAddress());
+                    appVersionVo.setType(appVersionEntity.getType());
+                    appVersionVo.setVersion(appVersionEntity.getVersion());
+                }
+                arrayList.add(appVersionVo);
+            }
+        }
+        return Result.ok(arrayList);
+    }
+
+    @Override
+    public Result getPcVersionInfo() {
+        Map<String, Object> columnMap = new HashMap<>();
+        List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
+        List<Object> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (AppVersionEntity appVersionEntity : selectByMap) {
+                AppVersionVo appVersionVo = new AppVersionVo();
+                appVersionVo.setAddress(appVersionEntity.getAddress());
+                appVersionVo.setType(appVersionEntity.getType());
+                appVersionVo.setVersion(appVersionEntity.getVersion());
+                arrayList.add(appVersionVo);
+            }
+        }
+        return Result.ok(arrayList);
+    }
+
 	@Override
-	public Result getAppVersionInfo() {
-	Map<String, Object> columnMap = new HashMap<>();
-	List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
-	List<Object> arrayList = new ArrayList<>();
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(AppVersionEntity appVersionEntity : selectByMap) {
-					AppVersionVo appVersionVo = new AppVersionVo();
-					appVersionVo.setAddress(appVersionEntity.getAddress());
-					appVersionVo.setType(appVersionEntity.getType());
-					appVersionVo.setVersion(appVersionEntity.getVersion());
-					arrayList.add(appVersionVo);
-				}
+	public Result memberSubmitCoinApplyIn(@Valid MemberSubmitCoinApplyInDto memberSubmitCoinApplyInDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+        if (member.getCertifyStatus() != MemberEntity.CERTIFY_STATUS_Y) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0077"));
+        }
+        if (StrUtil.isEmpty(member.getTradePassword())) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0081"));
+        }
+        if (member.getTradePassword() == null) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0082"));
+        }
+        if (!member.getTradePassword().equals(SecureUtil.md5(memberSubmitCoinApplyInDto.getTradePassword()))) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0082"));
+        }
+
+        boolean flag = commonservice.verifyCode(memberSubmitCoinApplyInDto.getAccount(), memberSubmitCoinApplyInDto.getCode());
+        if (flag) {
+        	//获取到账地址
+        	String address = memberSubmitCoinApplyInDto.getAddress();
+			//根据账号获取会员信息
+        	MemberEntity selectMemberInfoByAccount = memberDao.selectMemberInfoByAccount(address);
+        	if(ObjectUtil.isEmpty(selectMemberInfoByAccount)) {
+        		return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+        	}
+        	Long memberInfoId = selectMemberInfoByAccount.getId();
+        	String symbol = memberSubmitCoinApplyInDto.getSymbol();
+        	
+        	Map<String, Object> columnMapAddress = new HashMap<>();
+        	columnMapAddress.put("member_id", memberInfoId);
+        	columnMapAddress.put("symbol", symbol);
+			List<MemberCoinAddressEntity> selectByMap2 = memberCoinAddressDao.selectByMap(columnMapAddress );
+			if(CollUtil.isEmpty(selectByMap2)) {
+				return Result.fail(MessageSourceUtils.getString("member_service_0087"));
 			}
-	return Result.ok(arrayList);
-	}
+			MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
+			String addressIn = memberCoinAddressEntity.getAddress();
+        	
+            MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());
+            BigDecimal availableBalance = walletCoin.getAvailableBalance();
+            BigDecimal coinNumber = memberSubmitCoinApplyInDto.getCoinNumber();
+            if (availableBalance.compareTo(BigDecimal.ZERO) > 0
+                    && availableBalance.compareTo(coinNumber) >= 0) {
+                //新增提币记录
+                MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
+                memberCoinWithdrawEntity.setAddress(addressIn);
+                memberCoinWithdrawEntity.setAmount(coinNumber);
+                memberCoinWithdrawEntity.setFeeAmount(BigDecimal.ZERO);
+                memberCoinWithdrawEntity.setSymbol(memberSubmitCoinApplyInDto.getSymbol());
+                memberCoinWithdrawEntity.setMemberId(memberId);
+                memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+                memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
+                memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
+                BigDecimal subtract = walletCoin.getAvailableBalance().subtract(coinNumber);
+                walletCoin.setAvailableBalance(subtract);
+                BigDecimal add = walletCoin.getFrozenBalance().add(coinNumber);
+                walletCoin.setFrozenBalance(add);
+                memberWalletCoinDao.updateById(walletCoin);
+
+                MemberAccountMoneyChange accountRecord = new MemberAccountMoneyChange();
+                accountRecord.setContent("提币");
+                accountRecord.setMemberId(memberId);
+                accountRecord.setAmount(coinNumber);
+                accountRecord.setWithdrawId(memberCoinWithdrawEntity.getId());
+                accountRecord.setStatus(MemberAccountMoneyChange.STATUS_WAIT_INTEGER);
+                accountRecord.setSymbol(memberSubmitCoinApplyInDto.getSymbol());
+                accountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
+                memberAccountMoneyChangeDao.insert(accountRecord);
+
+                ThreadPoolUtils.sendDingTalk(3);
+                return Result.ok(MessageSourceUtils.getString("member_service_0086"));
+            } else {
+                return Result.fail(MessageSourceUtils.getString("member_service_0005"));
+            }
+
+        } else {
+            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