From 9011c14f44b022c64d653a803adb2710154261fb Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 23 Jun 2020 11:34:04 +0800 Subject: [PATCH] 20200623 代码提交 --- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 873 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 739 insertions(+), 134 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 af6f9ec..23f767f 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 @@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.digest.MD5; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xcong.excoin.common.LoginUserUtils; @@ -13,21 +12,40 @@ import com.xcong.excoin.common.enumerates.SymbolEnum; 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; 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; +import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto; +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.vo.MemberInfoVo; +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.service.MemberService; +import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao; +import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao; +import com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity; +import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity; import com.xcong.excoin.utils.MessageSourceUtils; import com.xcong.excoin.utils.RedisUtils; import com.xcong.excoin.utils.ShareCodeUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -50,6 +68,9 @@ private MemberWalletAgentDao memberWalletAgentDao; @Resource + MemberAccountMoneyChangeDao memberAccountMoneyChangeDao; + + @Resource private MemberWalletContractDao memberWalletContractDao; @Resource @@ -57,12 +78,36 @@ @Resource private MemberLevelRateDao memberLevelRateDao; - + @Resource MemberAuthenticationDao memberAuthenticationDao; - - @Autowired + + @Resource RedisUtils redisUtils; + + @Resource + MemberPaymentMethodDao memberPaymentMethodDao; + + @Resource + PlatformSymbolsCoinDao platformSymbolsCoinDao; + + @Resource + PlatformFeeSettingDao platformFeeSettingDao; + + @Resource + MemberCoinAddressDao memberCoinAddressDao; + + @Resource + private CommonService commonservice; + + @Resource + MemberCoinWithdrawDao memberCoinWithdrawDao; + + @Resource + AppVersionDao appVersionDao; + + @Resource + private MemberWalletContractSimulateDao memberWalletContractSimulateDao; @Transactional() @Override @@ -94,7 +139,7 @@ member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE); member.setAccountType(registerDto.getType()); member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL); - member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING); + member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT); member.setIsForce(0); member.setIsProfit(0); memberDao.insert(member); @@ -107,7 +152,7 @@ String ids = ""; while (!flag) { ids += ("," + parentId); - MemberEntity parentMember = memberDao.selectMemberInfoByRefererId(parentId); + MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId); if (parentMember == null) { break; } @@ -129,6 +174,15 @@ 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()) { @@ -149,7 +203,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()); @@ -158,144 +212,695 @@ 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 - public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) { - - int type = memberForgetPwdDto.getType(); - String phone = memberForgetPwdDto.getPhone(); - String email = memberForgetPwdDto.getEmail(); - String code = memberForgetPwdDto.getCode(); - String password = memberForgetPwdDto.getPassword(); - - Map<String, Object> hashMap = new HashMap<>(); - if(type == 1) { - hashMap.put("phone", phone); - }else { - hashMap.put("email", email); - } - 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 verificationCode = verificationCode(type, phone, code, email); - if(verificationCode) { - MemberEntity memberEntity = member.get(0); - memberEntity.setPassword(SecureUtil.md5(password)); - memberDao.updateById(memberEntity); - }else { - return Result.fail(MessageSourceUtils.getString("member_service_0045")); - } - if(type == 1) { - redisUtils.del("SMS_" + phone); - }else { - redisUtils.del("EMAIL_" + email); - } + + 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")); } - - /** - * 验证输入的验证码 - * @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); + @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); 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); + if (flag) { + memberEntity.setTradePassword(SecureUtil.md5(password)); + memberDao.updateById(memberEntity); + LoginUserUtils.resetAppLoginUser(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")); + } + 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 + MemberEntity memberEntity = LoginUserUtils.getAppLoginUser(); + + 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); + // 重置内存中的用户信息 + LoginUserUtils.resetAppLoginUser(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 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 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); + + if (ObjectUtil.isNotEmpty(member)) { + if (!commonservice.verifyCode(phone, code)) { + return Result.fail(MessageSourceUtils.getString("member_service_0013")); + } + member.setPhone(phone); + 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")); + } + } + 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); + } + return Result.fail(MessageSourceUtils.getString("member_service_0020")); + } + + @Override + public Result memberCoinAddressList(String symbol) { + //获取用户ID + Long memberId = LoginUserUtils.getAppLoginUser().getId(); + List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol, memberId); + 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 + @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")); + } + + @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() { + + 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")); + } + + MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo(); + memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance()); + + 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(""); + } + + @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); + } + } + return Result.ok(arrayList); + } } + + -- Gitblit v1.9.1