From 2c8306d7104747b18bcd8dff0208c30b942afceb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Jun 2021 11:50:28 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 24923c8..0e42a48 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
@@ -30,6 +30,7 @@
import com.xcong.excoin.modules.member.parameter.dto.*;
import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.service.MemberService;
+import com.xcong.excoin.modules.member.vo.DefaultWayVo;
import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
import com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity;
@@ -153,9 +154,10 @@
}
// 判断是否拥有推荐人，若为空则默认系统
-// if (StrUtil.isBlank(registerDto.getRefererId())) {
-// registerDto.setRefererId(AppContants.SYSTEM_REFERER);
-// }
+ if (StrUtil.isBlank(registerDto.getRefererId())) {
+ registerDto.setRefererId(AppContants.SYSTEM_REFERER);
+ }
+
if (!AppContants.SYSTEM_REFERER.equals(registerDto.getRefererId())) {
MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
if (isExist == null) {
@@ -178,6 +180,8 @@
memberSettingEntity.setClosingSpread(BigDecimal.valueOf(2));
memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0085));
memberSettingEntity.setMemberId(member.getId());
+ memberSettingEntity.setOtcReturnFirst(BigDecimal.valueOf(0.0002));
+ memberSettingEntity.setOtcReturnFirst(BigDecimal.valueOf(0.0001));
memberSettingDao.insert(memberSettingEntity);
String inviteId = ShareCodeUtil.toSerialCode(member.getId());
@@ -539,9 +543,9 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
- if (!MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(memberPaymethodDto.getPaymentType())) {
- return Result.fail("只能绑定银行卡");
- }
+// if (!MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(memberPaymethodDto.getPaymentType())) {
+// return Result.fail("只能绑定银行卡");
+// }
if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail(MessageSourceUtils.getString("member_service_0077"));
@@ -559,7 +563,7 @@
}
String isDefault = "1";
- MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, MemberPaymentMethodEntity.PAYMENTTYPE_CARD, "");
+ MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
if (defaultMethod != null) {
isDefault = "2";
}
@@ -656,10 +660,12 @@
@Override
public Result setDefaultPaymethod(Long id) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
- MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(member.getId(), MemberPaymentMethodEntity.PAYMENTTYPE_CARD, "1");
+ MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
- if (id.equals(defualtMethod.getId())) {
- return Result.fail("不能关闭默认收款方式");
+ if (defualtMethod != null) {
+ if (id.equals(defualtMethod.getId())) {
+ return Result.fail("不能关闭默认收款方式");
+ }
}
MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();
@@ -900,6 +906,7 @@
Integer fingerprintState = member.getFingerprintState();
memberPersonCenterInfoVo.setFingerprintState(fingerprintState);
+ memberPersonCenterInfoVo.setIsMb(member.getIsTrader());
return Result.ok(memberPersonCenterInfoVo);
}
@@ -1274,6 +1281,20 @@
return Result.ok(memberMessageReminderVo);
}
+ @Override
+ public Result findDefaultWay() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+// Long memberId = 446L;
+
+ DefaultWayVo defaultWayVo = new DefaultWayVo();
+ MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
+ if(ObjectUtil.isNotEmpty(defualtMethod)){
+ String paymentType = defualtMethod.getPaymentType();
+ defaultWayVo.setPaymentType(paymentType);
+ }
+ return Result.ok(defaultWayVo);
+ }
}
--
Gitblit v1.9.1