From e13b1f9d6817a29f528f70493685371ae4004eb7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Jun 2021 16:49:42 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 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 34ce5af..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,6 +543,10 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
+// 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"));
}
@@ -552,6 +560,12 @@
return Result.fail(MessageSourceUtils.getString("member_service_0097"));
}
}
+ }
+
+ String isDefault = "1";
+ MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
+ if (defaultMethod != null) {
+ isDefault = "2";
}
String account = memberPaymethodDto.getAccount();
String bank = memberPaymethodDto.getBank();
@@ -567,6 +581,7 @@
memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
memberPaymentMethodEntity.setPaymentType(paymentType);
memberPaymentMethodEntity.setSubBank(subBank);
+ memberPaymentMethodEntity.setIsDefualt(isDefault);
memberPaymentMethodDao.insert(memberPaymentMethodEntity);
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -577,6 +592,17 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
Long id = memberDelPaymethodDto.getId();
+
+ MemberPaymentMethodEntity paymentMethodEntity = memberPaymentMethodDao.selectById(id);
+ if ("1".equals(paymentMethodEntity.getIsDefualt())) {
+ return Result.fail("不能删除默认收款方式");
+ }
+
+ List<MemberPaymentMethodEntity> list = memberPaymentMethodDao.selectByMemberId(memberId);
+ if (list.size() == 1) {
+ return Result.fail("必须保留一个收款方式");
+ }
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("id", id);
columnMap.put("member_id", memberId);
@@ -621,6 +647,7 @@
memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
+ memberPaymethodDetailVo.setIsDefault(memberPaymentMethodEntity.getIsDefualt());
arrayList.add(memberPaymethodDetailVo);
}
}
@@ -628,6 +655,29 @@
MemberPaymethodDetailListVo memberPaymethodDetailListVo = new MemberPaymethodDetailListVo();
memberPaymethodDetailListVo.setMemberPaymethodDetailVo(arrayList);
return Result.ok(memberPaymethodDetailListVo);
+ }
+
+ @Override
+ public Result setDefaultPaymethod(Long id) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
+
+ if (defualtMethod != null) {
+ if (id.equals(defualtMethod.getId())) {
+ return Result.fail("不能关闭默认收款方式");
+ }
+ }
+
+ MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();
+ paymentMethodEntity.setId(id);
+ paymentMethodEntity.setIsDefualt("1");
+ this.memberPaymentMethodDao.updateById(paymentMethodEntity);
+
+ if (defualtMethod != null) {
+ defualtMethod.setIsDefualt("2");
+ this.memberPaymentMethodDao.updateById(defualtMethod);
+ }
+ return Result.ok("操作成功");
}
@Override
@@ -847,9 +897,16 @@
memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
}
+ if (StrUtil.isEmpty(member.getName())) {
+ memberPersonCenterInfoVo.setNickName(2);
+ } else {
+ memberPersonCenterInfoVo.setNickName(1);
+ }
+
Integer fingerprintState = member.getFingerprintState();
memberPersonCenterInfoVo.setFingerprintState(fingerprintState);
+ memberPersonCenterInfoVo.setIsMb(member.getIsTrader());
return Result.ok(memberPersonCenterInfoVo);
}
@@ -1224,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