From b34be29401abfe68c05e7e47af2888f0a54ba12f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 31 Jul 2020 15:34:12 +0800
Subject: [PATCH] 20200731 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 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 5f81aa7..fc96eb1 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
@@ -38,6 +38,7 @@
import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ShareCodeUtil;
+import com.xcong.excoin.utils.ThreadPoolUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -102,7 +103,7 @@
@Resource
MemberCoinWithdrawDao memberCoinWithdrawDao;
-
+
@Resource
AppVersionDao appVersionDao;
@@ -148,12 +149,13 @@
member.setRefererId(registerDto.getRefererId());
member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
- member.setAccountType(registerDto.getType());
+ member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
- member.setIsForce(0);
+ member.setIsForce(1);
member.setIsProfit(0);
- member.setSpread(BigDecimal.ZERO);
+ member.setSpread(BigDecimal.ONE);
+ member.setClosingSpread(BigDecimal.ONE);
memberDao.insert(member);
String inviteId = ShareCodeUtil.toSerialCode(member.getId());
@@ -221,7 +223,8 @@
levelRate.setSymbol(symbolEnum.getValue());
memberLevelRateDao.insert(levelRate);
}
- return Result.ok("success");
+
+ return Result.ok(MessageSourceUtils.getString("home_service_0009"));
}
@Override
@@ -332,9 +335,9 @@
return Result.fail(MessageSourceUtils.getString("member_service_4000"));
}
if (ObjectUtil.isNotEmpty(member)) {
-
+
MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
-
+
if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
return Result.fail(MessageSourceUtils.getString("member_service_0055"));
}
@@ -357,10 +360,10 @@
return Result.fail(MessageSourceUtils.getString("member_service_0059"));
}
memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
-
+
String type = memberAuthenticationDto.getType();
memberAuthenticationEntity.setType(type);
-
+
String idCardNo = memberAuthenticationDto.getIdCardNo();
if (StrUtil.isBlank(idCardNo)) {
return Result.fail(MessageSourceUtils.getString("member_service_0060"));
@@ -379,7 +382,7 @@
memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
-
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
@@ -393,14 +396,8 @@
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);
- }
- });*/
+ ThreadPoolUtils.sendDingTalk(4);
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
return Result.fail(MessageSourceUtils.getString("member_service_0063"));
@@ -488,7 +485,7 @@
if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail(MessageSourceUtils.getString("member_service_0077"));
}
-
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
@@ -688,7 +685,7 @@
MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
memberCoinAddressEntity.setAddress(address);
memberCoinAddressEntity.setMemberId(memberId);
- memberCoinAddressEntity.setIsBiyict(isBiyict);
+ memberCoinAddressEntity.setIsBiyict(MemberCoinAddressEntity.IS_BIYICT_NO);
memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
memberCoinAddressEntity.setLabel(remark);
memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
@@ -755,10 +752,10 @@
MemberEntity member = memberDao.selectById(memberId);
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);
@@ -767,7 +764,7 @@
}else {
memberPersonCenterInfoVo.setMemberPaymentMethod(1);
}
-
+
if (StrUtil.isNotEmpty(member.getPhone())) {
memberPersonCenterInfoVo.setPhone(1);
} else {
@@ -824,8 +821,8 @@
}
List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
-
-
+
+
List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
return Result.fail(MessageSourceUtils.getString("member_service_0087"));
@@ -837,7 +834,7 @@
memberAvivableCoinInfoVo.setLable(platformFeeSettingEntity.getLable());
arrayList.add(memberAvivableCoinInfoVo);
}
-
+
return Result.ok(arrayList);
}
@@ -904,6 +901,7 @@
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("symbol", memberSubmitCoinApplyDto.getSymbol());
columnMap.put("address", memberSubmitCoinApplyDto.getAddress());
+ columnMap.put("is_biyict", MemberCoinAddressEntity.IS_BIYICT_YES);
List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
if (CollUtil.isEmpty(selectByMap)) {
memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
@@ -921,18 +919,13 @@
accountRecord.setContent("提币");
accountRecord.setMemberId(memberId);
accountRecord.setAmount(coinNumber);
+ accountRecord.setWithdrawId(memberCoinWithdrawEntity.getId());
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);
- }
- });
- */
+
+ ThreadPoolUtils.sendDingTalk(3);
return Result.ok(MessageSourceUtils.getString("member_service_0086"));
} else {
return Result.fail(MessageSourceUtils.getString("member_service_0005"));
@@ -964,7 +957,7 @@
public Result getAppVersionInfo() {
Map<String, Object> columnMap = new HashMap<>();
List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
- List<Object> arrayList = new ArrayList<>();
+ List<Object> arrayList = new ArrayList<>();
if(CollUtil.isNotEmpty(selectByMap)) {
for(AppVersionEntity appVersionEntity : selectByMap) {
AppVersionVo appVersionVo = new AppVersionVo();
--
Gitblit v1.9.1