|
|
@@ -934,31 +934,31 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
|
|
|
//</editor-fold>
|
|
|
|
|
|
//<editor-fold desc="todo:账单相关">
|
|
|
- BigDecimal money = new BigDecimal(0);
|
|
|
- BusLivingLayoutDayPrice price = livingLayoutDayPriceService.getOne(Wrappers.<BusLivingLayoutDayPrice>query()
|
|
|
- .eq("living_order_id", livingOrder.getId()).eq("day_time",DateUtils.formatDate(new Date())+" 00:00:00"));
|
|
|
- if(price != null) {
|
|
|
- money = price.getPrice();
|
|
|
- } else {
|
|
|
- CesRoomLayout layout = layoutService.getById(room.getLayoutId());
|
|
|
- if(layout == null) throw new JeecgBootException("房价不存在");
|
|
|
- money = layout.getMarketPrice();
|
|
|
- }
|
|
|
-
|
|
|
- BusOrderFee dayOrderFee = new BusOrderFee();
|
|
|
- dayOrderFee.setDayTime(new Date());
|
|
|
- dayOrderFee.setCreateTime(new Date());
|
|
|
- dayOrderFee.setMoney(money);
|
|
|
- dayOrderFee.setFeeType(1);
|
|
|
- dayOrderFee.setSubjectType(FeeSubjectType.MEI_RI_FANG_FEI.getKey());
|
|
|
- CesRooms orderRoom = room;
|
|
|
- dayOrderFee.setRoomId(orderRoom.getId());
|
|
|
- String roomName = orderRoom.getPrefix() != null?orderRoom.getPrefix():"";
|
|
|
- roomName += roomName + orderRoom.getName();
|
|
|
- dayOrderFee.setRemark("【"+roomName + "】 "+ DateUtils.formatDate(dayOrderFee.getDayTime()) + " 当日房费");
|
|
|
- dayOrderFee.setLivingOrderId(livingOrder.getId());
|
|
|
- dayOrderFee.setHotelId(hotelId);
|
|
|
- feeService.save(dayOrderFee);
|
|
|
+// BigDecimal money = new BigDecimal(0);
|
|
|
+// BusLivingLayoutDayPrice price = livingLayoutDayPriceService.getOne(Wrappers.<BusLivingLayoutDayPrice>query()
|
|
|
+// .eq("living_order_id", livingOrder.getId()).eq("day_time",DateUtils.formatDate(new Date())+" 00:00:00"));
|
|
|
+// if(price != null) {
|
|
|
+// money = price.getPrice();
|
|
|
+// } else {
|
|
|
+// CesRoomLayout layout = layoutService.getById(room.getLayoutId());
|
|
|
+// if(layout == null) throw new JeecgBootException("房价不存在");
|
|
|
+// money = layout.getMarketPrice();
|
|
|
+// }
|
|
|
+//
|
|
|
+// BusOrderFee dayOrderFee = new BusOrderFee();
|
|
|
+// dayOrderFee.setDayTime(new Date());
|
|
|
+// dayOrderFee.setCreateTime(new Date());
|
|
|
+// dayOrderFee.setMoney(money);
|
|
|
+// dayOrderFee.setFeeType(1);
|
|
|
+// dayOrderFee.setSubjectType(FeeSubjectType.MEI_RI_FANG_FEI.getKey());
|
|
|
+// CesRooms orderRoom = room;
|
|
|
+// dayOrderFee.setRoomId(orderRoom.getId());
|
|
|
+// String roomName = orderRoom.getPrefix() != null?orderRoom.getPrefix():"";
|
|
|
+// roomName += roomName + orderRoom.getName();
|
|
|
+// dayOrderFee.setRemark("【"+roomName + "】 "+ DateUtils.formatDate(dayOrderFee.getDayTime()) + " 当日房费");
|
|
|
+// dayOrderFee.setLivingOrderId(livingOrder.getId());
|
|
|
+// dayOrderFee.setHotelId(hotelId);
|
|
|
+// feeService.save(dayOrderFee);
|
|
|
//</editor-fold>
|
|
|
return livingOrder.getId();
|
|
|
}
|
