From 71143c2c7789fb8ad846f681878f574b31a8ab28 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Wed, 9 Oct 2024 20:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/job/BalanceDeductionJob.java | 12 ++++----- .../diningplates/DiningPlatesServiceImpl.java | 25 ++++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) 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 a4ec8c72..d77e3a3a 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 @@ -150,12 +150,12 @@ public class BalanceDeductionJob implements JobHandler { cardDO.setChangeMoney(total); cardDO.setFlag(CardDO.MINUS); cardService.insertOne(cardDO); - String redisData = stringRedisTemplate.opsForValue().get("DATA-money"+ userId); - - if(StrUtil.isNotBlank(redisData)){ - stringRedisTemplate.opsForValue().set("DATA-money"+userId, cardDO.getMoney().toString()); - - } + //String redisData = stringRedisTemplate.opsForValue().get("DATA-money"+ userId); + // + //if(StrUtil.isNotBlank(redisData)){ + // stringRedisTemplate.opsForValue().set("DATA-money"+userId, cardDO.getMoney().toString()); + // + //} list.add(cardDO); dishOrderDO.setTotalMoney(total); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java index 1bd61026..6477fc00 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java @@ -290,16 +290,19 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { throw exception(DINING_PLATES_NOT_BIND); } AppUserInfoCardVO appUserInfoCardVO = new AppUserInfoCardVO(); - String name = stringRedisTemplate.opsForValue().get("DATA-name" + diningPlatesDO.getUserId()); - String money = stringRedisTemplate.opsForValue().get("DATA-money" + diningPlatesDO.getUserId()); - if(StrUtil.isNotBlank(name)&& StrUtil.isNotBlank(money)){ - appUserInfoCardVO.setName(name); - appUserInfoCardVO.setMoney(new BigDecimal(money)); - return appUserInfoCardVO; - } + //String name = stringRedisTemplate.opsForValue().get("DATA-name" + diningPlatesDO.getUserId()); + //String money = stringRedisTemplate.opsForValue().get("DATA-money" + diningPlatesDO.getUserId()); + //if(StrUtil.isNotBlank(name)&& StrUtil.isNotBlank(money)){ + // appUserInfoCardVO.setName(name); + // appUserInfoCardVO.setMoney(new BigDecimal(money)); + // return appUserInfoCardVO; + //} MemberUserDO memberUserDO = memberUserMapper.selectById(diningPlatesDO.getUserId()); - stringRedisTemplate.opsForValue().set("DATA-name"+diningPlatesDO.getUserId(), memberUserDO.getNickname()); - stringRedisTemplate.opsForValue().set("DATA-money"+diningPlatesDO.getUserId(), cardService.getMoneyByUserId(memberUserDO.getId()).toString()); + //stringRedisTemplate.opsForValue().set("DATA-name"+diningPlatesDO.getUserId(), memberUserDO.getNickname()); + //stringRedisTemplate.opsForValue().set("DATA-money"+diningPlatesDO.getUserId(), cardService.getMoneyByUserId(memberUserDO.getId()).toString()); + appUserInfoCardVO.setName(memberUserDO.getNickname()); + appUserInfoCardVO.setMoney(cardService.getMoneyByUserId(memberUserDO.getId())); + //刷新绑定时间 CompletableFuture.supplyAsync(() -> { int i = 0; @@ -440,9 +443,7 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { .eq(DiningPlatesDO::getStoreId,storeId) .last("limit 1")); - dishOrderMapper.update(Wrappers.lambdaUpdate() - .set(DishOrderDO::getOrderStatus,"1") - .eq(DishOrderDO::getId,diningPlatesDO.getOrderId())); + dishOrderMapper.deleteById(diningPlatesDO.getOrderId()); diningPlatesMapper.update(Wrappers.lambdaUpdate() .set(DiningPlatesDO::getPayFlag, DiningPlatesDO.TO_PAY) .set(DiningPlatesDO::getStatus, DiningPlatesDO.FREE)