From 704010bad60d4c3f7b748e04e0ec029f7d3bef83 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Thu, 10 Oct 2024 15:16:49 +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 --- .../yudao/module/member/job/BalanceDeductionJob.java | 3 ++- .../service/orderdetail/OrderDetailServiceImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 6 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 d77e3a3a..9a227bef 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 @@ -85,7 +85,8 @@ public class BalanceDeductionJob implements JobHandler { reductionAmount = userService.getReductionAmount(userId, total, dishOrderDO.getCreateTime()); } if(dishOrderDO.getReductionAmount().compareTo(BigDecimal.ZERO) > 0){ - dishOrderDO.setReductionAmount(reductionAmount.add(dishOrderDO.getReductionAmount())); + reductionAmount = reductionAmount.add(dishOrderDO.getReductionAmount()); + dishOrderDO.setReductionAmount(reductionAmount); }else { dishOrderDO.setReductionAmount(reductionAmount); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java index 8d2e91e0..c65d9294 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java @@ -84,11 +84,11 @@ public class OrderDetailServiceImpl implements OrderDetailService { throw exception(ORDER_ALREADY_COMPLETE); } - //判定餐盘是否绑定并刷新绑定时间 - Boolean b = diningPlatesService.checkBind(createReqVO.getDiningPlatesNum(), createReqVO.getStoreId()); - if (!b) { - throw exception(DINING_PLATES_NOT_BIND); - } + ////判定餐盘是否绑定并刷新绑定时间 + //Boolean b = diningPlatesService.checkBind(createReqVO.getDiningPlatesNum(), createReqVO.getStoreId()); + //if (!b) { + // throw exception(DINING_PLATES_NOT_BIND); + //} DishesRespDto dish = dishesApi.getDish(createReqVO.getDishesId()); DishesNutritionRespDTO dishEnergy = dishesNutritionApi.getDishEnergy(createReqVO.getDishesId());