From 9b8b1a8c660b04e49e4aa228858c45e2dd8f8c43 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 15 Jun 2021 20:06:44 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
index 10e4752..dca00fa 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
@@ -52,14 +52,19 @@
if ("1".equals(status)) {
return Result.fail("无法购买");
}
+ String total = redisUtils.getString("bzz_coin_total");
MemberEntity loginUser = LoginUserUtils.getAppLoginUser();
- BigDecimal price = new BigDecimal(66);
+ BigDecimal price = new BigDecimal(redisUtils.getString("bzz_order_new_price"));
BigDecimal amount = BigDecimal.valueOf(gbzAddDto.getCount()).multiply(price);
MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(loginUser.getId(), CoinTypeEnum.USDT.name());
if (amount.compareTo(wallet.getAvailableBalance()) > 0) {
return Result.fail("可用金额不足");
+ }
+
+ if (Integer.parseInt(total) < gbzAddDto.getCount()) {
+ return Result.fail("BZZ数量不足");
}
GbzOrderEntity gbzOrder = new GbzOrderEntity();
@@ -73,7 +78,7 @@
gbzOrderDao.insert(gbzOrder);
memberWalletCoinDao.updateBlockBalance(wallet.getId(), amount.negate(), BigDecimal.ZERO, 0);
-
+ redisUtils.set("bzz_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
LogRecordUtils.insertMemberAccountMoneyChange(loginUser.getId(), "购买BZZ", amount, "USDT", 1, 1);
return Result.ok("购买成功");
}
@@ -82,8 +87,11 @@
@ApiOperation(value = "获取订单列表")
@PostMapping(value = "/findList")
public Result findList(@RequestBody GbzListDto gbzListDto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ GbzOrderEntity gbzOrderEntity = new GbzOrderEntity();
+ gbzOrderEntity.setMemberId(member.getId());
Page<GbzOrderEntity> page = new Page<>(gbzListDto.getPageNum(), gbzListDto.getPageSize());
- IPage<GbzOrderEntity> result = gbzOrderDao.selectInPage(page);
+ IPage<GbzOrderEntity> result = gbzOrderDao.selectInPage(gbzOrderEntity, page);
return Result.ok(result.getRecords());
}
@@ -101,6 +109,10 @@
String status = redisUtils.getString("bzz_order_status");
priceVo.setStatus(StrUtil.isNotBlank(status) ? Integer.parseInt(status) : 2);
+
+ String remain = redisUtils.getString("bzz_coin_total");
+ priceVo.setRemainCnt(88888);
+
BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
priceVo.setTotalAmount(totalAmount);
return Result.ok(priceVo);
--
Gitblit v1.9.1