src/main/java/com/xcong/excoin/modules/coin/dao/MemberSelectSymbolsDao.java
@@ -10,5 +10,7 @@ public interface MemberSelectSymbolsDao extends BaseMapper<MemberSelectSymbolsEntity>{ List<MemberSelectSymbolsEntity> selectSymbolByMemIdAndSymbol(@Param("memberId")Long memberId,@Param("symbol")String symbol); List<MemberSelectSymbolsEntity> selectSymbolByMemId(@Param("memberId")Long memberId); } src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -466,9 +466,7 @@ public Result findCollectList() { //获取用户ID Long memberId = LoginUserUtils.getAppLoginUser().getId(); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectByMap(columnMap); List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectSymbolByMemId(memberId); FindCollectListVo findCollectListVo = new FindCollectListVo(); List<MemberSelectSymbolsVo> arrayList = new ArrayList<>(); src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import com.xcong.excoin.common.response.Result; import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto; 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; @@ -19,6 +20,7 @@ import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto; import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo; import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo; @@ -188,7 +190,7 @@ } /** * 获取币种地址数量 * 获取币种地址 * @return */ @ApiOperation(value = "获取币种地址数量", notes = "获取币种地址数量") @@ -199,22 +201,30 @@ } /** * 获取提币地址列表 * * @param pageNumber * @param pageSize * @param token * 获取提币地址 * @return @ApiOperation(value = "获取地址列表", notes = "获取地址列表") @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberPaymethodDetailVo.class)}) */ @ApiOperation(value = "获取提币地址列表", notes = "获取提币地址列表") @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberCoinAddressListVo.class)}) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "long", paramType="query") @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query") }) @GetMapping(value = "/memberCoinAddressList") public Result memberCoinAddressList(String pageNumber, String pageSize, Long symbolsId, @RequestHeader(value = "token", required = true) String token) { return memberService.memberCoinAddressList(token, pageNumber, pageSize, symbolsId); }*/ public Result memberCoinAddressList(String symbol) { return memberService.memberCoinAddressList(symbol); } /** * 添加提币地址 * * @param token * @return */ @ApiOperation(value = "添加提币地址", notes = "添加提币地址") @PostMapping(value = "/memberAddCoinAddress") public Result memberAddCoinAddress(@RequestBody @Valid MemberAddCoinAddressDto memberAddCoinAddressDto) { return memberService.memberAddCoinAddress(memberAddCoinAddressDto); }
@@ -27,7 +27,7 @@ /** * 私钥 */ private String private_key; private String privateKey; /** * 币种 */ @@ -35,7 +35,7 @@ /** * 是否是本平台地址1：是 0：否 */ private String is_biyict; private String isBiyict; public static final String IS_BIYICT_YES = "1"; public static final String IS_BIYICT_NO = "0"; /** @@ -49,7 +49,7 @@ /** * 币种ID */ private Long symbolscoin_id; private Long symbolscoinId; } src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java
New file @@ -0,0 +1,10 @@ package com.xcong.excoin.modules.member.parameter.dto; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "MemberAddCoinAddressDto", description = "增加提币地址参数接收类") public class MemberAddCoinAddressDto { } src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressListVo.java
New file @@ -0,0 +1,16 @@ package com.xcong.excoin.modules.member.parameter.vo; import java.util.List; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "MemberCoinAddressCountListVo", description = "币种地址信息") public class MemberCoinAddressListVo { @ApiModelProperty(value = "币种地址") private List<MemberCoinAddressVo> memberCoinAddressVo; } src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java
New file @@ -0,0 +1,39 @@ package com.xcong.excoin.modules.member.parameter.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "MemberCoinAddressVo", description = "地址信息") public class MemberCoinAddressVo { @ApiModelProperty(value = "ID") private Long id; /** * 会员ID */ @ApiModelProperty(value = "会员ID") private Long memberId; /** * 地址 */ @ApiModelProperty(value = "地址") private String address; /** * 私钥 */ @ApiModelProperty(value = "私钥") private String privateKey; /** * 币种 */ @ApiModelProperty(value = "币种") private String symbol; /** * 是否是本平台地址1：是 0：否 */ @ApiModelProperty(value = "是否是本平台地址1：是 0：否") private String isBiyict; } src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -6,6 +6,7 @@ import com.xcong.excoin.common.response.Result; 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.MemberAuthenticationDto; import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto; import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto; @@ -50,5 +51,9 @@ public Result memberCoinAddressCount(); public Result memberCoinAddressList(String symbol); public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto); } src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -14,6 +14,7 @@ import com.xcong.excoin.common.system.dto.RegisterDto; 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.MemberAuthenticationDto; import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto; import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto; @@ -24,6 +25,8 @@ import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountVo; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressVo; import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo; import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo; import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo; @@ -81,6 +84,9 @@ @Resource PlatformSymbolsCoinDao platformSymbolsCoinDao; @Resource MemberCoinAddressDao memberCoinAddressDao; @Transactional() @Override @@ -353,8 +359,8 @@ String code = memberUpdateTradePwdDto.getCode(); String password = memberUpdateTradePwdDto.getPassword(); String phone = memberUpdateTradePwdDto.getPhone(); String email = memberUpdateTradePwdDto.getEmail(); String phone = memberEntity.getPhone(); String email = memberEntity.getEmail(); int type = memberUpdateTradePwdDto.getType(); boolean verificationCode = verificationCode(type, phone, code, email); if(verificationCode) { @@ -572,4 +578,37 @@ return Result.fail(MessageSourceUtils.getString("member_service_0020")); } @Override public Result memberCoinAddressList(String symbol) { //获取用户ID Long memberId = LoginUserUtils.getAppLoginUser().getId(); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); columnMap.put("symbol", symbol); List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap); MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo(); List<MemberCoinAddressVo> arrayList = new ArrayList<>(); if(CollUtil.isNotEmpty(selectByMap)) { for(MemberCoinAddressEntity memberCoinAddressEntity : selectByMap) { MemberCoinAddressVo memberCoinAddressVo = new MemberCoinAddressVo(); memberCoinAddressVo.setId(memberCoinAddressEntity.getId()); memberCoinAddressVo.setAddress(memberCoinAddressEntity.getAddress()); memberCoinAddressVo.setIsBiyict(memberCoinAddressEntity.getIsBiyict()); memberCoinAddressVo.setMemberId(memberCoinAddressEntity.getMemberId()); memberCoinAddressVo.setPrivateKey(memberCoinAddressEntity.getPrivateKey()); memberCoinAddressVo.setSymbol(memberCoinAddressEntity.getSymbol()); arrayList.add(memberCoinAddressVo); } } memberCoinAddressListVo.setMemberCoinAddressVo(arrayList); return Result.ok(memberCoinAddressListVo); } @Override public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) { // TODO Auto-generated method stub return null; } } src/main/resources/mapper/member/MemberSelectSymbolsDao.xml
@@ -3,7 +3,11 @@ <mapper namespace="com.xcong.excoin.modules.coin.dao.MemberSelectSymbolsDao"> <select id="selectSymbolByMemIdAndSymbol" resultType="com.xcong.excoin.modules.member.entity.MemberSelectSymbolsEntity"> select id id,symbol symbol,member_id memId from member_select_symbols where member_id = #{memberId} and symbol = #{symbol} select id id,symbol symbol,member_id memberId from member_select_symbols where member_id = #{memberId} and symbol = #{symbol} </select> <select id="selectSymbolByMemId" resultType="com.xcong.excoin.modules.member.entity.MemberSelectSymbolsEntity"> select id id,symbol symbol,member_id memberId from member_select_symbols where member_id = #{memberId} GROUP BY symbol </select> </mapper>
