From f0a47946682b93a4fb6c9246d8573ee2bc98d60e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 11:41:26 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   12 +++++++-----
 1 files changed, 7 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 24923c8..f0168a0 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.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"));
@@ -658,8 +658,10 @@
         MemberEntity member = LoginUserUtils.getAppLoginUser();
         MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(member.getId(), MemberPaymentMethodEntity.PAYMENTTYPE_CARD, "1");
 
-        if (id.equals(defualtMethod.getId())) {
-            return Result.fail("不能关闭默认收款方式");
+        if (defualtMethod != null) {
+            if (id.equals(defualtMethod.getId())) {
+                return Result.fail("不能关闭默认收款方式");
+            }
         }
 
         MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();

--
Gitblit v1.9.1