modify

Helius

2021-05-26 5575818556096be1dadaf5ff356b5db4c832aaa2

 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;
@@ -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"));
@@ -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,10 +656,12 @@
    @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 (id.equals(defualtMethod.getId())) {
            return Result.fail("不能关闭默认收款方式");
        if (defualtMethod != null) {
            if (id.equals(defualtMethod.getId())) {
                return Result.fail("不能关闭默认收款方式");
            }
        }

        MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();
@@ -900,6 +902,7 @@
        Integer fingerprintState = member.getFingerprintState();
        memberPersonCenterInfoVo.setFingerprintState(fingerprintState);

        memberPersonCenterInfoVo.setIsMb(member.getIsTrader());
        return Result.ok(memberPersonCenterInfoVo);
    }

@@ -1274,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);
    }

}