From 2b82f39a918527335106ab4c206e5c02f8314a1b Mon Sep 17 00:00:00 2001 From: zhuer <921381834@qq.com> Date: Mon, 8 Apr 2024 16:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E6=AC=BE=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/card/AppCardController.java | 4 ++-- .../member/job/BalanceDeductionJob.java | 3 ++- .../member/service/card/CardServiceImpl.java | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java index 2971fb45..a9ffaaf3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/card/AppCardController.java @@ -90,7 +90,7 @@ public class AppCardController { @Operation(summary = "充值") //@PreAuthorize("@ss.hasPermission('member:card:update')") public CommonResult recharge(BigDecimal money) { - return success(cardService.recharge(money,CardDO.ADD)); + return success(cardService.recharge(money.divide(new BigDecimal("100")), CardDO.ADD)); } @GetMapping("/getMoney") @@ -103,7 +103,7 @@ public class AppCardController { @Operation(summary = "获取本月支出或充值金额") @Parameter(name = "flag", description = "0-支出，1-充值", required = true, example = "1") public CommonResult getMonthMoney(Long userId, String flag, String time) { - return success(cardService.getMonthMoney(userId,flag,time)); + return success(cardService.getMonthMoney(userId, flag, time)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java index fa1c1612..d484d661 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/BalanceDeductionJob.java @@ -67,7 +67,8 @@ public class BalanceDeductionJob implements JobHandler { List list = new ArrayList<>(); toPay.forEach(dishOrderDO -> { //新的总价 - BigDecimal total = new BigDecimal(stringRedisTemplate.opsForValue().get(dishOrderDO.getDiningPlatesNum())); +// BigDecimal total = new BigDecimal(stringRedisTemplate.opsForValue().get(dishOrderDO.getDiningPlatesNum())); + BigDecimal total = new BigDecimal(0.01); Long userId = dishOrderDO.getUserId(); CardDO cardDO = new CardDO(); cardDO.setType(TimePeriodEnum.getTimePeriod(LocalDateTime.now())); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java index 9f2a74a1..666cb6f8 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/card/CardServiceImpl.java @@ -99,22 +99,22 @@ public class CardServiceImpl implements CardService { cardDO.setFlag(flag); cardDO.setChangeMoney(money); cardDO.setType(CostTypeEnum.WX_PAY.getCode()); - BigDecimal oldMoney = BigDecimal.ZERO; - if(ObjectUtil.isNotEmpty(lastCardDO) && lastCardDO.getMoney() != null){ + BigDecimal oldMoney = BigDecimal.ZERO; + if (ObjectUtil.isNotEmpty(lastCardDO) && lastCardDO.getMoney() != null) { oldMoney = lastCardDO.getMoney(); } - if(CardDO.ADD.equals(flag)){ + if (CardDO.ADD.equals(flag)) { cardDO.setMoney(oldMoney.add(money).setScale(2, BigDecimal.ROUND_HALF_UP)); - }else { + } else { cardDO.setMoney(oldMoney.subtract(money).setScale(2, BigDecimal.ROUND_HALF_UP)); } - return cardMapper.insert(cardDO)>0; + return cardMapper.insert(cardDO) > 0; } @Override public BigDecimal getMoney() { CardDO lastCardDO = getLastCardDO(); - if (lastCardDO.getMoney() == null){ + if (ObjectUtil.isEmpty(lastCardDO) || lastCardDO.getMoney() == null) { return BigDecimal.ZERO; } return lastCardDO.getMoney(); @@ -124,7 +124,7 @@ public class CardServiceImpl implements CardService { public BigDecimal getMoneyByUserId(Long userId) { CardDO lastCardDO = cardMapper.selectOne(Wrappers.lambdaQuery().eq(CardDO::getUserId, userId) .orderByDesc(CardDO::getCreateTime).last("limit 1")); - if (lastCardDO.getMoney() == null){ + if (lastCardDO.getMoney() == null) { return BigDecimal.ZERO; } return lastCardDO.getMoney(); @@ -132,9 +132,10 @@ public class CardServiceImpl implements CardService { /** * 获取当前用户最新余额明细 + * * @return */ - public CardDO getLastCardDO(){ + public CardDO getLastCardDO() { CardDO lastCardDO = cardMapper.selectOne(Wrappers.lambdaQuery().eq(CardDO::getUserId, SecurityFrameworkUtils.getLoginUserId()) .orderByDesc(CardDO::getCreateTime).last("limit 1")); return lastCardDO; @@ -146,7 +147,7 @@ public class CardServiceImpl implements CardService { } @Override - public AppCardMonthVO getMonthMoney(Long userId,String flag, String time) { + public AppCardMonthVO getMonthMoney(Long userId, String flag, String time) { DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDate parse = LocalDate.parse(time, dateFormatter);