From e4b79445e0bf959878b25d6770151ec8a3b33c98 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Jun 2020 11:22:36 +0800
Subject: [PATCH] 20200623
---
src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
index d172586..5d6a6d3 100644
--- a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
+++ b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
@@ -1,10 +1,12 @@
package com.xcong.excoin.modules.home.controller;
+import javax.annotation.Resource;
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;
@@ -18,6 +20,7 @@
import com.xcong.excoin.modules.home.dto.MemberQuickBuySaleDto;
import com.xcong.excoin.modules.home.service.MemberQuickBuySaleService;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.service.MemberService;
import cn.hutool.crypto.SecureUtil;
import io.swagger.annotations.Api;
@@ -32,6 +35,8 @@
@Autowired
MemberQuickBuySaleService memberQuickBuySaleService;
+ @Autowired
+ MemberService memberService;
@ApiOperation(value = "recharge", notes = "USDT快速充值")
@RequestMapping(value = "/recharge", method = RequestMethod.POST)
@@ -41,9 +46,9 @@
MemberEntity member = LoginUserUtils.getAppLoginUser();
log.info("查询到的会员----->{}", member);
// 验证是否实名认证
- if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
- return Result.fail("请先实名认证");
- }
+ //if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
+ // return Result.fail("请先实名认证");
+ //}
String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();
// 验证支付密码
@@ -56,8 +61,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("请输入正确的交易密码");
@@ -68,7 +71,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);
}
@@ -85,8 +88,8 @@
}
@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);
}
@@ -94,8 +97,9 @@
@RequestMapping(value = "/sell", method = RequestMethod.POST)
public Result sell(@RequestBody @Valid MemberQuickBuySaleDto memberQuickBuySaleDto) {
// 获取当前登录用户
- MemberEntity member = LoginUserUtils.getAppLoginUser();
- if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberService.getById(memberId);
+ if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail("请先实名认证");
}
String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();
--
Gitblit v1.9.1