From 412d065591cd71821f2d07d23b64dc9fcde2554d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 10:52:49 +0800
Subject: [PATCH] 中英文
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 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 d5a5246..8cba44e 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
@@ -134,9 +134,11 @@
// if (StrUtil.isBlank(registerDto.getRefererId())) {
// registerDto.setRefererId(AppContants.SYSTEM_REFERER);
// }
- MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
- if (isExist == null) {
- return Result.fail("推荐人不存在");
+ if (!registerDto.getRefererId().equals(AppContants.SYSTEM_REFERER)) {
+ MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
+ if (isExist == null) {
+ return Result.fail("推荐人不存在");
+ }
}
member.setRefererId(registerDto.getRefererId());
@@ -325,13 +327,9 @@
return Result.fail(MessageSourceUtils.getString("member_service_4000"));
}
if (ObjectUtil.isNotEmpty(member)) {
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("member_id", memberId);
+
MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
- List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
- if(CollUtil.isNotEmpty(selectByMap)) {
- memberAuthenticationEntity = selectByMap.get(0);
- }
+
if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
return Result.fail(MessageSourceUtils.getString("member_service_0055"));
}
@@ -376,7 +374,16 @@
memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
- memberAuthenticationDao.insert(memberAuthenticationEntity);
+
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
+ if(CollUtil.isEmpty(selectByMap)) {
+ memberAuthenticationDao.insert(memberAuthenticationEntity);
+ }else {
+ memberAuthenticationEntity.setId(selectByMap.get(0).getId());
+ memberAuthenticationDao.updateById(memberAuthenticationEntity);
+ }
member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
member.setIdcardNo(idCardNo);
@@ -811,15 +818,22 @@
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)) {
+ List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
+
+
+ List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
+ if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
return Result.fail(MessageSourceUtils.getString("member_service_0087"));
}
- memberAvivableCoinInfoVo.setFee(feeSetting.getFeePrice());
- return Result.ok(memberAvivableCoinInfoVo);
+ for(PlatformFeeSettingEntity platformFeeSettingEntity : feeSettingByTypeAndSymbolLable) {
+ MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
+ memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
+ memberAvivableCoinInfoVo.setFee(platformFeeSettingEntity.getFeePrice());
+ memberAvivableCoinInfoVo.setLable(platformFeeSettingEntity.getLable());
+ arrayList.add(memberAvivableCoinInfoVo);
+ }
+
+ return Result.ok(arrayList);
}
@Override
@@ -870,7 +884,7 @@
if (flag) {
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyDto.getSymbol());
BigDecimal availableBalance = walletCoin.getAvailableBalance();
- BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber().add(memberSubmitCoinApplyDto.getFeeAmount());
+ BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber();
if (availableBalance.compareTo(BigDecimal.ZERO) > 0
&& availableBalance.compareTo(coinNumber) > 0) {
//新增提币记录
@@ -901,7 +915,7 @@
MemberAccountMoneyChange accountRecord = new MemberAccountMoneyChange();
accountRecord.setContent("提币");
accountRecord.setMemberId(memberId);
- accountRecord.setAmount(memberSubmitCoinApplyDto.getCoinNumber());
+ accountRecord.setAmount(coinNumber);
accountRecord.setStatus(MemberAccountMoneyChange.STATUS_WAIT_INTEGER);
accountRecord.setSymbol(memberSubmitCoinApplyDto.getSymbol());
accountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);
--
Gitblit v1.9.1