From 5575818556096be1dadaf5ff356b5db4c832aaa2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 19:27:09 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 f0168a0..2672612 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;
@@ -40,7 +41,6 @@
 import com.xcong.excoin.utils.ThreadPoolUtils;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.collections4.Put;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -559,7 +559,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,7 +656,7 @@
     @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())) {
@@ -902,6 +902,7 @@
         Integer fingerprintState = member.getFingerprintState();
         memberPersonCenterInfoVo.setFingerprintState(fingerprintState);
 
+        memberPersonCenterInfoVo.setIsMb(member.getIsTrader());
         return Result.ok(memberPersonCenterInfoVo);
     }
 
@@ -1276,6 +1277,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