20200828

xiaoyong931011

2020-08-28 bca07338e66536172b69d3d15287db4805f5cf85

20200828

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

@@ -11,6 +11,7 @@


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

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

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

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

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

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

@@ -27,6 +28,7 @@
import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;

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

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

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

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

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

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

@@ -283,6 +285,17 @@
    }

    

    /**

     * 获取内转提币地址

     * @return

     */

    @ApiOperation(value = "获取内转提币地址列表", notes = "获取内转提币地址列表")

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberCoinAddressInListVo.class)})

    @GetMapping(value = "/memberCoinAddressInList")

    public Result memberCoinAddressInList() {

        return memberService.memberCoinAddressInList();

    }

    
    /**

     * 添加提币地址

     * @return

     */

@@ -293,6 +306,16 @@
    }

    

    /**

     * 添加内转提币地址

     * @return

     */

    @ApiOperation(value = "添加内转提币地址", notes = "添加内转提币地址")

    @PostMapping(value = "/memberAddCoinAddressIn")

    public Result memberAddCoinAddressIn(@RequestBody @Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {

        return memberService.memberAddCoinAddressIn(memberAddCoinAddressDto);

    }

    
    /**

     * 删除提币地址

     * @return

     */

@@ -303,6 +326,16 @@
    }

    

    /**

     * 删除内转提币地址

     * @return

     */

    @ApiOperation(value="删除内转提币地址", notes="删除内转提币地址")

    @PostMapping(value="/memberDelCoinAddressIn")

    public Result  memberDelCoinAddressIn(@RequestBody @Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {

        return memberService.memberDelCoinAddressIn(memberDelCoinAddressDto);

    }

    
    /**

     * 获取发送验证码途径

     * @return

     */


 src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressInDao.java

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



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.xcong.excoin.modules.member.entity.MemberCoinAddressInEntity;



public interface MemberCoinAddressInDao extends BaseMapper<MemberCoinAddressInEntity> {



}


 src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressInEntity.java

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



import com.baomidou.mybatisplus.annotation.TableName;

import com.xcong.excoin.common.system.base.BaseEntity;



import lombok.Data;



@Data

@TableName("member_coin_address_in")

public class MemberCoinAddressInEntity extends BaseEntity {

    /**

     * 
     */

    private static final long serialVersionUID = 1L;

    /**

     * 会员ID

     */

    private Long memberId;

    /**

     * 备注

     */

    private String content;

    /**

     * 账号

     */

    private String account;

    


}


 src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressInDto.java

New file
@@ -0,0 +1,26 @@
package com.xcong.excoin.modules.member.parameter.dto;



import javax.validation.constraints.NotNull;



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;





@Data

@ApiModel(value = "MemberAddCoinAddressInDto", description = "参数接收类")

public class MemberAddCoinAddressInDto {

	
    /**

     * 地址

     */

    @NotNull(message = "账号不能为空")

    @ApiModelProperty(value = "账号")

    private String address;

    /**

     * 备注

     */

    @ApiModelProperty(value = "备注")

    private String remark;



}


 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressInListVo.java

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



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;



@Data

@ApiModel(value = "MemberCoinAddressInListVo", description = "返回")

public class MemberCoinAddressInListVo {

	
    @ApiModelProperty(value = "ID")

    private Long id;

    /**

     * 备注

     */

    @ApiModelProperty(value = "备注")

    private String content;

    /**

     * 账号

     */

    @ApiModelProperty(value = "账号")

    private String account;

    


}


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

@@ -7,6 +7,7 @@
import com.xcong.excoin.common.system.dto.RegisterDto;

import com.xcong.excoin.modules.member.entity.MemberEntity;

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

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

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

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

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

@@ -93,5 +94,11 @@


    public Result memberSubmitCoinApplyIn(@Valid MemberSubmitCoinApplyInDto memberSubmitCoinApplyInDto);



    public Result memberAddCoinAddressIn(@Valid MemberAddCoinAddressInDto memberAddCoinAddressDto);



    public Result memberDelCoinAddressIn(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto);



    public Result memberCoinAddressInList();





}


 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -18,6 +18,7 @@
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
@@ -98,6 +99,9 @@

    @Resource
    MemberCoinAddressDao memberCoinAddressDao;
    
    @Resource
    MemberCoinAddressInDao memberCoinAddressInDao;

    @Resource
    private CommonService commonservice;
@@ -1084,6 +1088,56 @@
            return Result.fail(MessageSourceUtils.getString("member_service_0039"));
        }
    }

    @Override
    public Result memberAddCoinAddressIn(@Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {

        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        String address = memberAddCoinAddressDto.getAddress();
        String remark = memberAddCoinAddressDto.getRemark();

        MemberCoinAddressInEntity memberCoinAddressInEntity = new MemberCoinAddressInEntity();
        memberCoinAddressInEntity.setAccount(address);
        memberCoinAddressInEntity.setMemberId(memberId);
        memberCoinAddressInEntity.setContent(remark);
        memberCoinAddressInDao.insert(memberCoinAddressInEntity);
        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
    }

    @Override
    public Result memberDelCoinAddressIn(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity member = memberDao.selectById(memberId);
        if (ObjectUtil.isNotEmpty(member)) {
            Long id = memberDelCoinAddressDto.getId();
            memberCoinAddressInDao.deleteById(id);
        }
        return Result.ok("success");
    }

    @Override
    public Result memberCoinAddressInList() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
        List<MemberCoinAddressInEntity> selectByMap = memberCoinAddressInDao.selectByMap(columnMap );
        List<MemberCoinAddressInListVo> arrayList = new ArrayList<>();
        if (CollUtil.isNotEmpty(selectByMap)) {
            for (MemberCoinAddressInEntity memberCoinAddressInEntity : selectByMap) {
                MemberCoinAddressInListVo memberCoinAddressInListVo = new MemberCoinAddressInListVo();
                memberCoinAddressInListVo.setId(memberCoinAddressInEntity.getId());
                memberCoinAddressInListVo.setAccount(memberCoinAddressInEntity.getAccount());
                memberCoinAddressInListVo.setContent(memberCoinAddressInEntity.getContent());
                arrayList.add(memberCoinAddressInListVo);
            }
        }
        return Result.ok(arrayList);
    }

}



 src/main/resources/mapper/member/MemberCoinAddressInDao.xml

New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.xcong.excoin.modules.member.dao.MemberCoinAddressInDao">







</mapper>