From 3d9e7358fb532013555b8574321b3718e23615cd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 18:16:27 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 f1350e5..1e4e556 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 (!AppContants.SYSTEM_REFERER.equals(registerDto.getRefererId())) {
+ 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);
@@ -879,7 +886,7 @@
BigDecimal availableBalance = walletCoin.getAvailableBalance();
BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber();
if (availableBalance.compareTo(BigDecimal.ZERO) > 0
- && availableBalance.compareTo(coinNumber) > 0) {
+ && availableBalance.compareTo(coinNumber) >= 0) {
//新增提币记录
MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
memberCoinWithdrawEntity.setAddress(memberSubmitCoinApplyDto.getAddress());
--
Gitblit v1.9.1