Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-26 6bebf72db1ec82ce983575d51e0ac2aedcea90c6

Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -5,6 +5,7 @@


import com.xcong.excoin.modules.member.parameter.dto.*;

import com.xcong.excoin.modules.member.parameter.vo.*;

import com.xcong.excoin.modules.member.vo.DefaultWayVo;

import org.springframework.web.bind.annotation.*;



import com.xcong.excoin.common.response.Result;

@@ -216,6 +217,15 @@
    public Result setDefaultMethod(@PathVariable("id") Long id) {

        return memberService.setDefaultPaymethod(id);

    }



    @ApiOperation(value = "获取我的默认收款方式", notes = "获取我的默认收款方式")

    @ApiResponses({

            @ApiResponse(code = 200, message = "获取成功", response = DefaultWayVo.class)

    })

    @GetMapping(value = "/findDefaultWay")

    public Result findDefaultWay() {

        return memberService.findDefaultWay();

    }

    

    /**

     * 绑定手机号


 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java

@@ -93,4 +93,5 @@


    public Result memberMessageReminder();



    Result findDefaultWay();

}


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

}


 src/main/java/com/xcong/excoin/modules/member/vo/DefaultWayVo.java

New file
@@ -0,0 +1,18 @@
package com.xcong.excoin.modules.member.vo;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "DefaultWayVo", description = "接口返回类")
public class DefaultWayVo {
    /**
     * 类型 1-支付宝2-微信3-银行卡
     */

    @ApiModelProperty(value = "类型 1-支付宝2-微信3-银行卡")
    private String paymentType;

}