From 9a968ba186af5280fcc29cc3eb04412eff204ba7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:37:33 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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 c8fff73..a0fc791 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;
@@ -539,9 +540,9 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
- if (!MemberPaymentMethodEntity.PAYMENTTYPE_CARD.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 +560,7 @@
}
String isDefault = "1";
- MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, MemberPaymentMethodEntity.PAYMENTTYPE_CARD, "");
+ MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
if (defaultMethod != null) {
isDefault = "2";
}
@@ -588,6 +589,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);
@@ -632,6 +644,7 @@
memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
+ memberPaymethodDetailVo.setIsDefault(memberPaymentMethodEntity.getIsDefualt());
arrayList.add(memberPaymethodDetailVo);
}
}
@@ -644,7 +657,13 @@
@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 (defualtMethod != null) {
+ if (id.equals(defualtMethod.getId())) {
+ return Result.fail("不能关闭默认收款方式");
+ }
+ }
MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();
paymentMethodEntity.setId(id);
@@ -875,9 +894,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);
}
@@ -1252,6 +1278,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