改bug

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

@@ -23,7 +23,7 @@ public class Booking {
   private String hotelTownship; // 民宿所属乡镇
   private String hotelConfig; // 民宿配置
   private String hotelType; // 民宿类型
-  private String hotelIsCanorder; // 是否可取消订单
+  private String hotelIsCanorder; // 是否可取消订单 接单设置（1自动接单 2手动接单）
   private String houseId; // 房型id
   private String houseName; // 户型名称
   private String houseConfig; //房间配置
@@ -49,6 +49,8 @@ public class Booking {
   private String remake; // 备注信息
   private int isDelete; // 是否假删除：0删除，1正常
 
+  private String lockTime; // 锁定时间
+
   public Integer getId() {
     return id;
   }
@@ -421,4 +423,12 @@ public class Booking {
   public void setIsDelete(int isDelete) {
     this.isDelete = isDelete;
   }
+
+  public String getLockTime() {
+    return lockTime;
+  }
+
+  public void setLockTime(String lockTime) {
+    this.lockTime = lockTime;
+  }
 }

mhotel/src/com/happy/Until/HttpUtils.java

@@ -176,6 +176,7 @@ public class HttpUtils {
 		//商户号
 		//微信公众平台：“微信支付”--》“商户信息”--》“商户号”，将该值赋值给partner
 		String partner = WeiXinUtil.account;
+
 		//p12证书的位置
 		//微信公众平台：“微信支付”--》“商户信息”--》“交易数据”--》“详情请登录微信支付商户平台查看”（登录）--》“API安全”--》“API证书”--》“下载证书”
 		//下载证书后将apiclient_cert.p12放在src目录下面（出于安全考虑，请自行下载自己的证书）

mhotel/src/com/happy/Until/ResponseUtil.java

@@ -77,30 +77,13 @@ public class ResponseUtil {
 		JSONObject dataJson = new JSONObject();
 		dataJson.put(B.code, ResultStatusCode.OK.getStatus());
 		dataJson.put(B.message, "查询成功");
-		if (iPage.getPageList() == null || iPage.getPageList().size() == 0) {
-//			dataJson.put("rows", "");
-//			dataJson.put("total", 0);
-			dataJson.put(B.data, "");
-		} else {
-			dataJson.put(B.data,iPage); // 分页数据
-//			dataJson.put(B.data,iPage.getPageList()); // 分页数据
-//			Map pageMap = new HashMap();
-//
-//			pageMap.put("rows", iPage.getRows());
-//			// int total = listAll.size();
-//			pageMap.put("total", iPage.getTotal());// 总记录数
-//			int totalPage = iPage.getTotal() % iPage.getRows() == 0 ? (iPage.getTotal() / iPage.getRows()) : (iPage.getTotal() / iPage.getRows()) + 1;// 总页数
-//			pageMap.put("totalPage", totalPage);
-//			pageMap.put("currentPage", iPage.getPage());// 当前页
-//			pageMap.put("numPerPage", iPage.getRows());// 每页数
-//			pageMap.put("nextPage", totalPage - iPage.getPage() == 0 ? iPage.getPage() : iPage.getPage() + 1);// 下一页
-//			pageMap.put("previousPage", iPage.getPage() - 0 == 1 ? iPage.getPage() : iPage.getPage() - 1);// 上一页
-//			pageMap.put("hasPreviousPage", true);// 有上一页
-//			pageMap.put("hasNextPage", true);// 有下一页
-//			pageMap.put("firstPage", true);// 首页
-//			pageMap.put("lastPage", true);// 尾页
-//			dataJson.put("pageData",pageMap);
-		}
+		dataJson.put(B.data,iPage); // 分页数据
+
+//		if (iPage.getPageList() == null || iPage.getPageList().size() == 0) {
+//			dataJson.put(B.data, "");
+//		} else {
+//			dataJson.put(B.data,iPage); // 分页数据
+//		}
 
 		PrintWriter out;
 		try {

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

@@ -676,6 +676,12 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 booking.setOrderStatus(Func.parseStr(PayEnum.TWO.getNum()));
                 booking.setPayTime(DateUtil.getFormatPaternDate(new Date()));
                 booking.setPayWay(OrderEnum.微信支付.toString());
+                // 进行业务判断，如果是商家设定了自动接单，则支付状态直接变为待入住  接单设置（1自动接单 2手动接单）
+                if ("1".equals(booking.getHotelIsCanorder()))
+                {
+                    booking.setOrderStatus(Func.parseStr(PayEnum.THREE.getNum()));
+                }
+
                 int m = bookService.updateBooking(booking);
                 if (m>0){
                     String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
@@ -686,7 +692,6 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                     out.flush();
                     out.close(); // 发送成功消息给商家
                 }
-                return null;
             }
 
             AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));

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

@@ -165,11 +165,19 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
      */
     public void updateContact()
     {
-        if (Func.checkNull(userId))
+        if (Func.checkNull(contactId))
             return;
 
         JSONObject resultJson = new JSONObject();
-        Users users = new Users();
+        Users users = userService.queryByUserId(contactId);
+        if (users == null) {
+
+            resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message,"无此用户数据，请重新查询");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+            return;
+        }
+
         users.setUser_name(contactUserName);
 
 //        // 验证手机号码
@@ -188,6 +196,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
 //            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
 //            return;
 //        }
+
         users.setUser_phone(contactUserPhone);
         users.setCard_number(contactUserIdNum);
         userService.update(users);

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

@@ -69,6 +69,7 @@ public class AppBookImplService implements AppBookService {
         booking.setHotelManagerId(house.getManagerId());
         booking.setHotelPhone(adminManager.getCorpnPhone());
         booking.setHotelPerson(adminManager.getCorpnName());
+        booking.setLockTime(hotel.getLockTime());
 
         // 设置房型信息
         booking.setHouseId(Func.parseStr(house.getId()));
@@ -131,6 +132,7 @@ public class AppBookImplService implements AppBookService {
         booking.setHotelType(hotel.getHtype());
         booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder()));
         booking.setHotelManagerId(house.getManagerId());
+        booking.setLockTime(hotel.getLockTime());
 
         // 设置房型信息
         booking.setHouseId(Func.parseStr(house.getId()));