没问

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

@@ -1798,10 +1798,16 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                         order.setLivingType(2);
                         order.setHourRoomId(info.getFangAnId());
                         order.setDueOutTime(targetTime);
-                        updateOrderPrice(info.getPrices());
+                        Calendar startCal = Calendar.getInstance();
+                        startCal.setTime(order.getArrivalTime());
+                        Calendar endCal = Calendar.getInstance();
+                        endCal.setTime(targetTime);
+                        int dayCount = DateUtils.dateDiff('d',startCal,endCal);
+                        order.setDayCount(Math.abs(dayCount));
                     } else throw new JeecgBootException("请选择时租房规则");
 
                 } else if(info.getLiveType().equals(1)) {
+                    order.setLivingType(1);
                     CesAllDayPriceRule rule = allDayPriceRuleService.getOne(Wrappers.<CesAllDayPriceRule>query().eq("hotel_id",order.getHotelId()));
                     String leaveTime = "13:00";
                     if(rule == null || rule.getLeaveTime() == null) {
@@ -1865,7 +1871,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             if(DateUtils.formatDate(new Date()).equals(DateUtils.formatDate(s.getDayTime()))){
                 // 修改当日房价 产生的当日房费账单也要改
                 BusOrderFee fee = feeService.getOne(Wrappers.<BusOrderFee>query()
-                        .eq("day_time",DateUtils.formatDate(new Date())));
+                        .eq("DATE_FORMAT(day_time,'%Y-%m-%d')",DateUtils.formatDate(new Date())).eq("living_order_id",s.getLivingOrderId()));
                 if(fee != null) {
                     fee.setMoney(s.getPrice());
                     feeService.updateById(fee);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -536,5 +536,11 @@ public class CesRoomsController {
         }
         return Result.ok(roomsService.roomLiveStat(hotelId));
     }
+
+    @ApiOperation(value = "房间门市价", notes = "房间门市价")
+    @GetMapping(value = "/get-room-mkt-price")
+    public Result<BigDecimal> getRoomMktPrice(String roomId) {
+        return Result.ok(roomsService.getRoomMktPrice(roomId));
+    }
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -405,4 +405,15 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
     public List<LivingSourceStatVo> roomLiveStat(String hotelId){
         return roomsMapper.roomLiveStat(hotelId);
     }
+
+    // 根据房间id获取对应房型的门市价
+    public BigDecimal getRoomMktPrice(String roomId) {
+        if(roomId == null || roomId.isEmpty()) throw new JeecgBootException("参数错误");
+        CesRooms room = getById(roomId);
+        if(room == null) throw new JeecgBootException("房间不存在");
+        CesRoomLayout layout = layoutService.getById(room.getLayoutId());
+        if(layout == null) throw new JeecgBootException("房型不存在");
+        return  layout.getMarketPrice();
+
+    }
 }