fix

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

@@ -1261,7 +1261,6 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             settleFee.setRoomId(bkRoom.getRoomId());
             settleFee.setPreferentialStatus(1); // 未结账
             feeService.save(settleFee);
-            return true;
         }
         CesRooms room =  roomsService.getById(bkRoom.getRoomId());
         settleFee.getPrices().forEach(s -> {
@@ -1271,7 +1270,8 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             s.setLivingOrderId(livingOrderId);
         });
         livingLayoutDayPriceService.saveBatch(settleFee.getPrices());
-        throw new JeecgBootException("设置失败");
+        return true;
+//        throw new JeecgBootException("设置失败");
     }
 
     @Override

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/fw/controller/FwRoomExamineController.java

@@ -13,8 +13,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusCustomer;
 import org.jeecg.modules.business.entity.BusLivingCustomer;
 import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
+import org.jeecg.modules.business.service.IBusCustomerService;
 import org.jeecg.modules.business.service.IBusLivingCustomerService;
 import org.jeecg.modules.business.service.IBusRoomsLivingOrderService;
 import org.jeecg.modules.fw.entity.FwRoomExamine;
@@ -64,6 +66,8 @@ public class FwRoomExamineController extends JeecgController<FwRoomExamine, IFwR
 	private CesRoomsServiceImpl cesRoomsService;
 	@Resource
 	private IBusLivingCustomerService busLivingCustomerService;
+	@Resource
+	private IBusCustomerService busCustomerService;
 
 	/**
 	 * 分页列表查询
@@ -94,9 +98,9 @@ public class FwRoomExamineController extends JeecgController<FwRoomExamine, IFwR
 				}
 				BusRoomsLivingOrder busRoomsLivingOrder = busRoomsLivingOrderService.getById(t.getLivingOrderId());
 				if (busRoomsLivingOrder != null) {
-					BusLivingCustomer busLivingCustomer = busLivingCustomerService.getById(busRoomsLivingOrder.getContactId());
-					if (busLivingCustomer != null) {
-						t.setContactName(busLivingCustomer.getCustomerName());
+					BusCustomer busCustomer = busCustomerService.getById(busRoomsLivingOrder.getContactId());
+					if (busCustomer != null) {
+						t.setContactName(busCustomer.getName());
 					}
 				}
 			}