Browse Source

hotelType: "包吃住型"

Administrator 2 years atrás
parent
commit
69aa69409e

+ 1 - 1
mhotel/src/com/happy/Model/Booking.java

@@ -28,7 +28,7 @@ public class Booking {
   private String hotelTownshipName; // 民宿所属乡镇
   private String hotelTownshipName; // 民宿所属乡镇
   private String hotelConfig; // 民宿配置
   private String hotelConfig; // 民宿配置
   private List hotelConfigList; // 民宿配置列表
   private List hotelConfigList; // 民宿配置列表
-  private String hotelType; // 民宿类型
+  private String hotelType; // 民宿类型(舒适形、舒适型、包吃住型、普通型)
   private String hotelIsCanorder; // 是否可取消订单 (1是 2否)
   private String hotelIsCanorder; // 是否可取消订单 (1是 2否)
   private String hotelIsOrder; // 是否自动接单 接单设置(1自动接单 2手动接单)
   private String hotelIsOrder; // 是否自动接单 接单设置(1自动接单 2手动接单)
   private String hotelIsCheckout; // 是否自动退房(1是 2否)
   private String hotelIsCheckout; // 是否自动退房(1是 2否)

+ 5 - 1
mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -37,6 +37,8 @@ public class AppBookImplService implements AppBookService {
     @Resource
     @Resource
     public UserService userService;
     public UserService userService;
     @Resource
     @Resource
+    public HotelDictService hotelDictService;
+    @Resource
     public AdminManagerService adminManagerService;
     public AdminManagerService adminManagerService;
 
 
     @Override
     @Override
@@ -58,6 +60,8 @@ public class AppBookImplService implements AppBookService {
 
 
         int day = DateUtil.getDayDiff(startTime,endTime); // 中间多少天
         int day = DateUtil.getDayDiff(startTime,endTime); // 中间多少天
         String orderLiveTime= Func.parseInt(houseOrderNumber)+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
         String orderLiveTime= Func.parseInt(houseOrderNumber)+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
+        String hotelType = hotelDictService.getDictNameById(Integer.parseInt(hotel.getHtype()));// 民宿类型hotel.getHtype()
+
 
 
         // 设置民宿信息
         // 设置民宿信息
         booking.setHotelId(Func.parseStr(hotel.getId()));
         booking.setHotelId(Func.parseStr(hotel.getId()));
@@ -67,7 +71,7 @@ public class AppBookImplService implements AppBookService {
         booking.setHotelManagerId(hotel.getManagerId());
         booking.setHotelManagerId(hotel.getManagerId());
         booking.setHotelTownship(adminManager.getHotelTownship());
         booking.setHotelTownship(adminManager.getHotelTownship());
         booking.setHotelConfig(hotel.getHconfig());
         booking.setHotelConfig(hotel.getHconfig());
-        booking.setHotelType(hotel.getHtype());
+        booking.setHotelType(hotelType);  // 民宿类型(舒适形、舒适型、包吃住型、普通型)
         booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder())); // 是否自动取消订单
         booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder())); // 是否自动取消订单
         booking.setHotelIsOrder(Func.parseStr(hotel.getIsOrder())); // 是否自动接单
         booking.setHotelIsOrder(Func.parseStr(hotel.getIsOrder())); // 是否自动接单
         booking.setHotelIsCheckout(Func.parseStr(hotel.getIsCheckout())); // 是否自动离店
         booking.setHotelIsCheckout(Func.parseStr(hotel.getIsCheckout())); // 是否自动离店