From 400ca2fe81c940539b438ae6e189d979b09969cc Mon Sep 17 00:00:00 2001 From: ieaii <1069385070@qq.com> Date: Thu, 23 Jan 2025 10:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/xcx/order/service/impl/OrderServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java index 117dda8..a5d4244 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java @@ -2589,6 +2589,7 @@ public class OrderServiceImpl implements IOrderService { //用户 + hotelLeaseLog.setId(IdWorker.getIdStr()); hotelLeaseLog.setUserId(hotelOrder.getUserId()); hotelLeaseLog.setShopId(hotelOrder.getShopId()); hotelLeaseLog.setOrderId(hotelOrder.getId()); @@ -2603,6 +2604,12 @@ public class OrderServiceImpl implements IOrderService { hotelLeaseLog.setPrice(hotelOrderDetail.getDeposit()); hotelLeaseLog.setCategoryId(hotelOrderDetail.getCategoryId()); +// HotelOrderDetail hotelOrderDetail2 = new HotelOrderDetail(); +// hotelOrderDetail2.setId(hotelOrderDetail.getId()); +// hotelOrderDetail2.setLeaseId(hotelLeaseLog.getId()); +// hotelOrderDetailService.updateById(hotelOrderDetail2); + + HotelGoods hotelGoods = hotelGoodsService.lambdaQuery() .eq(HotelGoods::getDelFlag, 0) @@ -3127,10 +3134,15 @@ public class OrderServiceImpl implements IOrderService { } List hotelLeaseLogs = new ArrayList<>(); for (HotelOrderDetail hotelOrderDetail:hotelOrderDetails){ +// HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery() +// .eq(HotelLeaseLog::getDelFlag, 0) +// .eq(HotelLeaseLog::getId, hotelOrderDetail.getLeaseId()) +// .eq(HotelLeaseLog::getUserId, hanHaiMember.getId()) +// .one(); HotelLeaseLog hotelLeaseLog = hotelLeaseLogService.lambdaQuery() .eq(HotelLeaseLog::getDelFlag, 0) - .eq(HotelLeaseLog::getId, hotelOrderDetail.getLeaseId()) - .eq(HotelLeaseLog::getUserId, hanHaiMember.getId()) + .eq(HotelLeaseLog::getOrderId, hotelOrder.getId()) + .eq(HotelLeaseLog::getOrderDetailId, hotelOrderDetail.getId()) .one(); if(hotelLeaseLog == null){ throw new JeecgBootException("数据错误，请刷新重试");