1、取消订单失败问题解决

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());
+            }
 
         }