diff --git a/README.md b/README.md
index 00a0e72..4ba27e2 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,6 @@
 
 #MrCode
 
-
-- 队伍名称：码先生
-- 项目名称：MrCode
-- 团队队长：张羽中
-- 团队成员：邹辛怀、吴敏、朱源、王嘉廉、吴燕晶
 - 项目简介：MrCode 自助酒店终端管理系统！旨在简化目前酒店入住繁琐的登记退房过程。用户自助入住，一键退房，通过DataMining推荐吃喝、玩乐、出行。项目源于美团点评杯，项目流程基于用户已购买美团券。
 
 
@@ -22,16 +17,13 @@
 
 
 
-相关链接
----
-[MrCode](http://www.monkeyhorse.cn/MrCode)   |   [文档手册](https://github.com/Uoor/xmu-2016-MrCode/tree/dev/dos)   |   [酒店管理系统<==>MrCode](http://www.monkeyhorse.cn/JavaPrj_9).
-
 
 依赖
 ---
 
+* HTML5
 * LAM+SSH
-* [Kmeans](https://github.com/Uoor/xmu-2016-MrCode/tree/dev/dos/DataMining)
+* [Kmeans](https://github.com/Uoor/xmu-2016-MrCode/tree/dev/doc/DataMining)
 * Jquery
 
 
@@ -39,62 +31,53 @@
 -------
 * 码团用户寓意于美团用户
 
-* 用户身份登陆(已有`admin/111111`)，也可动态登陆。
-    * [MrCode 主页](http://www.monkeyhorse.cn/MrCode)
+* 用户身份登陆，也可动态登陆。
     * [MrCode Github](https://github.com/Uoor/xmu-2016-MrCode/)
 
     
 * 酒店管理系统，用于与MrCode交互
-* 管理员登陆（已有`admin/admin`）
-	* [酒店管理系统 主页](http://www.monkeyhorse.cn/JavaPrj_9).
+* 管理员登陆
 	* [酒店管理系统 Github](https://github.com/wjialian/hotelSystem).
 
 
-扫描以下二维码，或关注微信公众号（厦大开发精英小组），即可享受自助入住体验
----
-
-  ![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/publicNumber.jpg)
-
-
 
 截图
 ---
 
 #### 流程图
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/flowchart/mrcode.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/flowchart/mrcode.jpg)
 
 #### 登陆
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/login.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/login.jpg)
 
 #### 主页
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/index.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/index.jpg)
 
 #### 团购券列表
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/order0.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/order0.jpg)
 
 #### 选择日期
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/order2.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/order2.jpg)
 
 #### 房间选择
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/order3.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/order3.jpg)
 
 #### 入住人选择并生成订单
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/order4.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/order4.jpg)
 
 #### 支付宝支付
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/order5.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/order5.jpg)
 
 #### 酒店管理
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/manage.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/manage.jpg)
 
 #### 侧栏
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/side.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/side.jpg)
 
 #### 用于交互用的酒店管理系统
-![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/dos/pic/hotel.jpg)
+![](https://github.com/Uoor/xmu-2016-MrCode/blob/dev/doc/pic/hotel.jpg)
 
 交流讨论
 -------
-- [文档手册](https://github.com/Uoor/xmu-2016-MrCode/tree/dev/dos)
-- 若因数据库问题影响运行，请联系我
+- [文档手册](https://github.com/Uoor/xmu-2016-MrCode/tree/dev/doc)
 - email: i@monkeyhorse.cn
diff --git a/WebRoot/WEB-INF/index.jsp b/WebRoot/WEB-INF/index.jsp
index f09e80e..8ace364 100644
--- a/WebRoot/WEB-INF/index.jsp
+++ b/WebRoot/WEB-INF/index.jsp
@@ -121,7 +121,7 @@
         <div class="text">关于我们</div>
     </a>
     </div>
-<div class="footer" ">
+<div class="footer">
     <p class="footer-top">&COPY;码先生团队</p>
     <p class="footer-bottom">
         <a href="${ctx }/customer/toIndex">首页</a>
diff --git a/WebRoot/WEB-INF/lib/asyncload-1.0.0-javadoc.jar b/WebRoot/WEB-INF/lib/asyncload-1.0.0-javadoc.jar
new file mode 100644
index 0000000..0c38e4e
Binary files /dev/null and b/WebRoot/WEB-INF/lib/asyncload-1.0.0-javadoc.jar differ
diff --git a/WebRoot/WEB-INF/lib/asyncload-1.0.0.jar b/WebRoot/WEB-INF/lib/asyncload-1.0.0.jar
new file mode 100644
index 0000000..85f51f7
Binary files /dev/null and b/WebRoot/WEB-INF/lib/asyncload-1.0.0.jar differ
diff --git a/WebRoot/WEB-INF/view/aboutus.jsp b/WebRoot/WEB-INF/view/aboutus.jsp
index 2e4798c..7ccb739 100644
--- a/WebRoot/WEB-INF/view/aboutus.jsp
+++ b/WebRoot/WEB-INF/view/aboutus.jsp
@@ -30,7 +30,7 @@
 
 
 </head>
-<body>
+<body >
 <div class="head">
     <div class="header">
         <a href="#menu" class="header-a"><i class="fa fa-reorder head-style"></i></a>
diff --git a/WebRoot/WEB-INF/view/add_friends.jsp b/WebRoot/WEB-INF/view/add_friends.jsp
index 3914b9b..ec25cd8 100644
--- a/WebRoot/WEB-INF/view/add_friends.jsp
+++ b/WebRoot/WEB-INF/view/add_friends.jsp
@@ -35,7 +35,7 @@
                 <div class="panel-heading">
                     <h3 class="panel-title">联系人列表</h3>
                 </div>
-               <c:forEach items="${contsList}" var="contsList">
+                <c:forEach items="${contsList}" var="contsList">
                 <div class="panel-body" >
                     <i class="fa fa-pencil search-style" data-target="#rewrite_friends${contsList.id }" data-toggle="modal" ></i>
                     <span class="add_friends_name">${contsList.name }</span>
@@ -43,7 +43,7 @@
                     
                     <!-- 模态框（Modal）修改联系人 -->
                     <div class="modal fade" id="rewrite_friends${contsList.id }" tabindex="-1" role="dialog"
-				         aria-labelledby="myModalLabel" aria-hidden="true" style="margin-top: 40px;">
+				         aria-labelledby="myModalLabel" aria-hidden="true" style="margin-top: 40px;height:100px">
 				        <div class="modal-dialog">
 				            <div class="modal-content">
 				                <div class="modal-header">
@@ -117,7 +117,7 @@
                         <input class="login-in-input" placeholder="身份证" name="identityCard" id="friends_id">
                     </div>
                 </div>
-                <div class="modal-footer">
+                <div class="modal-footer footer-style">
                     <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">
                         <a href="orderstep3.html" class="modal-default">取消</a>
                     </button>
diff --git a/WebRoot/WEB-INF/view/information.jsp b/WebRoot/WEB-INF/view/information.jsp
index bdbdc20..20eaa47 100644
--- a/WebRoot/WEB-INF/view/information.jsp
+++ b/WebRoot/WEB-INF/view/information.jsp
@@ -44,10 +44,10 @@
       -->
         <div id="choose-edit" style="margin-bottom: 50px;text-align: center;"> 
             <div class="control-group input-top" style="margin-top:50px">
-                <input type="text" name="identityCard" id="checkidcard" class="login-in-input" placeholder="请输入身份证号">
+                <input type="text" name="identityCard" id="checkidcard" class="login-in-input" placeholder="请输入身份证号" value = ${ identityCard}>
             </div>
             <div class="control-group">
-                <input type="text" name="truename" class="login-in-input" placeholder="请输入姓名">
+                <input type="text" name="truename" class="login-in-input" placeholder="请输入姓名" value = ${ truename}>
             </div>
             <div class="control-group">
                 <button type="submit" class="login-now">提交</button>
@@ -71,7 +71,8 @@
 		var reg=/^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/;
 		if(reg.test(sId))
 		{}
-		else{alert("请输入正确的身份证格式");}
+		else{
+swal("请输入正确的身份证格式");}
  		
 } 
  
diff --git a/WebRoot/WEB-INF/view/management.jsp b/WebRoot/WEB-INF/view/management.jsp
index 340c2c3..d66f696 100644
--- a/WebRoot/WEB-INF/view/management.jsp
+++ b/WebRoot/WEB-INF/view/management.jsp
@@ -25,7 +25,7 @@
 
 </div>
 <input type="hidden" value="${roomid}" id="roomid">
-<input type="hidden" value="${customer.userName}" id="customertrueName">
+<input type="hidden" value="${customer.trueName}" id="customertrueName">
 <input type="hidden" value="${customer.phoneNumber}" id="customerphoneNumber">
 <input type="hidden" value="${roomnumber}" id="roomNumber">
 <div class="content">
diff --git a/WebRoot/WEB-INF/view/orderstep0.jsp b/WebRoot/WEB-INF/view/orderstep0.jsp
index 41f235c..4f02520 100644
--- a/WebRoot/WEB-INF/view/orderstep0.jsp
+++ b/WebRoot/WEB-INF/view/orderstep0.jsp
@@ -24,11 +24,11 @@
         <span class="header-word">选择时间</span>
         <a href="${ctx }/customer/toIndex"><i class="fa fa-home head-style home-style"></i></a>
     </div>
-    <%@ include file="header.jsp" %>
+     <%@ include file="header.jsp" %>
 </div>
 
 <div class="content">
-	<form action="${ctx }/order/toSecond" method="post" onsubmit="return check()">
+	<form id="selectTime" action="${ctx }/order/toSecond" method="post" onsubmit="return check()">
 	    <!--<h3>日期输入框</h3>-->
 	    <div class="date_leave">
 	        <span class="leave_word">入住时间：</span>
@@ -49,7 +49,7 @@
 	    </div>
 	</form>
 </div>
-<%@ include file="footer.jsp" %>
+  <%@ include file="footer.jsp" %>
 <script>
 	//判断是否选择日期
 	function check(){
@@ -72,7 +72,27 @@
 			swal("您的团购券只有${validCount}张，选择的天数不能超过${validCount}天");
 			return false;
 		}
-		return true;
+		 //查看是否有可用的房间
+		 var flag = false;
+		 var timeForm = new FormData($("#selectTime")[0]);
+		$.ajax({
+			async : false,
+			type : "POST",
+			url : "${ctx }/order/checkRoom",
+			dataType : "json",
+			contentType : false,
+			processData : false,
+			data : timeForm,
+			success : function(result) {
+				if (result == "1") {
+					flag = true;
+				} else if (result == "0") {
+					swal("对不起，您选择的时间已无可用房间！");
+				}
+			}
+		});
+		
+		return flag;
 	}
     //在是IPhone5的时候隐藏码先生
     window.onload = function()
@@ -103,7 +123,6 @@
         $(".mm-title").text("首页");
         $(".mm-navbar-bottom").hide();
     });
- 	
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/view/orderstep1.jsp b/WebRoot/WEB-INF/view/orderstep1.jsp
index b2109a8..fdb6b87 100644
--- a/WebRoot/WEB-INF/view/orderstep1.jsp
+++ b/WebRoot/WEB-INF/view/orderstep1.jsp
@@ -32,9 +32,9 @@
   <%@ include file="header.jsp" %>
 </div>
 <div class="content choose-floor" >
-    <div class="choose-floor-div" style="display: flex;">
+    <div class="choose-floor-div" style="display: flex;width:100%;">
         <c:forEach items="${frMap }" var="item">
-	        <div class="hotel-floor col-xs-6">
+	        <div class="hotel-floor col-xs-4">
 	            <a type="radio" data-toggle="modal" class="choose-style " href="#show_room_${item.key.id }">
 		            <span class="floor-style">
 		                <i class="fa fa-building building-style"></i>
@@ -42,14 +42,13 @@
 		            <span class="floor-num" id="f3">
 		                ${item.key.floorNumber }楼
 		            </span>
-	            </a>
+	            </a>	           
 	        </div>
-	        
 	        <!-- 模态框展示房间 -->
 	        <div class="modal fade" id="show_room_${item.key.id }" tabindex="-1" role="dialog"
 	             aria-labelledby="myModalLabel" aria-hidden="true" style="margin-top: 40px;position: absolute;margin-bottom: 50px">
 	            <div class="modal-dialog">
-	                <div class="modal-content" style=”margin-bottom:50px”>
+	                <div class="modal-content" style="margin-bottom:50px;">
 	                    <div class="modal-header">
 	                        <button type="button" class="close"
 	                                data-dismiss="modal" aria-hidden="true">
@@ -78,7 +77,7 @@
 	                                    			<span class="choose-room-checkbox">${room.roomNumber }</span>	                                    			
 	                                    		</label>
 	                                    	</p>
-	                               		</c:forEach>     
+	                               		</c:forEach>
 	                                </div>
 	                            </div>
 	                        </div>
@@ -94,7 +93,7 @@
         </c:forEach>
     </div>
 
-    <div class="image_bigger_style" style="display: none" id="image_bigger_div">
+    <div class="image_bigger_style" style="display: none;" id="image_bigger_div">
         <div class="paying_content remember-room" id="choosen_room_list">
             <div class="panel panel-info" id="panel-body">
                 <div class="panel-heading">
@@ -115,10 +114,13 @@
             </div>
         </div>
         <div class="control-group next_step  choose-room-next-step" id="choose-room-next-step">
-            <button class="login-now" style="background-color:#33ccff"><a href="javascript:;" class="next_step_color">下一步</a></button>
+            <button class="login-now next-step-button" style="background-color:#33ccff"><a href="javascript:;" class="next_step_color">下一步</a></button>
         </div>
+        
+    </div>
+    <div class="control-group next_step  choose-room-before-step">
+            <button class="login-now" style="background-color:#33ccff"><a href="javascript:;" class="next_step_color">上一步</a></button>
     </div>
-
 
 </div>
 <%@ include file="footer.jsp" %>
@@ -129,19 +131,24 @@
 	//用来把选择的房间添加到已选房间的列表中
 	function add_room(){
 		ids=[];
+
+		/* $("#panel-body").html('<div class="panel-heading"><h3 class="panel-title">已选房间</h3></div>'); */
+		
+
 		$("#panel-body").html('<div class="panel-heading"><h3 class="panel-title">已选房间</h3></div>');
 		 
+
 		$(":checked").each(function(){
 			var temp=$(this);//获得当前的其中一个的input
 			var room_number=$(this).next().html();//获得房间号
 			var room_id=$(this).val();//获得房间的id值
-			
-			$("#panel-body").append(" <div class='panel-body' ><span class='room_value_find'>"+room_number+"</span> " +
+			$("#panel-body").append(" <div class='panel-body ' ><span class='room_value_find'>"+room_number+"</span> " +
 			      "<i class='fa fa-times times-style' param='"+room_id+"' onclick='delete_number(this)'></i> </div>");
 			ids.push(room_id);
 		});
 		var room_list=$("#panel-body").children().length;
 		if(room_list>1){
+/* 		     alert("do2"); */
 			 $("#image_bigger_div").show();
 		}
 	}
@@ -168,6 +175,7 @@
 		    }
 		});
 	}
+	//检查团购券是否足够
 	$(".next_step_color").click(function(){
 		if(ids.length*"${days}">"${validCount}"){
 			swal("您的团购券只有${validCount}张，已选了${days}天，请重新选择房间");	
diff --git a/WebRoot/WEB-INF/view/orderstep2.jsp b/WebRoot/WEB-INF/view/orderstep2.jsp
index 294de61..45d8dd8 100644
--- a/WebRoot/WEB-INF/view/orderstep2.jsp
+++ b/WebRoot/WEB-INF/view/orderstep2.jsp
@@ -179,6 +179,26 @@
 				return false;
 			}
 		}
+		//判断此身份证是否已订房
+		var flag = true;
+		$(".friends_list").each(function(){
+			var cid = $(this).val();
+			var thiz = this;
+			$.ajax({
+		    	async : false,
+		    	type : "POST",
+				url : "${ctx}/order/checkID?cid="+cid,
+				dataType : "json",
+				success : function(result) {
+					if (result == "0") {
+						swal($(thiz).find("option:selected").html()+"在该时间段已订房,请不要重复预订");
+						flag = false;
+					}
+				}
+		    })
+			return flag;
+		})
+		return flag;
 	})
 	
 	//判断此身份证是否已添加
@@ -235,6 +255,23 @@
 			}
 	    })
 	}
+	//判断此身份证是否已订房
+	$(".friends_list").change(function(){
+		var cid = $(this).val();
+		$.ajax({
+	    	async : false,
+	    	type : "POST",
+			url : "${ctx}/order/checkID?cid="+cid,
+			dataType : "json",
+			success : function(result) {
+				if (result == "0") {
+					swal("此用户在该时间段已订房");
+					 
+					
+				}
+			}
+	    })
+	})
 	//不在线支付押金
 	$(".notDeposit").click(function(){
 		location.href="${ctx}/order/toFifth?room="+room+"&contactor="+contactor;
diff --git a/WebRoot/WEB-INF/view/orderstep3.jsp b/WebRoot/WEB-INF/view/orderstep3.jsp
index 1fb1d1a..0a7b1cf 100644
--- a/WebRoot/WEB-INF/view/orderstep3.jsp
+++ b/WebRoot/WEB-INF/view/orderstep3.jsp
@@ -30,7 +30,7 @@
                     <h3 class="panel-title">选择支付方式</h3>
                 </div>
                 <div class="panel-body" >
-                    <a href="${ctx }/customer/alipayHandler?id=${order.id}">支付宝</a>
+                    <a href="${ctx }/customer/alipayHandler?id=${order.id}" class="zhifubao">支付宝</a>
                 </div>
                 <div class="panel-body">
                     <a href="#">微信</a>
diff --git a/WebRoot/resource/css/common/common.css b/WebRoot/resource/css/common/common.css
index fe2f750..cdabd77 100644
--- a/WebRoot/resource/css/common/common.css
+++ b/WebRoot/resource/css/common/common.css
@@ -2,7 +2,7 @@
 /*设置底部*/
 .footer{ line-height:40px; text-align:center;}
 .footer-top{ color:#fff; font-weight:bold;}
-.footer-bottom{ background:#333; color:#FFF; font-weight:bold;}
+.footer-bottom{ background:#333; color:#FFF; font-weight:bold;margin:0px;}
 .footer-bottom a{ color:#fff;}
 .footer_vertical_line{
     padding:5px;
diff --git a/WebRoot/resource/css/common/static.css b/WebRoot/resource/css/common/static.css
index 23479b5..cea9f1c 100644
--- a/WebRoot/resource/css/common/static.css
+++ b/WebRoot/resource/css/common/static.css
@@ -176,6 +176,8 @@
     color: #fff;
     height: 40px;
     width: 100%;
+    margin:0px;
+    padding:0px;
 }
 .create_new{
     background-color: #33ccff;
@@ -308,7 +310,9 @@ a{
 #choose-room-next-step{
     margin-bottom: 80px;
 }
-
+.next-step-button{
+	width:70%;
+}
 /*上传图片的样式设置*/
 #imagePreview {
     width:100%;/*用来控制图片的宽度*/
@@ -328,6 +332,7 @@ a{
 /*设置添加联系人页面的样式*/
 .add_friends_now{
     text-align: center;
+    margin-bottom:100px;
 }
 .add_friends_now_word{
     width: 90%;
@@ -398,4 +403,26 @@ a:hover,a:focus{
 	color:#fff;
 	opacity: 0
 }
- li {list-style-type:none;}
\ No newline at end of file
+ li {list-style-type:none;}
+ .choose-room-before-step{
+ display:none;
+ }
+ #confirm_button{
+ margin:0px;
+ }
+ .footer-style{
+ padding:5px;
+ }
+ .btn-primary{
+ margin:0px;
+ }
+  .btn-default{
+ margin:0px;
+ }
+ .create_new{
+ padding:5px;
+ margin:0px;
+ }
+ .zhifubao{
+ color:#33ccff;
+ }
\ No newline at end of file
diff --git a/WebRoot/resource/css/index.css b/WebRoot/resource/css/index.css
index 583126b..d6dac93 100644
--- a/WebRoot/resource/css/index.css
+++ b/WebRoot/resource/css/index.css
@@ -112,7 +112,6 @@ list-style: none;
 }
 /*适应不同的手机*/
 .index-content{
-	overflow: scroll;
+	/* overflow: scroll; */
     margin-bottom: 50px;
-}
-
+}
\ No newline at end of file
diff --git a/WebRoot/resource/js/choose_room.js b/WebRoot/resource/js/choose_room.js
index a99f349..741032b 100644
--- a/WebRoot/resource/js/choose_room.js
+++ b/WebRoot/resource/js/choose_room.js
@@ -2,6 +2,12 @@
  * Created by 燕晶 on 2016/3/19.
  */
 //设置侧边栏
+  window.onload = function()
+    {
+       var pheight= document.documentElement.clientHeight;
+        pheight=pheight-90;
+        $(".modal").attr("style","height:"+pheight+"px;"+"margin-top:40px;");
+    };
   $(function() {
         $('nav#menu').mmenu({
          /*   extensions	: [ 'effect-slide-menu', 'pageshadow' ],
@@ -40,9 +46,12 @@
 //当选择的时间没有合适的房间的时候就提示重新选择时间
 $(function(){
 	var tempfloor=$(".hotel-floor").length;
+	var tempheight=(tempfloor/3+1)*40;
+	$(".choose-floor-div").attr("style","height:"+tempheight+"px;");	
 	if(tempfloor==0){
 		  var txt = "没有符合所选时间的房间，请重新选择！";
 	      window.wxc.xcConfirm(txt, window.wxc.xcConfirm.typeEnum.info);
+	    /*  $(".choose-room-before-step").show();*/
 	}
 });
 //当还没有选房的时候就把选房列表隐藏起来
@@ -50,3 +59,4 @@ $(function(){
     $("#image_bigger_div").hide();
 });
 
+
diff --git a/WebRoot/resource/js/yj_style.js b/WebRoot/resource/js/yj_style.js
index fefba14..a8e9a04 100644
--- a/WebRoot/resource/js/yj_style.js
+++ b/WebRoot/resource/js/yj_style.js
@@ -7,7 +7,13 @@
        var pheight= document.documentElement.clientHeight;
         if(pheight<=600){
             $(".footer-top").hide();
+          
         }
+        if(pheight<=550){
+            $(".index_content").addClass("index-content-fix");
+        }
+        pheight=pheight-90;
+        $(".modal").attr("style","height:"+pheight+"px;"+"margin-top:40px;");
     };
 //设置侧边栏
    /* $(function() {
diff --git a/dos/DataBase/mrcode.sql b/doc/DataBase/mrcode.sql
similarity index 100%
rename from dos/DataBase/mrcode.sql
rename to doc/DataBase/mrcode.sql
diff --git a/dos/DataMining/Center_Vector_Create.java b/doc/DataMining/Center_Vector_Create.java
similarity index 100%
rename from dos/DataMining/Center_Vector_Create.java
rename to doc/DataMining/Center_Vector_Create.java
diff --git a/dos/DataMining/TrajectoryClustering.java b/doc/DataMining/TrajectoryClustering.java
similarity index 100%
rename from dos/DataMining/TrajectoryClustering.java
rename to doc/DataMining/TrajectoryClustering.java
diff --git a/dos/DataMining/use_imfor.csv b/doc/DataMining/use_imfor.csv
similarity index 100%
rename from dos/DataMining/use_imfor.csv
rename to doc/DataMining/use_imfor.csv
diff --git "a/dos/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204_\346\225\260\346\215\256\346\214\226\346\216\230\345\255\227\346\256\265\350\257\264\346\230\216.xls" "b/doc/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204_\346\225\260\346\215\256\346\214\226\346\216\230\345\255\227\346\256\265\350\257\264\346\230\216.xls"
similarity index 100%
rename from "dos/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204_\346\225\260\346\215\256\346\214\226\346\216\230\345\255\227\346\256\265\350\257\264\346\230\216.xls"
rename to "doc/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204_\346\225\260\346\215\256\346\214\226\346\216\230\345\255\227\346\256\265\350\257\264\346\230\216.xls"
diff --git "a/dos/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204\346\235\257_\346\225\260\346\215\256\346\214\226\346\216\230\346\226\207\346\241\243.docx" "b/doc/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204\346\235\257_\346\225\260\346\215\256\346\214\226\346\216\230\346\226\207\346\241\243.docx"
similarity index 100%
rename from "dos/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204\346\235\257_\346\225\260\346\215\256\346\214\226\346\216\230\346\226\207\346\241\243.docx"
rename to "doc/DataMining/\347\276\216\345\233\242\347\202\271\350\257\204\346\235\257_\346\225\260\346\215\256\346\214\226\346\216\230\346\226\207\346\241\243.docx"
diff --git a/dos/flowchart/mrcode.jpg b/doc/flowchart/mrcode.jpg
similarity index 100%
rename from dos/flowchart/mrcode.jpg
rename to doc/flowchart/mrcode.jpg
diff --git a/dos/flowchart/mrcode.xmind b/doc/flowchart/mrcode.xmind
similarity index 100%
rename from dos/flowchart/mrcode.xmind
rename to doc/flowchart/mrcode.xmind
diff --git a/dos/pic/hotel.jpg b/doc/pic/hotel.jpg
similarity index 100%
rename from dos/pic/hotel.jpg
rename to doc/pic/hotel.jpg
diff --git a/dos/pic/index.jpg b/doc/pic/index.jpg
similarity index 100%
rename from dos/pic/index.jpg
rename to doc/pic/index.jpg
diff --git a/dos/pic/login.jpg b/doc/pic/login.jpg
similarity index 100%
rename from dos/pic/login.jpg
rename to doc/pic/login.jpg
diff --git a/dos/pic/manage.jpg b/doc/pic/manage.jpg
similarity index 100%
rename from dos/pic/manage.jpg
rename to doc/pic/manage.jpg
diff --git a/dos/pic/order0.jpg b/doc/pic/order0.jpg
similarity index 100%
rename from dos/pic/order0.jpg
rename to doc/pic/order0.jpg
diff --git a/dos/pic/order2.jpg b/doc/pic/order2.jpg
similarity index 100%
rename from dos/pic/order2.jpg
rename to doc/pic/order2.jpg
diff --git a/dos/pic/order3.jpg b/doc/pic/order3.jpg
similarity index 100%
rename from dos/pic/order3.jpg
rename to doc/pic/order3.jpg
diff --git a/dos/pic/order4.jpg b/doc/pic/order4.jpg
similarity index 100%
rename from dos/pic/order4.jpg
rename to doc/pic/order4.jpg
diff --git a/dos/pic/order5.jpg b/doc/pic/order5.jpg
similarity index 100%
rename from dos/pic/order5.jpg
rename to doc/pic/order5.jpg
diff --git a/dos/pic/publicNumber.jpg b/doc/pic/publicNumber.jpg
similarity index 100%
rename from dos/pic/publicNumber.jpg
rename to doc/pic/publicNumber.jpg
diff --git a/dos/pic/side.jpg b/doc/pic/side.jpg
similarity index 100%
rename from dos/pic/side.jpg
rename to doc/pic/side.jpg
diff --git a/src/com/mrcode/action/customer/PerfectInformationAction.java b/src/com/mrcode/action/customer/PerfectInformationAction.java
index b8a122b..789f169 100644
--- a/src/com/mrcode/action/customer/PerfectInformationAction.java
+++ b/src/com/mrcode/action/customer/PerfectInformationAction.java
@@ -37,6 +37,8 @@ public String perfectInformation() throws Exception{
 			Customer cus = (Customer) session.get("customer");
 			request.setAttribute("userName", cus.getUserName());
 			request.setAttribute("phoneNumber",cus.getPhoneNumber());
+			request.setAttribute("identityCard",cus.getIdentityCard());
+			request.setAttribute("truename",cus.getTrueName());
 			
 			return "perfectInformation";
 		}
diff --git a/src/com/mrcode/action/order/OrderAction.java b/src/com/mrcode/action/order/OrderAction.java
index 5a81da9..9ab29c2 100644
--- a/src/com/mrcode/action/order/OrderAction.java
+++ b/src/com/mrcode/action/order/OrderAction.java
@@ -1,6 +1,7 @@
 package com.mrcode.action.order;
 
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -26,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.mrcode.service.ContactorsService;
+import com.mrcode.service.CustomerService;
 import com.mrcode.service.GrouppurchasevoucherService;
 import com.mrcode.service.MrcodeorderService;
 import com.mrcode.service.PasswordService;
@@ -39,6 +41,7 @@
 import com.mrcode.base.BaseAction;
 import com.mrcode.common.ViewLocation;
 import com.mrcode.common.WebApplication;
+import com.mrcode.datamine.Predict;
 import com.mrcode.model.Contactors;
 import com.mrcode.model.Customer;
 import com.mrcode.model.Floor;
@@ -64,12 +67,15 @@ public class OrderAction extends BaseAction<Mrcodeorder>{
 	MrcodeorderService mrcodeorderService;
 	@Autowired
 	PasswordService passwordService;
+	@Autowired
+	CustomerService customerService;
 	
 	@Action(value = "toFirst", results = { @Result(name = "stepFirstUI", location = ViewLocation.View_ROOT
 			+ "orderstep0.jsp") })
 	public String toFirst() throws Exception{
 		//跳转至入住第一步，选择日期页面
 		
+		
 		Customer customer = (Customer)session.get(Const.CUSTOMER);
 		//获得房间类型
 		Integer typeId = getIntParameter("typeId", -1);
@@ -83,6 +89,98 @@ public String toFirst() throws Exception{
 		return "stepFirstUI";
 	}
 	
+	@Action(value = "checkRoom")
+	public void checkRoom() throws Exception {
+		//TODO 查看是否有可用的房间
+		// 获得住宿日期
+		Date begin = null, end = null;
+		try {
+			begin = DateUtils.parseDate(getParameter("begin"), "yyyy-MM-dd");
+		} catch (Exception e) {
+			// TODO: handle exception
+			begin = null;
+		}
+		try {
+			end = DateUtils.parseDate(getParameter("end"), "yyyy-MM-dd");
+		} catch (Exception e) {
+			// TODO: handle exception
+			end = null;
+		}
+
+		long days = DateUtils.lengthBetween(new DateTime(begin), new DateTime(
+				end), DurationFieldType.days());
+
+		Integer typeId = null;
+		// 查询所订房间类型的具体信息
+		try {
+			typeId = ((Roomtype) session.get("roomtype")).getId();
+		} catch (Exception e) {
+			// TODO: 未选择团购券,跳转到选择团购券页面
+			WebApplication.getResponse().sendRedirect(
+					WebApplication.getRequest().getContextPath()
+							+ "/customer/toOrder");
+		}
+
+		Roomtype roomtype = roomtypeService.getWithDetail(typeId);
+
+		// 请求酒店可用的房间
+		String url_str = "http://localhost:8080/JavaPrj_9/reserv.htm?action=findAvailRoomsInJson";// 获取用户认证的帐号URL
+		URL url = new URL(url_str);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		// connection.connect();
+		// 默认是get 方式
+		connection.setRequestMethod("POST");
+		// 设置是否向connection输出，如果是post请求，参数要放在http正文内，因此需要设为true
+		connection.setDoOutput(true);
+		// Post 请求不能使用缓存
+		connection.setUseCaches(false);
+		// 要上传的参数
+		PrintWriter pw = new PrintWriter(connection.getOutputStream());
+		String content = "from="
+				+ URLEncoder.encode(DateUtils.formatStr(begin), "UTF-8")
+				+ "&to=" + URLEncoder.encode(DateUtils.formatStr(end), "UTF-8");
+		pw.print(content);
+		pw.flush();
+		pw.close();
+		int code = connection.getResponseCode();
+		if (code == 404) {
+			throw new Exception("连接无效，找不到此次连接的会话信息！");
+		}
+		if (code == 500) {
+			throw new Exception("连接服务器发生内部错误！");
+		}
+		if (code != 200) {
+			throw new Exception("发生其它错误，连接服务器返回 " + code);
+		}
+		InputStream is = connection.getInputStream();
+		byte[] response = new byte[is.available()];
+		is.read(response);
+		is.close();
+		if (response == null || response.length == 0) {
+			throw new Exception("连接无效，找不到此次连接的会话信息！");
+		}
+		String json = new String(response, "UTF-8");
+		System.out.println(json);
+		JSONObject jsonObject = JSONObject.fromObject(json);
+		JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("rooms"));
+		//把获得的json组装成对象
+        String rmIds = "";
+        for(Object object : jsonArray){
+        	String rmId = ((JSONObject)object).getString("rmId");
+        	rmIds += rmId+",";
+        }
+        if (rmIds.contains(",")) {
+			rmIds = rmIds.substring(0, rmIds.length()-1);
+		}
+        List<Room> rooms = roomService.getByRoomNumAndType(rmIds, roomtype);
+		
+		if(rooms==null || rooms.isEmpty()){
+			writeStringToResponse("0");
+		}else {
+			writeStringToResponse("1");
+		}
+	}
+	
 	@Action(value = "toSecond", results = { @Result(name = "stepSecondUI", location = ViewLocation.View_ROOT
 			+ "orderstep1.jsp") })
 	public String toSecond() throws Exception{
@@ -233,6 +331,22 @@ public void addContactor(){
 		}
 	}
 	
+	@Action(value = "checkID")
+	public void checkID() throws Exception{
+		//判断此身份证是否已预定了房间,未预定返回1,已预定返回0
+		Integer cid = getIntParameter("cid", -1);
+		Date begin = (Date)session.get("begin");
+		Date end = (Date)session.get("end");
+		Contactors contactor = contactorsService.getById(cid);
+		
+		if(passwordService.checkIDCard(contactor.getIdentityCard(), begin, end)){
+			writeStringToResponse("1");
+		}else {
+			writeStringToResponse("0");
+		}
+			
+	}
+	
 	@Action(value = "toFourth", results = { @Result(name = "stepFourthUI", location = ViewLocation.View_ROOT
 			+ "orderstep3.jsp") })
 	public String toFourth() throws Exception{
@@ -286,6 +400,14 @@ public Mrcodeorder createOrder(){
 					depositPrice, new Timestamp(System.currentTimeMillis()), 
 					new HashSet<Grouppurchasevoucher>(vouchers));
 			mrcodeorder = mrcodeorderService.getById(mrcodeorderService.save(mrcodeorder));
+			//顾客类型 1出差  2游玩
+			String ids = passwordService.getLatestCity(customer, pageBean);
+			customer.setCusType(Predict.trafficOrVisit(ids));
+			//消费水平 1高 2低
+			int shopLevel = passwordService.getShopLevel(customer, pageBean) > 300 ? 1 : 2 ;
+			customer.setShopLevel(shopLevel );
+			customerService.update(customer);
+			
 			//把团购券设为已使用
 			for(Grouppurchasevoucher voucher : vouchers){
 				voucher.setUsed(1);
@@ -314,7 +436,7 @@ depositPrice, new Timestamp(System.currentTimeMillis()),
 				json.put("deposit", 0);
 				json.put("orderCode", mrcodeorder.getOrderCode());
 				json.put("passwords", jsonArray);
-		        PrintWriter pw=new PrintWriter(connection.getOutputStream());
+		        PrintWriter pw=new PrintWriter(new OutputStreamWriter(connection.getOutputStream(),"utf-8"));
 		        String content = "json=" + json;  
 		        pw.print(content);
 		        pw.flush();
diff --git a/src/com/mrcode/action/order/PayAction.java b/src/com/mrcode/action/order/PayAction.java
index 57ab418..c95959f 100644
--- a/src/com/mrcode/action/order/PayAction.java
+++ b/src/com/mrcode/action/order/PayAction.java
@@ -205,9 +205,9 @@ public String alipayResultHandler() throws Exception {
 				}
 				
 				//2.准备显示数据
-				request.setAttribute("orderNum", mrcodeorder.getOrderCode());
+				/*request.setAttribute("orderNum", mrcodeorder.getOrderCode());
 				request.setAttribute("buyer_email", buyer_email);
-				request.setAttribute("orderMoney", mrcodeorder.getDepositPrice());
+				request.setAttribute("orderMoney", mrcodeorder.getDepositPrice());*/
 			}
 			
 			//该页面可做页面美工编辑
diff --git a/src/com/mrcode/model/Password.java b/src/com/mrcode/model/Password.java
index d9bdf02..ed1a0db 100644
--- a/src/com/mrcode/model/Password.java
+++ b/src/com/mrcode/model/Password.java
@@ -45,6 +45,7 @@ public Password(Room room, Mrcodeorder mrcodeorder, Timestamp beginTime,
 		this.estimatedTime = estimatedTime;
 		this.endTime = endTime;
 		this.contactors = contactors;
+		this.isValid = 0;
 	}
 
 	/** full constructor */
diff --git a/src/com/mrcode/service/PasswordService.java b/src/com/mrcode/service/PasswordService.java
index eb57de7..1c9748c 100644
--- a/src/com/mrcode/service/PasswordService.java
+++ b/src/com/mrcode/service/PasswordService.java
@@ -38,4 +38,17 @@ public List<Password> createPasswords(Mrcodeorder mrcodeorder,
 	 * @param roomId
 	 * @throws Exception
 	 */
-	public void active(String roomId) throws Exception;public int getShopLevel(Customer customer, PageBean pageBean) throws Exception;}
+	public void active(String roomId) throws Exception;
+	
+	public int getShopLevel(Customer customer, PageBean pageBean) throws Exception;
+
+	/**
+	 * 判断此身份证号是否在相应的时段已预定了房间,已预定返回false,未预定返回true
+	 * @param IDNum
+	 * @param begin
+	 * @param end
+	 * @return
+	 * @throws Exception
+	 */
+	public Boolean checkIDCard(String IDNum, Date begin, Date end)throws Exception;
+}
diff --git a/src/com/mrcode/service/impl/PasswordServiceImpl.java b/src/com/mrcode/service/impl/PasswordServiceImpl.java
index a94d0db..fbff693 100644
--- a/src/com/mrcode/service/impl/PasswordServiceImpl.java
+++ b/src/com/mrcode/service/impl/PasswordServiceImpl.java
@@ -126,7 +126,6 @@ public String getLatestCity(Customer customer, PageBean pageBean) throws Excepti
 	public int getShopLevel(Customer customer, PageBean pageBean) throws Exception {
 		// TODO 查询本用户最近五次出行的城市，如无数据，则以1填充，倒序排列
 		pageBean.setPageSize(5);
-		pageBean.setPageSize(10);
 		String hql = "from Password p left join fetch p.room r left join fetch r.roomtype t " +
 				"where p.contactors.identityCard=:idCard ";
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -157,5 +156,19 @@ public void active(String roomId) throws Exception {
 		}
 	}
 
+	public Boolean checkIDCard(String IDNum, Date begin, Date end)
+			throws Exception {
+		// TODO  判断此身份证号是否在相应的时段已预定了房间,已预定返回false,未预定返回true
+		String hql = "from Password p where p.contactors.identityCard=:IDNum and p.estimatedTime<:end and p.endTime>:begin " ;
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("IDNum", IDNum);
+		map.put("end", end);
+		map.put("begin", begin);
+		List<Password> passwords = this.getBaseDao().findByHql(hql, map, null, null);
+		if(passwords==null || passwords.isEmpty())
+			return true;
+		else return false;
+	}
+
 	
 }
\ No newline at end of file