From 439fbf4fe5fe175759a933dea1cd8717a3f6fc57 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Jun 2020 11:59:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
index 401e7ac..a7e4e10 100644
--- a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
@@ -70,7 +70,7 @@
 		MemberQuickBuySaleVo memberQuickBuySaleVo = new MemberQuickBuySaleVo();
 		memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());
 		// 返回前台付款方式
-		return Result.ok(memberQuickBuySaleVo);
+		return Result.ok("提交成功",memberQuickBuySaleVo);
 	}
 
 	@Override
@@ -183,19 +183,6 @@
 		MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(member.getId(),id);
 		memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
 		memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
-		
-		// 判断是否存在足够余额
-		MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(),CoinTypeEnum.USDT.toString());
-		boolean flag = true;
-		while(flag) {
-			walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(memberQuickBuySaleEntity.getAmountUsdt()));
-			walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(memberQuickBuySaleEntity.getAmountUsdt()));
-			int i = memberWalletCoinDao.updateById(walletCoin);
-			if(i>0) {
-				flag = false;
-			}
-			walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(),CoinTypeEnum.USDT.toString());
-		}
 		return Result.ok("成功");
 	}
 }

--
Gitblit v1.9.1