修改确认收货的BUG

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<HotelLeaseLog> 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("数据错误，请刷新重试");