Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2020-11-30 6befa81216549e5630decf83920285505302af72

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

@@ -3,6 +3,7 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import org.springframework.validation.annotation.Validated;

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

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

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

@@ -19,6 +20,7 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;

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

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

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

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.dto.MemberUpdateTradersPwdTimeDto;

@@ -116,6 +118,29 @@
   }

   

   /**

    *  验证资金密码是否正确

    * @return

    */

   @ApiOperation(value="getMemberTradeCode", notes="验证资金密码是否正确")

   @ApiImplicitParams({

      @ApiImplicitParam(name = "tradeCode", value = "资金密码", required = true, dataType = "String", paramType="query"),

   })

   @GetMapping(value = "/getMemberTradeCode")

   public Result  getMemberTradeCode(String tradeCode) {

      return memberService.getMemberTradeCode(tradeCode);

   }

	
   /**

    *  获取对应的助记词

    * @return

    */

   @ApiOperation(value="获取对应的助记词", notes="获取对应的助记词")

   @GetMapping(value = "/getMnemonicWordList")

   public Result  getMnemonicWordList() {

      return memberService.getMnemonicWordList();

   }

	
   /**

    * 修改密码

    * @return

    */

@@ -164,8 +189,8 @@
    */

   @ApiOperation(value="修改资金密码", notes="修改资金密码")

   @PostMapping(value="/memberUpdateTradePwd")

   public Result  memberUpdateTradePwd(@RequestBody @Valid MemberUpdateTradePwdDto memberUpdateTradePwdDto) {

      return memberService.memberUpdateTradePwd(memberUpdateTradePwdDto);

   public Result  memberUpdateTradePwd(@RequestBody @Valid MemberTradersPwdOutcenterDto memberTradersPwdOutcenterDto) {

      return memberService.memberUpdateTradePwd(memberTradersPwdOutcenterDto);

   }

   

   /**

@@ -187,8 +212,8 @@
    */

   @ApiOperation(value="设置交易密码", notes="设置交易密码")

   @PostMapping(value="/memberTradersPwd")

   public Result  memberTradersPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {

      return memberService.memberTradersPwd(memberForgetPwdDto);

   public Result  memberTradersPwd(@RequestBody @Valid MemberTradersPwdOutcenterDto memberTradersPwdOutcenterDto) {

      return memberService.memberTradersPwd(memberTradersPwdOutcenterDto);

   }

   

   /**

@@ -252,7 +277,7 @@
     */

   @ApiOperation(value="绑定邮箱", notes="绑定邮箱")

   @PostMapping(value="/memberBindEmail")

    public Result memberBindEmail(@RequestBody @Valid MemberBindEmailDto memberBindEmailDto) {

    public Result memberBindEmail(@RequestBody @Validated MemberBindEmailDto memberBindEmailDto) {

        return memberService.memberBindEmail(memberBindEmailDto);

    }