From 32cd9fe7569d4bf40bd3ee4b13d1e2e5a50203de Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Nov 2021 17:41:05 +0800
Subject: [PATCH] modify bzz to bea

---
 src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 a6dbf07..ee8cbfb 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,5 +1,6 @@
 package com.xcong.excoin.modules.home.controller;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,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;
@@ -33,6 +35,8 @@
 
 	@Autowired
 	MemberQuickBuySaleService memberQuickBuySaleService;
+	@Autowired
+	MemberService memberService;
 
 	@ApiOperation(value = "recharge", notes = "USDT快速充值")
 	@RequestMapping(value = "/recharge", method = RequestMethod.POST)
@@ -42,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();
 		
 		// 验证支付密码
@@ -93,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();
@@ -114,4 +119,10 @@
 		}
 		return memberQuickBuySaleService.sell(member,memberQuickBuySaleDto);
 	}
+	
+	@ApiOperation(value = "cancelSell", notes = "提现撤销")
+	@GetMapping(value = "/cancelSell")
+	public Result cancelSell(@RequestParam(value = "id") Long id) {
+		return memberQuickBuySaleService.cancelSell(id);
+	}
 }

--
Gitblit v1.9.1