修改

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -421,14 +421,14 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 }
 
 	 /**
-	  * 客历
+	  * 客單
 	  * @param type 1 入住订单查询->livingStatus | 2 bookingStatus
 	  * @param livingStatus -1 正常入住，1 已结账退房，2 先走未结,3 联房退房
 	  * @param bookingStatus 1 预定中 2 在住 3 已取消
 	  * @return
 	  */
 	 @ApiOperation(value="酒店预定订单-客历", notes="酒店预定订单-客历")
-	 @RequestMapping(value = "/keli-orders",method = RequestMethod.GET)
+	 @RequestMapping(value = "/kedan-orders",method = RequestMethod.GET)
 	 public Result<IPage<KeLiItemVo>> keli(Page<KeLiItemVo> page, String keyw, Integer livingStatus,String hotelId,Integer type,Integer bookingStatus){
 	 	if(type == null) throw new JeecgBootException("参数错误");
 	 	if( type == 1 && livingStatus  == null ) throw new JeecgBootException("参数错误");

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

@@ -1735,6 +1735,19 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     e.printStackTrace();
                 }
                 feeService.save(nFee);
+            } else {
+                BusOrderFee nFee = opFee.get();
+                try {
+                    // 每日房费转夜审房费
+                    if(nFee.getSubjectType().equals(FeeSubjectType.MEI_RI_FANG_FEI.getKey()) &&  DateUtils.parseDate(s,"yyyy-MM-dd").getTime() < DateUtils.parseDate(DateUtils.formatDate(new Date()),"yyyy-MM-dd").getTime()) {
+                        nFee.setCustorerOrderRemark("夜审房费");
+                        nFee.setRemark("当日房费 ——> 夜审房费");
+                        nFee.setSubjectType(FeeSubjectType.YE_SHEN_FANG_FEI.getKey());
+                        feeService.updateById(nFee);
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
             }
         });
     }