Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -1497,11 +1497,17 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             roomFee.setCreateTime(new Date());
             roomFee.setDayTime(new Date());
             roomFee.setHotelId(hotelId);
+            feeService.save(roomFee);
             if(roomFee.getSubjectType().equals(FeeSubjectType.SHANG_PIN.getKey()) && roomFee.getFeeGoods() != null && roomFee.getFeeGoods().size() > 0) {
                 // 判断是否相等 搞尼玛~傻逼
+                roomFee.getFeeGoods().forEach(s->{
+                    s.setOrderFeeId(roomFee.getId());
+                    s.setLivingOrderId(livingOrderId);
+                    s.setCreateTime(new Date());
+                    s.setHotelId(livingOrder.getHotelId());
+                });
                 orderFeeGoodsService.saveBatch(roomFee.getFeeGoods());
             }
-            feeService.save(roomFee);
         });
 
         return true;
@@ -2549,6 +2555,8 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             settleFee.setCreateTime(new Date());
             settleFee.setPayTime(new Date());
             settleFee.setPreferentialStatus(2);
+            settleFee.setLivingOrderId(fee.getLivingOrderId());
+            settleFee.setRoomId(fee.getRoomId());
             feeService.save(settleFee);
         }
         fee.setReturnItem(true);