From 9b273ed25fada1d351c520da29277a765316623c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 11:54:39 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 bcd9111..50c36c2 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
@@ -539,9 +539,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"));
@@ -588,6 +588,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 +643,7 @@
memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
+ memberPaymethodDetailVo.setIsDefault(memberPaymentMethodEntity.getIsDefualt());
arrayList.add(memberPaymethodDetailVo);
}
}
@@ -644,7 +656,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);
--
Gitblit v1.9.1