From d3b7e2e9cb1dc45f98d8828fb8ac292ffccfb327 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 05 Nov 2021 16:08:04 +0800 Subject: [PATCH] fix --- src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 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 7f79421..fb3598d 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,17 +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("暂无法购买"); } - 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); @@ -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(88888); + priceVo.setRemainCnt(280000); BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId()); priceVo.setTotalAmount(totalAmount); -- Gitblit v1.9.1