From 41fc805039c7b59145d1fc45e1c96fb7601dc2f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jul 2020 09:50:34 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 56ace36..d5a5246 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
@@ -146,6 +146,7 @@
         member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
         member.setIsForce(0);
         member.setIsProfit(0);
+        member.setSpread(BigDecimal.ZERO);
         memberDao.insert(member);
 
         String inviteId = ShareCodeUtil.toSerialCode(member.getId());
@@ -320,8 +321,17 @@
         //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
         MemberEntity member = memberDao.selectById(memberId);
+		if(MemberEntity.CERTIFY_STATUS_ING.equals(member.getCertifyStatus())) {
+			return Result.fail(MessageSourceUtils.getString("member_service_4000"));
+		}
         if (ObjectUtil.isNotEmpty(member)) {
-            MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
+        	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"));
             }
@@ -734,6 +744,9 @@
 
         MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
         
+        Integer certifyStatus = member.getCertifyStatus();
+        memberPersonCenterInfoVo.setCertifyStatus(certifyStatus);
+        
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("member_id", memberId);
         List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);

--
Gitblit v1.9.1