Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/Model/Booking.java

@@ -20,7 +20,6 @@ public class Booking {
   private String hotelHpositionWens; // 民宿经纬度
   private String hotelPhone; // 民宿联系电话
   private String hotelPerson; // 民宿联系人
-  private String hotelManagerId; // 所属商家id
   private String hotelTownship; // 民宿所属乡镇
   private String hotelConfig; // 民宿配置
   private String hotelType; // 民宿类型
@@ -110,13 +109,6 @@ public class Booking {
     this.userPhone = userPhone;
   }
 
-  public String getHotelManagerId() {
-    return hotelManagerId;
-  }
-
-  public void setHotelManagerId(String hotelManagerId) {
-    this.hotelManagerId = hotelManagerId;
-  }
 
   public String getHotelId() {
     return hotelId;

mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -71,8 +71,8 @@ public class AppBookImplService implements AppBookService {
         // 设置住客信息
         booking.setUserName(userName);
         booking.setUserPhone(userPhone);
-        booking.setOrderStartTime(DateUtil.parseDateOnly(startTime));
-        booking.setOrderEndTime(DateUtil.parseDateOnly(endTime));
+        booking.setOrderStartTime(startTime);
+        booking.setOrderEndTime(endTime);
         int day = DateUtil.getDayDiff(startTime,endTime);
         String orderLiveTime= day+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
         booking.setOrderLiveTime(orderLiveTime);
@@ -80,7 +80,7 @@ public class AppBookImplService implements AppBookService {
         // 订单信息
         Integer orderNum = TimeExchange.StringToTimestamp(TimeExchange.getDate());// 订单号
         booking.setOrderNum(Func.parseStr(orderNum));
-        booking.setCreateTime(DateUtil.getCurrentDate());
+        booking.setCreateTime(DateUtil.getFormatPaternDate(DateUtil.getCurrentDate()));
         bookService.insertBooking(booking);