From 89b7fb1d316cfce7eb98a27c8d668da493933f7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Feb 2022 16:29:07 +0800
Subject: [PATCH] 20222223

---
 src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 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 e825b5b..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;
@@ -48,13 +49,21 @@
     @PostMapping(value = "/add")
     @Transactional(rollbackFor = Exception.class)
     public Result add(@RequestBody GbzAddDto gbzAddDto) {
-        String status = redisUtils.getString("bea_order_status");
-        if (!"1".equals(status)) {
-            return Result.fail("无法购买");
+//        String status = redisUtils.getString("bea_order_status");
+//        if ("1".equals(status)) {
+//            return Result.fail("无法购买");
+//        }
+
+        String start = redisUtils.getString("bea_start");
+        if ("2".equals(start)) {
+            return Result.fail("暂无法购买");
+        }
+
+        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);
@@ -65,7 +74,7 @@
         }
 
         if (Integer.parseInt(total) < gbzAddDto.getCount()) {
-            return Result.fail("BEA数量不足");
+            return Result.fail("GRICE数量不足");
         }
 
         GbzOrderEntity gbzOrder = new GbzOrderEntity();
@@ -73,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("购买成功");
     }
 
@@ -105,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(88888);
+        priceVo.setRemainCnt(280000);
 
         BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
         priceVo.setTotalAmount(totalAmount);
@@ -135,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