From 0be3d5de8490fc883935f0418a14e82db25b6b72 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 16 Jun 2021 09:45:13 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 706d26e..b27e9f5 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,10 +52,15 @@
if ("1".equals(status)) {
return Result.fail("无法购买");
}
+
+ String start = redisUtils.getString("bzz_start");
+ if ("2".equals(start)) {
+ 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());
@@ -87,8 +92,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());
}
@@ -106,6 +114,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