From a338b26ec5f3beb56a5f0143db025be54848dd77 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 26 Nov 2024 08:54:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcx/order/service/impl/OrderServiceImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 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 9052d53..d929aa0 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 @@ -3323,15 +3323,18 @@ public class OrderServiceImpl implements IOrderService { .eq(HotelLeaseLog::getId, hotelLeaseLog.getPid()) .one(); - int num = hotelLeaseLog1.getNum() + hotelLeaseLog.getNum(); - BigDecimal price = hotelLeaseLog1.getPrice().add(hotelLeaseLog.getPrice()); - HotelLeaseLog hotelLeaseLog2 = new HotelLeaseLog(); - hotelLeaseLog2.setId(hotelLeaseLog1.getId()); - hotelLeaseLog2.setNum(num); - hotelLeaseLog2.setPrice(price); - hotelLeaseLogService.updateById(hotelLeaseLog2); + //如果父物品不为空，则还原物品数据 + if(null != hotelLeaseLog1){ + int num = hotelLeaseLog1.getNum() + hotelLeaseLog.getNum(); + BigDecimal price = hotelLeaseLog1.getPrice().add(hotelLeaseLog.getPrice()); + HotelLeaseLog hotelLeaseLog2 = new HotelLeaseLog(); + hotelLeaseLog2.setId(hotelLeaseLog1.getId()); + hotelLeaseLog2.setNum(num); + hotelLeaseLog2.setPrice(price); + hotelLeaseLogService.updateById(hotelLeaseLog2); - hotelLeaseLogService.removeById(hotelLeaseLog.getId()); + hotelLeaseLogService.removeById(hotelLeaseLog.getId()); + } }