20200602 代码提交

xiaoyong931011

2020-06-02 1e2725d0ab46e73cf21279f816f2320b626fbd3e

 src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java

@@ -1,11 +1,15 @@
package com.xcong.excoin.modules.home.controller;



import javax.validation.Valid;



import org.springframework.beans.factory.annotation.Autowired;

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

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

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

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

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

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

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

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



import com.alibaba.druid.util.StringUtils;

@@ -32,7 +36,7 @@


   @ApiOperation(value = "recharge", notes = "USDT快速充值")

   @RequestMapping(value = "/recharge", method = RequestMethod.POST)

   public Result recharge(@RequestBody MemberQuickBuySaleDto memberQuickBuySaleDto) {

   public Result recharge(@RequestBody @Valid MemberQuickBuySaleDto memberQuickBuySaleDto) {

      log.info("入参----->{}", memberQuickBuySaleDto);

      //获取用户ID

      MemberEntity member = LoginUserUtils.getAppLoginUser();

@@ -53,8 +57,6 @@
      if (StringUtils.isEmpty(tradePasswordWeb)) {

         return Result.fail("请输入交易密码");

      }

      // System.out.println("交易密码:"+MD5.GetMD5Code(tradePasswordWeb)+" tradePassword =

      // "+tradePassword);

      // 验证交易密码

      if (!tradePassword.equals(SecureUtil.md5(tradePasswordWeb))) {

         return Result.fail("请输入正确的交易密码");

@@ -65,7 +67,7 @@
   

   @ApiOperation(value = "commitPay", notes = "USDT充值支付确认")

   @RequestMapping(value = "/commitPay", method = RequestMethod.POST)

   public Result commitPay(@RequestBody MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto) {

   public Result commitPay(@RequestBody @Valid MemberQuickBuySaleCommitDto memberQuickBuySaleCommitDto) {

      return memberQuickBuySaleService.commitPay(memberQuickBuySaleCommitDto);

   }

   

@@ -75,22 +77,27 @@
      return memberQuickBuySaleService.selectById(id);

   }

   

   @ApiOperation(value = "selectAll", notes = "查询用户所有的买卖记录")

   @GetMapping(value = "/selectAll")

   public Result selectAll(@RequestParam(value = "type") String type) {

      return memberQuickBuySaleService.selectAll(type);

   }

	
   @ApiOperation(value = "cancel", notes = "充值撤销")

   @GetMapping(value = "/cancel/{id}")

   public Result cancel(@PathVariable(value = "id") Long id) {

   @GetMapping(value = "/cancel")

   public Result cancel(@RequestParam(value = "id") Long id) {

      return memberQuickBuySaleService.cancelRecharge(id);

   }

   

   @ApiOperation(value = "sell", notes = "USDT快速充值")

   @ApiOperation(value = "sell", notes = "USDT快速卖出")

   @RequestMapping(value = "/sell", method = RequestMethod.POST)

   public Result sell(MemberQuickBuySaleDto memberQuickBuySaleDto) {

   public Result sell(@RequestBody @Valid MemberQuickBuySaleDto memberQuickBuySaleDto) {

      // 获取当前登录用户

      MemberEntity member = LoginUserUtils.getAppLoginUser();

      if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {

         return Result.fail("请先实名认证");

      }

      String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();

		
      // 验证支付密码

      String tradePassword = member.getTradePassword();