修改商家无法看到用户已删除订单bug

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

@@ -57,6 +57,7 @@ public class Booking {
   private String checkOutTime; // 离店时间
   private String remake; // 备注信息
   private int isDelete; // 是否假删除：0删除，1正常
+  private String liveTime;//入住时间
 
   private String lockTime; // 锁定时间
 
@@ -479,4 +480,12 @@ public class Booking {
   public void setHotelIsCheckout(String hotelIsCheckout) {
     this.hotelIsCheckout = hotelIsCheckout;
   }
+
+  public String getLiveTime() {
+    return liveTime;
+  }
+
+  public void setLiveTime(String liveTime) {
+    this.liveTime = liveTime;
+  }
 }

mhotel/src/com/happy/action/bookAction.java

@@ -123,6 +123,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                         return null;
                     }
                     book.setOrderStatus("4");
+                    book.setLiveTime(UUIDUtil.getNewDate());
                     book.setUpdateTime(UUIDUtil.getNewDate());
                     msg = "入住办理";
                     break;
@@ -193,6 +194,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
     public String quearyBookPage(){
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
+        //s1.append(" and is_delete = 1");
         if(managerId!=null){
             s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         }