From c326372b71da84c449b6097af5e281cd6fb46e2c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 Jun 2020 15:41:35 +0800
Subject: [PATCH] 20200608  代码提交

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 1136 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 643 insertions(+), 493 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 afcf057..928582a 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
@@ -13,6 +13,8 @@
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.common.system.dto.RegisterDto;
 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.member.dao.*;
 import com.xcong.excoin.modules.member.entity.*;
 import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -23,8 +25,11 @@
 import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
 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.MemberUpdatePwdDto;
 import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
+import com.xcong.excoin.modules.member.parameter.vo.*;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -48,6 +53,7 @@
 import com.xcong.excoin.utils.ShareCodeUtil;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -75,6 +81,9 @@
     private MemberWalletAgentDao memberWalletAgentDao;
 
     @Resource
+    MemberAccountMoneyChangeDao memberAccountMoneyChangeDao;
+
+    @Resource
     private MemberWalletContractDao memberWalletContractDao;
 
     @Resource
@@ -82,31 +91,34 @@
 
     @Resource
     private MemberLevelRateDao memberLevelRateDao;
-    
+
     @Resource
     MemberAuthenticationDao memberAuthenticationDao;
-    
+
     @Resource
     RedisUtils redisUtils;
-    
+
     @Resource
     MemberPaymentMethodDao memberPaymentMethodDao;
-    
+
     @Resource
     PlatformSymbolsCoinDao platformSymbolsCoinDao;
-    
+
     @Resource
     PlatformFeeSettingDao platformFeeSettingDao;
-    
+
     @Resource
     MemberCoinAddressDao memberCoinAddressDao;
-    
+
     @Resource
     private CommonService commonservice;
-    
+
+    @Resource
+    MemberCoinWithdrawDao memberCoinWithdrawDao;
+
     @Resource
     private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
-    
+
     @Transactional()
     @Override
     public Result register(RegisterDto registerDto) {
@@ -150,7 +162,7 @@
         String ids = "";
         while (!flag) {
             ids += ("," + parentId);
-            MemberEntity parentMember = memberDao.selectMemberInfoByRefererId(parentId);
+            MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
             if (parentMember == null) {
                 break;
             }
@@ -174,12 +186,12 @@
 
         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);
+        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);
 
 
         // 初始化币币钱包
@@ -201,7 +213,7 @@
         memberWalletAgentDao.insert(walletAgent);
 
         // 初始化杠杆
-        for(SymbolEnum symbolEnum : SymbolEnum.values()) {
+        for (SymbolEnum symbolEnum : SymbolEnum.values()) {
             MemberLevelRateEntity levelRate = new MemberLevelRateEntity();
             levelRate.setMemberId(member.getId());
             levelRate.setSymbol(symbolEnum.getValue());
@@ -210,331 +222,340 @@
         return Result.ok("success");
     }
 
-	@Override
-	public Result getMemberInfo() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity memberEntity = memberDao.selectById(memberId);
-		MemberInfoVo memberInfoVo = new MemberInfoVo();
+    @Override
+    public Result getMemberInfo() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+        MemberInfoVo memberInfoVo = new MemberInfoVo();
         if (ObjectUtil.isNotEmpty(memberEntity)) {
-        	memberInfoVo.setPhone(memberEntity.getPhone());
-        	memberInfoVo.setInviteId(memberEntity.getInviteId());
+        	String email = memberEntity.getEmail();
+        	String phone = memberEntity.getPhone();
+        	if(StrUtil.isNotEmpty(phone)) {
+        		memberInfoVo.setPhone(phone);
+        	}else if(StrUtil.isNotEmpty(email)) {
+        		memberInfoVo.setPhone(email);
+        	}
+            
+            memberInfoVo.setInviteId(memberEntity.getInviteId());
         }
         return Result.ok(memberInfoVo);
     }
-	
-	@Override
-	@Transactional
-	public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
-		
-		int type = memberForgetPwdDto.getType();
-		String account = memberForgetPwdDto.getAccount();
-		String code = memberForgetPwdDto.getCode();
-		String password = memberForgetPwdDto.getPassword();
-		
-		Map<String, Object> hashMap = new HashMap<>();
-		if(type == 1) {
-			hashMap.put("phone", account);
-		}else {
-			hashMap.put("email", account);
-		}
-		List<MemberEntity> member = memberDao.selectByMap(hashMap);
-		if (CollUtil.isEmpty(member)) {
+
+    @Override
+    @Transactional
+    public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+
+        int type = memberForgetPwdDto.getType();
+        String account = memberForgetPwdDto.getAccount();
+        String code = memberForgetPwdDto.getCode();
+        String password = memberForgetPwdDto.getPassword();
+
+        Map<String, Object> hashMap = new HashMap<>();
+        if (type == 1) {
+            hashMap.put("phone", account);
+        } else {
+            hashMap.put("email", account);
+        }
+        List<MemberEntity> member = memberDao.selectByMap(hashMap);
+        if (CollUtil.isEmpty(member)) {
             return Result.fail(MessageSourceUtils.getString("member_service_0047"));
         }
-		
-		boolean flag = commonservice.verifyCode(account, code);
-		if(flag) {
-			MemberEntity memberEntity = member.get(0);
-			memberEntity.setPassword(SecureUtil.md5(password));
-			memberDao.updateById(memberEntity);
-		}else {
-			return Result.fail(MessageSourceUtils.getString("member_service_0045"));
-		}
+
+        boolean flag = commonservice.verifyCode(account, code);
+        if (flag) {
+            MemberEntity memberEntity = member.get(0);
+            memberEntity.setPassword(SecureUtil.md5(password));
+            memberDao.updateById(memberEntity);
+        } else {
+            return Result.fail(MessageSourceUtils.getString("member_service_0045"));
+        }
         return Result.ok(MessageSourceUtils.getString("member_service_0048"));
     }
-	
-	@Override
-	@Transactional
-	public Result memberUpdatePwd(@Valid MemberUpdatePwdDto memberUpdatePwdDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity memberEntity = memberDao.selectById(memberId);
-		
-		String code = memberUpdatePwdDto.getCode();
-		String password = memberUpdatePwdDto.getPassword();
-		String phone = memberUpdatePwdDto.getPhone();
-		String email = memberUpdatePwdDto.getEmail();
-		int type = memberUpdatePwdDto.getType();
-		boolean verificationCode = verificationCode(type, phone, code, email);
-		if(verificationCode) {
-			memberEntity.setPassword(SecureUtil.md5(password));
-			memberDao.updateById(memberEntity);
-		}else {
-			return Result.fail(MessageSourceUtils.getString("member_service_0041"));
-		}
+
+    @Override
+    @Transactional
+    public Result memberUpdatePwd(@Valid MemberUpdatePwdDto memberUpdatePwdDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+
+        String code = memberUpdatePwdDto.getCode();
+        String password = memberUpdatePwdDto.getPassword();
+        String phone = memberUpdatePwdDto.getPhone();
+        String email = memberUpdatePwdDto.getEmail();
+        int type = memberUpdatePwdDto.getType();
+        boolean verificationCode = verificationCode(type, phone, code, email);
+        if (verificationCode) {
+            memberEntity.setPassword(SecureUtil.md5(password));
+            memberDao.updateById(memberEntity);
+        } else {
+            return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+        }
         return Result.ok(MessageSourceUtils.getString("member_service_0040"));
     }
-	
-	/**
-	 * 验证输入的验证码
-	 * @param type   验证类型1:电话2:邮箱
-	 * @param phone		
-	 * @param email
-	 * @param code		验证码
-	 * @return
-	 */
-	private boolean verificationCode(Integer type,String phone,String code,String email) {
-		boolean verificationCode = false;
-		if(type == 1) {
-			String smsCode = redisUtils.get("SMS_" + phone) + "";
-			if(code.equals(smsCode)) {
-				verificationCode = true;
-			}
-		}else {
-			String emailCode = redisUtils.get("EMAIL_" + email) + "";
-			if(code.equals(emailCode)) {
-				verificationCode = true;
-			}
-		}
-		return verificationCode;
-	}
 
-	@Override
-	@Transactional
-	public Result memberAuthentication(@Valid MemberAuthenticationDto memberAuthenticationDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
+    /**
+     * 验证输入的验证码
+     *
+     * @param type  验证类型1:电话2:邮箱
+     * @param phone
+     * @param email
+     * @param code  验证码
+     * @return
+     */
+    private boolean verificationCode(Integer type, String phone, String code, String email) {
+        boolean verificationCode = false;
+        if (type == 1) {
+            String smsCode = redisUtils.get("SMS_" + phone) + "";
+            if (code.equals(smsCode)) {
+                verificationCode = true;
+            }
+        } else {
+            String emailCode = redisUtils.get("EMAIL_" + email) + "";
+            if (code.equals(emailCode)) {
+                verificationCode = true;
+            }
+        }
+        return verificationCode;
+    }
+
+    @Override
+    @Transactional
+    public Result memberAuthentication(@Valid MemberAuthenticationDto memberAuthenticationDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
         if (ObjectUtil.isNotEmpty(member)) {
-            	MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
-                if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0055"));
-                }
-                if (MemberEntity.CERTIFY_STATUS_ING == member.getCertifyStatus()) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0056"));
-                }
-                memberAuthenticationEntity.setMemberId(memberId);
-                
-                if (StrUtil.isBlank(memberAuthenticationDto.getNation())) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0057"));
-                }
-                memberAuthenticationEntity.setNation(memberAuthenticationDto.getNation());
-                
-                if (StrUtil.isBlank(memberAuthenticationDto.getFirstName())) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0058"));
-                }
-                memberAuthenticationEntity.setFirstName(memberAuthenticationDto.getFirstName());
-                
-                if (StrUtil.isBlank(memberAuthenticationDto.getSecondName())) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0059"));
-                }
-                memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
+            MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
+            if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0055"));
+            }
+            if (MemberEntity.CERTIFY_STATUS_ING == member.getCertifyStatus()) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0056"));
+            }
+            memberAuthenticationEntity.setMemberId(memberId);
 
-                String idCardNo = memberAuthenticationDto.getIdCardNo();
-                if (StrUtil.isBlank(idCardNo)) {
-                    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"));
-                }
-                if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront()) 
-                		|| StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse()) 
-                		|| StrUtil.isBlank(memberAuthenticationDto.getIdCardImage())) {
-                    return Result.fail(MessageSourceUtils.getString("member_service_0061"));
-                }
-                memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
-                memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
-                memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
-                memberAuthenticationDao.insert(memberAuthenticationEntity);
-                
-                member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
-                member.setIdcardNo(idCardNo);
-                memberDao.updateById(member);
-                /**
-                 *  TODO dingtalk
-                 
-                Constant.excutor.execute(new Runnable() {
-					@Override
-					public void run() {
-						DingTalkUtils.sendActionCard(4);
-					}
-				});*/
-                return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+            if (StrUtil.isBlank(memberAuthenticationDto.getNation())) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0057"));
+            }
+            memberAuthenticationEntity.setNation(memberAuthenticationDto.getNation());
+
+            if (StrUtil.isBlank(memberAuthenticationDto.getFirstName())) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0058"));
+            }
+            memberAuthenticationEntity.setFirstName(memberAuthenticationDto.getFirstName());
+
+            if (StrUtil.isBlank(memberAuthenticationDto.getSecondName())) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0059"));
+            }
+            memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
+
+            String idCardNo = memberAuthenticationDto.getIdCardNo();
+            if (StrUtil.isBlank(idCardNo)) {
+                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"));
+            }
+            if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
+                    || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
+                    || StrUtil.isBlank(memberAuthenticationDto.getIdCardImage())) {
+                return Result.fail(MessageSourceUtils.getString("member_service_0061"));
+            }
+            memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
+            memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
+            memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
+            memberAuthenticationDao.insert(memberAuthenticationEntity);
+
+            member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
+            member.setIdcardNo(idCardNo);
+            memberDao.updateById(member);
+            /**
+             *  TODO dingtalk
+
+             Constant.excutor.execute(new Runnable() {
+            @Override public void run() {
+            DingTalkUtils.sendActionCard(4);
+            }
+            });*/
+            return Result.ok(MessageSourceUtils.getString("member_service_0024"));
         }
         return Result.fail(MessageSourceUtils.getString("member_service_0063"));
     }
 
-	@Override
-	@Transactional
-	public Result memberUpdateTradePwd(@Valid MemberUpdateTradePwdDto memberUpdateTradePwdDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity memberEntity = memberDao.selectById(memberId);
-		
-		String code = memberUpdateTradePwdDto.getCode();
-		String password = memberUpdateTradePwdDto.getPassword();
-		String account = memberUpdateTradePwdDto.getAccount();
-		String phone = memberEntity.getPhone();
-		String email = memberEntity.getEmail();
-		int type = memberUpdateTradePwdDto.getType();
-		
-		//验证手机号或者邮箱是否是该账户绑定的手机号或者邮箱
-		if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type) && !phone.equals(account)) {
-			return Result.fail(MessageSourceUtils.getString("member_service_0041"));
-		}
-		if(MemberEntity.ACCOUNT_TYPE_EMAIL.equals(type) && !email.equals(account)) {
-			return Result.fail(MessageSourceUtils.getString("member_service_0041"));
-		}
-		
-		boolean flag = commonservice.verifyCode(account, code);
+    @Override
+    @Transactional
+    public Result memberUpdateTradePwd(@Valid MemberUpdateTradePwdDto memberUpdateTradePwdDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+
+        String code = memberUpdateTradePwdDto.getCode();
+        String password = memberUpdateTradePwdDto.getPassword();
+        String account = memberUpdateTradePwdDto.getAccount();
+        String phone = memberEntity.getPhone();
+        String email = memberEntity.getEmail();
+        int type = memberUpdateTradePwdDto.getType();
+
+        //验证手机号或者邮箱是否是该账户绑定的手机号或者邮箱
+        if (MemberEntity.ACCOUNT_TYPE_PHONE.equals(type) && !phone.equals(account)) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+        }
+        if (MemberEntity.ACCOUNT_TYPE_EMAIL.equals(type) && !email.equals(account)) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+        }
+
+        boolean flag = commonservice.verifyCode(account, code);
         if (flag) {
-        	memberEntity.setTradePassword(SecureUtil.md5(password));
-        	memberDao.updateById(memberEntity);
-        	return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+            memberEntity.setTradePassword(SecureUtil.md5(password));
+            memberDao.updateById(memberEntity);
+            return Result.ok(MessageSourceUtils.getString("member_service_0051"));
         }
         return Result.fail(MessageSourceUtils.getString("member_service_0045"));
-        
+
     }
 
-	@Override
-	@Transactional
-	public Result memberLogout() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity memberEntity = memberDao.selectById(memberId);
-         if (ObjectUtil.isEmpty(memberEntity)) {
-        	 return Result.fail(MessageSourceUtils.getString("member_service_0003")); 
-         }
-         
-         return Result.ok(MessageSourceUtils.getString("member_service_0071"));
+    @Override
+    @Transactional
+    public Result memberLogout() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+        if (ObjectUtil.isEmpty(memberEntity)) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0003"));
+        }
+        String token = LoginUserUtils.getAppLoginUserToken();
+        redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
+        SecurityContextHolder.clearContext();
+        return Result.ok(MessageSourceUtils.getString("member_service_0071"));
     }
 
-	@Override
-	@Transactional
-	public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity memberEntity = memberDao.selectById(memberId);
-		
-		String code = memberForgetPwdDto.getCode();
-		String password = memberForgetPwdDto.getPassword();
-		String account = memberForgetPwdDto.getAccount();
-		int type = memberForgetPwdDto.getType();
-		
-		boolean flag = commonservice.verifyCode(account, code);
-		if(flag) {
-			memberEntity.setTradePassword(SecureUtil.md5(password));
-			memberDao.updateById(memberEntity);
-		}else {
-			return Result.fail(MessageSourceUtils.getString("member_service_0015"));
-		}
-		
+    @Override
+    @Transactional
+    public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+
+        String code = memberForgetPwdDto.getCode();
+        String password = memberForgetPwdDto.getPassword();
+        String account = memberForgetPwdDto.getAccount();
+        int type = memberForgetPwdDto.getType();
+
+        boolean flag = commonservice.verifyCode(account, code);
+        if (flag) {
+            memberEntity.setTradePassword(SecureUtil.md5(password));
+            memberDao.updateById(memberEntity);
+        } else {
+            return Result.fail(MessageSourceUtils.getString("member_service_0015"));
+        }
+
         return Result.ok(MessageSourceUtils.getString("member_service_0068"));
     }
 
-	@Override
-	@Transactional
-	public Result memberAddPaymethod(@Valid MemberPaymethodDto memberPaymethodDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
-		
-		if(!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
-			return Result.fail(MessageSourceUtils.getString("member_service_0077"));
-		}
-		String account = memberPaymethodDto.getAccount();
-		String bank = memberPaymethodDto.getBank();
-		String name = memberPaymethodDto.getName();
-		String paymentQrcode = memberPaymethodDto.getPaymentQrcode();
-		String paymentType = memberPaymethodDto.getPaymentType();
-		String subBank = memberPaymethodDto.getSubBank();
-		MemberPaymentMethodEntity memberPaymentMethodEntity = new MemberPaymentMethodEntity();
-		memberPaymentMethodEntity.setMemberId(memberId);
-		memberPaymentMethodEntity.setAccount(account);
-		memberPaymentMethodEntity.setBank(bank);
-		memberPaymentMethodEntity.setName(name);
-		memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
-		memberPaymentMethodEntity.setPaymentType(paymentType);
-		memberPaymentMethodEntity.setSubBank(subBank);
-		memberPaymentMethodDao.insert(memberPaymentMethodEntity);
-		return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+    @Override
+    @Transactional
+    public Result memberAddPaymethod(@Valid MemberPaymethodDto memberPaymethodDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+
+        if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0077"));
+        }
+        String account = memberPaymethodDto.getAccount();
+        String bank = memberPaymethodDto.getBank();
+        String name = memberPaymethodDto.getName();
+        String paymentQrcode = memberPaymethodDto.getPaymentQrcode();
+        String paymentType = memberPaymethodDto.getPaymentType();
+        String subBank = memberPaymethodDto.getSubBank();
+        MemberPaymentMethodEntity memberPaymentMethodEntity = new MemberPaymentMethodEntity();
+        memberPaymentMethodEntity.setMemberId(memberId);
+        memberPaymentMethodEntity.setAccount(account);
+        memberPaymentMethodEntity.setBank(bank);
+        memberPaymentMethodEntity.setName(name);
+        memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
+        memberPaymentMethodEntity.setPaymentType(paymentType);
+        memberPaymentMethodEntity.setSubBank(subBank);
+        memberPaymentMethodDao.insert(memberPaymentMethodEntity);
+        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
     }
 
-	@Override
-	@Transactional
-	public Result memberDelPaymethod(@Valid MemberDelPaymethodDto memberDelPaymethodDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		Long id = memberDelPaymethodDto.getId();
-		Map<String,Object> columnMap = new HashMap<>();
-		columnMap.put("id", id);
-		columnMap.put("member_id", memberId);
-		memberPaymentMethodDao.deleteByMap(columnMap);
-		return Result.ok("success");
-	}
+    @Override
+    @Transactional
+    public Result memberDelPaymethod(@Valid MemberDelPaymethodDto memberDelPaymethodDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        Long id = memberDelPaymethodDto.getId();
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("id", id);
+        columnMap.put("member_id", memberId);
+        memberPaymentMethodDao.deleteByMap(columnMap);
+        return Result.ok("success");
+    }
 
-	@Override
-	public Result memberPaymethodDetail(long id) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberPaymentMethodEntity memberPaymentMethod = memberPaymentMethodDao.selectById(id);
-		
-		MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
-		memberPaymethodDetailVo.setAccount(memberPaymentMethod.getAccount());
-		memberPaymethodDetailVo.setBank(memberPaymentMethod.getBank());
-		memberPaymethodDetailVo.setMemberId(memberId);
-		memberPaymethodDetailVo.setName(memberPaymentMethod.getName());
-		memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethod.getPaymentQrcode());
-		memberPaymethodDetailVo.setPaymentType(memberPaymentMethod.getPaymentType());
-		memberPaymethodDetailVo.setSubBank(memberPaymentMethod.getSubBank());
-		
-		return Result.ok(memberPaymethodDetailVo);
-	}
+    @Override
+    public Result memberPaymethodDetail(long id) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberPaymentMethodEntity memberPaymentMethod = memberPaymentMethodDao.selectById(id);
 
-	@Override
-	public Result memberPaymethodDetailList() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		Map<String,Object> columnMap = new HashMap<>();
-		columnMap.put("member_id", memberId);
-		List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
-		List<MemberPaymethodDetailVo> arrayList = new ArrayList<>();
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
-				MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
-				memberPaymethodDetailVo.setId(memberPaymentMethodEntity.getId());
-				memberPaymethodDetailVo.setAccount(memberPaymentMethodEntity.getAccount());
-				memberPaymethodDetailVo.setBank(memberPaymentMethodEntity.getBank());
-				memberPaymethodDetailVo.setMemberId(memberId);
-				memberPaymethodDetailVo.setName(memberPaymentMethodEntity.getName());
-				memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
-				memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
-				memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
-				arrayList.add(memberPaymethodDetailVo);
-			}
-		}
-		
-		MemberPaymethodDetailListVo memberPaymethodDetailListVo = new MemberPaymethodDetailListVo();
-		memberPaymethodDetailListVo.setMemberPaymethodDetailVo(arrayList);
-		return Result.ok(memberPaymethodDetailListVo);
-	}
+        MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
+        memberPaymethodDetailVo.setAccount(memberPaymentMethod.getAccount());
+        memberPaymethodDetailVo.setBank(memberPaymentMethod.getBank());
+        memberPaymethodDetailVo.setMemberId(memberId);
+        memberPaymethodDetailVo.setName(memberPaymentMethod.getName());
+        memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethod.getPaymentQrcode());
+        memberPaymethodDetailVo.setPaymentType(memberPaymentMethod.getPaymentType());
+        memberPaymethodDetailVo.setSubBank(memberPaymentMethod.getSubBank());
 
-	@Override
-	@Transactional
-	public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		String phone = memberBindPhoneDto.getPhone();
-		String code = memberBindPhoneDto.getCode();
-		
-		MemberEntity member = memberDao.selectById(memberId);
-		String smsCode = redisUtils.get("SMS_" + phone) + "";
-		
-		if (ObjectUtil.isNotEmpty(member)) {
+        return Result.ok(memberPaymethodDetailVo);
+    }
+
+    @Override
+    public Result memberPaymethodDetailList() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+        List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
+        List<MemberPaymethodDetailVo> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
+                MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
+                memberPaymethodDetailVo.setId(memberPaymentMethodEntity.getId());
+                memberPaymethodDetailVo.setAccount(memberPaymentMethodEntity.getAccount());
+                memberPaymethodDetailVo.setBank(memberPaymentMethodEntity.getBank());
+                memberPaymethodDetailVo.setMemberId(memberId);
+                memberPaymethodDetailVo.setName(memberPaymentMethodEntity.getName());
+                memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
+                memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
+                memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
+                arrayList.add(memberPaymethodDetailVo);
+            }
+        }
+
+        MemberPaymethodDetailListVo memberPaymethodDetailListVo = new MemberPaymethodDetailListVo();
+        memberPaymethodDetailListVo.setMemberPaymethodDetailVo(arrayList);
+        return Result.ok(memberPaymethodDetailListVo);
+    }
+
+    @Override
+    @Transactional
+    public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        String phone = memberBindPhoneDto.getPhone();
+        String code = memberBindPhoneDto.getCode();
+
+        MemberEntity member = memberDao.selectById(memberId);
+        String smsCode = redisUtils.get("SMS_" + phone) + "";
+
+        if (ObjectUtil.isNotEmpty(member)) {
             if (StrUtil.isEmpty(smsCode)) {
                 return Result.fail(MessageSourceUtils.getString("member_service_0038"));
             }
@@ -545,213 +566,342 @@
             memberDao.updateById(member);
             return Result.ok(MessageSourceUtils.getString("member_service_0014"));
         }
-		
+
         return Result.fail(MessageSourceUtils.getString("member_service_0015"));
     }
 
-	@Override
-	@Transactional
-	public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
-		
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		String email = memberBindEmailDto.getEmail();
-		String code = memberBindEmailDto.getCode();
-				
-		MemberEntity member = memberDao.selectById(memberId);
-		boolean flag = commonservice.verifyCode(email, code);
-		if (ObjectUtil.isNotEmpty(member)) {
-		    if (flag) {
-		        member.setEmail(email);
-		        memberDao.updateById(member);
-		        return Result.ok(MessageSourceUtils.getString("member_service_0018"));
-		    }
+    @Override
+    @Transactional
+    public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
+
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        String email = memberBindEmailDto.getEmail();
+        String code = memberBindEmailDto.getCode();
+
+        MemberEntity member = memberDao.selectById(memberId);
+        boolean flag = commonservice.verifyCode(email, code);
+        if (ObjectUtil.isNotEmpty(member)) {
+            if (flag) {
+                member.setEmail(email);
+                memberDao.updateById(member);
+                return Result.ok(MessageSourceUtils.getString("member_service_0018"));
+            }
         }
         return Result.fail(MessageSourceUtils.getString("member_service_0019"));
     }
 
-	@Override
-	public Result memberCoinAddressCount() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		List<MemberCoinAddressCountVo> list = platformSymbolsCoinDao.selectCoinAddressCount(memberId);
-		MemberCoinAddressCountListVo memberCoinAddressCountListVo = new MemberCoinAddressCountListVo();
-		if(CollUtil.isNotEmpty(list)) {
-			memberCoinAddressCountListVo.setMemberCoinAddressCountVo(list);
-			return Result.ok(memberCoinAddressCountListVo);
-		}
+    @Override
+    public Result memberCoinAddressCount() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<MemberCoinAddressCountVo> list = platformSymbolsCoinDao.selectCoinAddressCount(memberId);
+        MemberCoinAddressCountListVo memberCoinAddressCountListVo = new MemberCoinAddressCountListVo();
+        if (CollUtil.isNotEmpty(list)) {
+            memberCoinAddressCountListVo.setMemberCoinAddressCountVo(list);
+            return Result.ok(memberCoinAddressCountListVo);
+        }
         return Result.fail(MessageSourceUtils.getString("member_service_0020"));
     }
 
-	@Override
-	public Result memberCoinAddressList(String symbol) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("member_id", memberId);
-		columnMap.put("symbol", symbol);
-		List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
-		MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
-		List<MemberCoinAddressVo> arrayList = new ArrayList<>();
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(MemberCoinAddressEntity memberCoinAddressEntity : selectByMap) {
-				MemberCoinAddressVo memberCoinAddressVo = new MemberCoinAddressVo();
-				memberCoinAddressVo.setId(memberCoinAddressEntity.getId());
-				memberCoinAddressVo.setAddress(memberCoinAddressEntity.getAddress());
-				memberCoinAddressVo.setIsBiyict(memberCoinAddressEntity.getIsBiyict());
-				memberCoinAddressVo.setMemberId(memberCoinAddressEntity.getMemberId());
-				memberCoinAddressVo.setPrivateKey(memberCoinAddressEntity.getPrivateKey());
-				memberCoinAddressVo.setSymbol(memberCoinAddressEntity.getSymbol());
-				memberCoinAddressVo.setLabel(memberCoinAddressEntity.getLabel());
-				memberCoinAddressVo.setSymbolscoinId(memberCoinAddressEntity.getSymbolscoinId());
-				arrayList.add(memberCoinAddressVo);
-			}
-		}
-		memberCoinAddressListVo.setMemberCoinAddressVo(arrayList);
-		
-		return Result.ok(memberCoinAddressListVo);
-	}
+    @Override
+    public Result memberCoinAddressList(String symbol) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+        columnMap.put("symbol", symbol);
+        List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
+        MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
+        List<MemberCoinAddressVo> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (MemberCoinAddressEntity memberCoinAddressEntity : selectByMap) {
+                MemberCoinAddressVo memberCoinAddressVo = new MemberCoinAddressVo();
+                memberCoinAddressVo.setId(memberCoinAddressEntity.getId());
+                memberCoinAddressVo.setAddress(memberCoinAddressEntity.getAddress());
+                memberCoinAddressVo.setIsBiyict(memberCoinAddressEntity.getIsBiyict());
+                memberCoinAddressVo.setMemberId(memberCoinAddressEntity.getMemberId());
+                memberCoinAddressVo.setPrivateKey(memberCoinAddressEntity.getPrivateKey());
+                memberCoinAddressVo.setSymbol(memberCoinAddressEntity.getSymbol());
+                memberCoinAddressVo.setLabel(memberCoinAddressEntity.getLabel());
+                memberCoinAddressVo.setSymbolscoinId(memberCoinAddressEntity.getSymbolscoinId());
+                arrayList.add(memberCoinAddressVo);
+            }
+        }
+        memberCoinAddressListVo.setMemberCoinAddressVo(arrayList);
 
-	@Override
-	@Transactional
-	public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
-		
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		String address = memberAddCoinAddressDto.getAddress();
-		String isBiyict = memberAddCoinAddressDto.getIsBiyict();
-		Long symbolscoinId = memberAddCoinAddressDto. getSymbolscoinId();
-		String remark = memberAddCoinAddressDto.getRemark();
-		
-		PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectById(symbolscoinId);
-		
-		MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
-		memberCoinAddressEntity.setAddress(address);
-		memberCoinAddressEntity.setMemberId(memberId);
-		memberCoinAddressEntity.setIsBiyict(isBiyict);
-		memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
-		memberCoinAddressEntity.setLabel(remark);
-		memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
-		
-		memberCoinAddressDao.insert(memberCoinAddressEntity);
-		
-	    return Result.ok(MessageSourceUtils.getString("member_service_0024"));
-	}
+        return Result.ok(memberCoinAddressListVo);
+    }
 
-	@Override
-	public Result memberSendCodeWay() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
-		MemberSendCodeWayVo memberSendCodeWayVo = new MemberSendCodeWayVo();
-		if(ObjectUtil.isNotEmpty(member)) {
-			memberSendCodeWayVo.setPhone(member.getPhone());
-			memberSendCodeWayVo.setEmail(member.getEmail());
-		}
-		return Result.ok(memberSendCodeWayVo);
-	}
+    @Override
+    @Transactional
+    public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
 
-	@Override
-	@Transactional
-	public Result memberDelCoinAddress(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
-		if(ObjectUtil.isNotEmpty(member)) {
-			Long id = memberDelCoinAddressDto.getId();
-			memberCoinAddressDao.deleteById(id);
-		}
-		return Result.ok("success");
-	}
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        String address = memberAddCoinAddressDto.getAddress();
+        String isBiyict = memberAddCoinAddressDto.getIsBiyict();
+        Long symbolscoinId = memberAddCoinAddressDto.getSymbolscoinId();
+        String remark = memberAddCoinAddressDto.getRemark();
 
-	@Override
-	public Result memberAuthenticationInfo() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
-		
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("member_id", memberId);
-		List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
-		
-		MemberAuthenticationInfoVo memberAuthnticationInfoVo = new MemberAuthenticationInfoVo();
-		memberAuthnticationInfoVo.setCertifyStatus(member.getCertifyStatus());
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(MemberAuthenticationEntity memberAuthenticationEntity : selectByMap) {
-				memberAuthnticationInfoVo.setFirstName(memberAuthenticationEntity.getFirstName());
-				memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
-				memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
-				memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
-			}
-		}
-		return Result.ok(memberAuthnticationInfoVo);
-	}
+        PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectById(symbolscoinId);
 
-	@Override
-	public Result memberPersonCenterInfo() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		MemberEntity member = memberDao.selectById(memberId);
-		
-		MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
-		if(StrUtil.isNotEmpty(member.getPhone())) {
-			memberPersonCenterInfoVo.setPhone(1);
-		}
-		memberPersonCenterInfoVo.setPhone(0);
-		
-		if(StrUtil.isNotEmpty(member.getEmail())) {
-			memberPersonCenterInfoVo.setEmail(1);
-		}
-		memberPersonCenterInfoVo.setEmail(0);
-		
-		if(StrUtil.isNotEmpty(member.getTradePassword())) {
-			memberPersonCenterInfoVo.setTradePassword(1);
-		}
-		memberPersonCenterInfoVo.setTradePassword(0);
-		
-		if(StrUtil.isNotEmpty(member.getTradeAgingSetting().toString())) {
-			memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
-		}
-		memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
-		
-		return Result.ok(memberPersonCenterInfoVo);
-	}
+        MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
+        memberCoinAddressEntity.setAddress(address);
+        memberCoinAddressEntity.setMemberId(memberId);
+        memberCoinAddressEntity.setIsBiyict(isBiyict);
+        memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
+        memberCoinAddressEntity.setLabel(remark);
+        memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
 
-	@Override
-	public Result memberCoinInfoList() {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
-		
-		MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
-		List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
-		List<MemberCoinInfoVo> arrayList = new ArrayList<>();
-		if(CollUtil.isNotEmpty(selectByMap)) {
-			for(PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
-				MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
-				memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
-				arrayList.add(memberCoinInfoVo);
-			}
-		}
-		memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
-		
-		return Result.ok(memberCoinInfoListVo);
-	}
+        memberCoinAddressDao.insert(memberCoinAddressEntity);
 
-	@Override
-	public Result memberAvivableCoinInfo(String symbol) {
-		//获取用户ID
-		Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+    }
+
+    @Override
+    public Result memberSendCodeWay() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+        MemberSendCodeWayVo memberSendCodeWayVo = new MemberSendCodeWayVo();
+        if (ObjectUtil.isNotEmpty(member)) {
+            memberSendCodeWayVo.setPhone(member.getPhone());
+            memberSendCodeWayVo.setEmail(member.getEmail());
+        }
+        return Result.ok(memberSendCodeWayVo);
+    }
+
+    @Override
+    @Transactional
+    public Result memberDelCoinAddress(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+        if (ObjectUtil.isNotEmpty(member)) {
+            Long id = memberDelCoinAddressDto.getId();
+            memberCoinAddressDao.deleteById(id);
+        }
+        return Result.ok("success");
+    }
+
+    @Override
+    public Result memberAuthenticationInfo() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("member_id", memberId);
+        List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
+
+        MemberAuthenticationInfoVo memberAuthnticationInfoVo = new MemberAuthenticationInfoVo();
+        memberAuthnticationInfoVo.setCertifyStatus(member.getCertifyStatus());
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (MemberAuthenticationEntity memberAuthenticationEntity : selectByMap) {
+                memberAuthnticationInfoVo.setFirstName(memberAuthenticationEntity.getFirstName());
+                memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
+                memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
+                memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
+            }
+        }
+        return Result.ok(memberAuthnticationInfoVo);
+    }
+
+    @Override
+    public Result memberPersonCenterInfo() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+
+        MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
+        if (StrUtil.isNotEmpty(member.getPhone())) {
+            memberPersonCenterInfoVo.setPhone(1);
+        } else {
+            memberPersonCenterInfoVo.setPhone(0);
+        }
+
+        if (StrUtil.isNotEmpty(member.getEmail())) {
+            memberPersonCenterInfoVo.setEmail(1);
+        } else {
+            memberPersonCenterInfoVo.setEmail(0);
+        }
+
+        if (StrUtil.isNotEmpty(member.getTradePassword())) {
+            memberPersonCenterInfoVo.setTradePassword(1);
+        } else {
+            memberPersonCenterInfoVo.setTradePassword(0);
+        }
+
+        Integer tradeAgingSetting = member.getTradeAgingSetting();
+        if (tradeAgingSetting != null && tradeAgingSetting == MemberPersonCenterInfoVo.PWD_NEED_FORVER) {
+            memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
+        } else {
+            memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
+        }
+
+        return Result.ok(memberPersonCenterInfoVo);
+    }
+
+    @Override
+    public Result memberCoinInfoList() {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+
+        MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
+        List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
+        List<MemberCoinInfoVo> arrayList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(selectByMap)) {
+            for (PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
+                MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
+                memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
+                arrayList.add(memberCoinInfoVo);
+            }
+        }
+        memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
+
+        return Result.ok(memberCoinInfoListVo);
+    }
+
+    @Override
+    public Result memberAvivableCoinInfo(String symbol) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
         MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
         if (ObjectUtil.isEmpty(walletCoin)) {
-        	  return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
         }
-          
+
         MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
         memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
-          
-        PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2,symbol);
+
+        PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2, symbol);
+        if (ObjectUtil.isEmpty(feeSetting)) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+        }
         memberAvivableCoinInfoVo.setFee(feeSetting.getFeePrice());
         return Result.ok(memberAvivableCoinInfoVo);
     }
 
+    @Override
+    public NeedMoneyMemberVo selectFriendRelationUserByMemberId(Long memberId) {
+        return memberDao.selectFriendRelationUserByMemberId(memberId);
+    }
+
+    @Override
+    public List<NeedMoneyMemberVo> selectAllNeedMoneyMember(List<String> list) {
+        return memberDao.selectAllNeedMoneyMember(list);
+    }
+
+    @Override
+    public MemberEntity selectMemberInfoByInviteId(String inviteId) {
+        return memberDao.selectMemberInfoByInviteId(inviteId);
+    }
+
+    @Override
+    @Transactional
+    public Result memberUpdateTradersPwdTime(MemberUpdateTradersPwdTimeDto memberUpdateTradersPwdTimeDto) {
+        //获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity member = memberDao.selectById(memberId);
+        member.setTradeAgingSetting(memberUpdateTradersPwdTimeDto.getTradeAgingSetting());
+        memberDao.updateById(member);
+        return Result.ok("success");
+    }
+
+    @Override
+    public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
+        //获取用户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(memberSubmitCoinApplyDto.getTradePassword()))) {
+            return Result.fail(MessageSourceUtils.getString("member_service_0082"));
+        }
+
+        boolean flag = commonservice.verifyCode(memberSubmitCoinApplyDto.getAccount(), memberSubmitCoinApplyDto.getCode());
+        if (flag) {
+            MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyDto.getSymbol());
+            BigDecimal availableBalance = walletCoin.getAvailableBalance();
+            BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber().add(memberSubmitCoinApplyDto.getFeeAmount());
+            if (availableBalance.compareTo(BigDecimal.ZERO) > 0
+                    && availableBalance.compareTo(coinNumber) > 0) {
+                //新增提币记录
+                MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
+                memberCoinWithdrawEntity.setAddress(memberSubmitCoinApplyDto.getAddress());
+                memberCoinWithdrawEntity.setAmount(coinNumber);
+                memberCoinWithdrawEntity.setFeeAmount(memberSubmitCoinApplyDto.getFeeAmount());
+                memberCoinWithdrawEntity.setSymbol(memberSubmitCoinApplyDto.getSymbol());
+                memberCoinWithdrawEntity.setMemberId(memberId);
+                memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+
+                Map<String, Object> columnMap = new HashMap<>();
+                columnMap.put("symbol", memberSubmitCoinApplyDto.getSymbol());
+                columnMap.put("address", memberSubmitCoinApplyDto.getAddress());
+                List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
+                if (CollUtil.isEmpty(selectByMap)) {
+                    memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+                } else {
+                    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(memberSubmitCoinApplyDto.getCoinNumber());
+                accountRecord.setStatus(MemberAccountMoneyChange.STATUS_WAIT_INTEGER);
+                accountRecord.setSymbol(memberSubmitCoinApplyDto.getSymbol());
+                accountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
+                memberAccountMoneyChangeDao.insert(accountRecord);
+                /**
+                 *  TODO dingtalk
+                 Constant.excutor.execute(new Runnable() {
+                @Override public void run() {
+                DingTalkUtils.sendActionCard(3);
+                }
+                });
+                 */
+                return Result.ok(MessageSourceUtils.getString("member_service_0086"));
+            } else {
+                return Result.fail(MessageSourceUtils.getString("order_service_0040"));
+            }
+
+        } else {
+            return Result.fail(MessageSourceUtils.getString("member_service_0039"));
+        }
+    }
+
+    @Override
+    public Result getMemberAccountInfo(String account, int type) {
+
+        Map<String, Object> hashMap = new HashMap<>();
+        if (type == 1) {
+            hashMap.put("phone", account);
+        } else {
+            hashMap.put("email", account);
+        }
+        List<MemberEntity> member = memberDao.selectByMap(hashMap);
+        if (CollUtil.isEmpty(member)) {
+            return Result.fail(MessageSourceUtils.getString("home_service_0003"));
+        }
+
+        return Result.ok("");
+    }
+
 }
+
+

--
Gitblit v1.9.1