From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 23a2561..0419268 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.excoin.common.LoginUserUtils;
+import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.coin.dao.GbzOrderDao;
@@ -57,8 +58,12 @@
if ("2".equals(start)) {
return Result.fail("暂无法购买");
}
- String total = redisUtils.getString("bea_coin_total");
+ if (gbzAddDto.getCount() < 10) {
+ return Result.fail("最少购买数量为10个");
+ }
+
+ String total = redisUtils.getString("bea_coin_total");
MemberEntity loginUser = LoginUserUtils.getAppLoginUser();
BigDecimal price = new BigDecimal(redisUtils.getString("bea_order_new_price"));
BigDecimal amount = BigDecimal.valueOf(gbzAddDto.getCount()).multiply(price);
@@ -69,7 +74,7 @@
}
if (Integer.parseInt(total) < gbzAddDto.getCount()) {
- return Result.fail("BEA数量不足");
+ return Result.fail("GRICE数量不足");
}
GbzOrderEntity gbzOrder = new GbzOrderEntity();
@@ -77,14 +82,14 @@
gbzOrder.setAmount(amount);
gbzOrder.setCnt(gbzAddDto.getCount());
gbzOrder.setMemberId(loginUser.getId());
- gbzOrder.setSymbol(CoinTypeEnum.BEA.name());
+ gbzOrder.setSymbol(CoinTypeEnum.GRICE.name());
gbzOrder.setStatus(1);
gbzOrderDao.insert(gbzOrder);
memberWalletCoinDao.updateBlockBalance(wallet.getId(), amount.negate(), BigDecimal.ZERO, 0);
redisUtils.set("bea_coin_total", Integer.parseInt(total) - gbzAddDto.getCount());
- LogRecordUtils.insertMemberAccountMoneyChange(loginUser.getId(), "购买BEA", amount, "USDT", 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(loginUser.getId(), "购买GRICE", amount, "USDT", 1, 1);
return Result.ok("购买成功");
}
@@ -109,14 +114,14 @@
public Result findPrice() {
PriceVo priceVo = new PriceVo();
String newPriceStr = redisUtils.getString("bea_order_new_price");
- priceVo.setNewPrice(StrUtil.isNotBlank(newPriceStr) ? new BigDecimal(newPriceStr) : BigDecimal.valueOf(66));
+ priceVo.setNewPrice(StrUtil.isNotBlank(newPriceStr) ? new BigDecimal(newPriceStr) : AppContants.DEFAULT_PRICE);
String status = redisUtils.getString("bea_order_status");
priceVo.setStatus(StrUtil.isNotBlank(status) ? Integer.parseInt(status) : 2);
String remain = redisUtils.getString("bea_coin_total");
- priceVo.setRemainCnt(Integer.parseInt(remain));
+ priceVo.setRemainCnt(280000);
BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
priceVo.setTotalAmount(totalAmount);
@@ -139,11 +144,11 @@
}
MemberWalletCoinEntity wallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), CoinTypeEnum
- .BEA.name());
+ .GRICE.name());
memberWalletCoinDao.updateBlockBalance(wallet.getId(), totalAmount, BigDecimal.ZERO, 0);
gbzOrderDao.updateStatus(member.getId());
- LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取BEA到资产", totalAmount, "BEA", 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(member.getId(), "提取GRICE到资产", totalAmount, "GRICE", 1, 1);
return Result.ok("提取成功");
}
}
--
Gitblit v1.9.1