From bca07338e66536172b69d3d15287db4805f5cf85 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Aug 2020 12:11:04 +0800
Subject: [PATCH] 20200828

---
 src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressInDto.java |   26 ++++++
 src/main/resources/mapper/member/MemberCoinAddressInDao.xml                                |    7 +
 src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressInDao.java              |    8 ++
 src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressInEntity.java        |   29 +++++++
 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressInListVo.java  |   25 ++++++
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java          |   54 +++++++++++++
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java             |   33 ++++++++
 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java                   |    7 +
 8 files changed, 189 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 26548cd..4375126 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/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
      */
@@ -290,6 +303,16 @@
     @PostMapping(value = "/memberAddCoinAddress")
     public Result memberAddCoinAddress(@RequestBody @Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
         return memberService.memberAddCoinAddress(memberAddCoinAddressDto);
+    }
+    
+    /**
+     * 添加内转提币地址
+     * @return
+     */
+    @ApiOperation(value = "添加内转提币地址", notes = "添加内转提币地址")
+    @PostMapping(value = "/memberAddCoinAddressIn")
+    public Result memberAddCoinAddressIn(@RequestBody @Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {
+    	return memberService.memberAddCoinAddressIn(memberAddCoinAddressDto);
     }
     
     /**
@@ -303,6 +326,16 @@
 	}
     
     /**
+     * 删除内转提币地址
+     * @return
+     */
+    @ApiOperation(value="删除内转提币地址", notes="删除内转提币地址")
+    @PostMapping(value="/memberDelCoinAddressIn")
+    public Result  memberDelCoinAddressIn(@RequestBody @Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+    	return memberService.memberDelCoinAddressIn(memberDelCoinAddressDto);
+    }
+    
+    /**
      * 获取发送验证码途径
      * @return
      */
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressInDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressInDao.java
new file mode 100644
index 0000000..2111c1c
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressInDao.java
@@ -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> {
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressInEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressInEntity.java
new file mode 100644
index 0000000..39dae59
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinAddressInEntity.java
@@ -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;
+    
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressInDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressInDto.java
new file mode 100644
index 0000000..e6f9c98
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressInDto.java
@@ -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;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressInListVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressInListVo.java
new file mode 100644
index 0000000..906e920
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressInListVo.java
@@ -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;
+    
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index b5a7ec0..500f893 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/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();
+
 
 }
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 591f214..35f8d7d 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
@@ -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);
+    }
+
 }
 
 
diff --git a/src/main/resources/mapper/member/MemberCoinAddressInDao.xml b/src/main/resources/mapper/member/MemberCoinAddressInDao.xml
new file mode 100644
index 0000000..def77ef
--- /dev/null
+++ b/src/main/resources/mapper/member/MemberCoinAddressInDao.xml
@@ -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>
\ No newline at end of file

--
Gitblit v1.9.1