主页

mhotel/src/com/happy/Until/Enum/B.java

@@ -4,6 +4,6 @@ package com.happy.Until.Enum;
  * 返回数据枚举类型
  */
 public enum B {
-    CODE, MESSAGE,DATA;
+    code, message,data;
 }
 

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

@@ -9,7 +9,9 @@ import org.apache.poi.ss.usermodel.Workbook;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ResponseUtil {
 
@@ -34,16 +36,13 @@ public class ResponseUtil {
 	public static void writeJsonPageData(HttpServletResponse respone, List listPage, int page, int rows, int total) {
 		respone.setContentType("application/json;charset=utf-8");
 
-		JSONObject resultJson = new JSONObject();
 		JSONObject dataJson = new JSONObject();
-		resultJson.put(B.CODE, ResultStatusCode.OK.getMsg());
-		resultJson.put(B.DATA, dataJson);
+		dataJson.put(B.code, ResultStatusCode.OK.getMsg());
 
 		if (listPage == null || listPage.size() == 0) {
 			dataJson.put("rows", "");
 			dataJson.put("total", 0);
 		} else {
-			dataJson.put("code", 200);
 			dataJson.put("rows", rows);
 			// int total = listAll.size();
 			dataJson.put("total", total);// 总记录数
@@ -57,14 +56,14 @@ public class ResponseUtil {
 			dataJson.put("hasNextPage", true);// 有下一页
 			dataJson.put("firstPage", true);// 首页
 			dataJson.put("lastPage", true);// 尾页
-			dataJson.put("listPage", listPage);
+			dataJson.put(B.data, listPage);
 
 		}
 
 		PrintWriter out;
 		try {
 			out = respone.getWriter();
-			out.print(resultJson.toString());
+			out.print(dataJson.toString());
 			out.flush();
 			out.close();
 		} catch (Exception e) {
@@ -75,35 +74,38 @@ public class ResponseUtil {
 	public static void writeJsonIPage(HttpServletResponse respone, IPage iPage) {
 		respone.setContentType("application/json;charset=utf-8");
 
-		JSONObject resultJson = new JSONObject();
 		JSONObject dataJson = new JSONObject();
-		resultJson.put(B.CODE, ResultStatusCode.OK.getStatus());
-		resultJson.put(B.DATA, dataJson);
+		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("rows", "");
+//			dataJson.put("total", 0);
+			dataJson.put(B.data, "");
 		} else {
-			dataJson.put("code", 200);
-			dataJson.put("rows", iPage.getRows());
-			// int total = listAll.size();
-			dataJson.put("total", iPage.getTotal());// 总记录数
-			int totalPage = iPage.getTotal() % iPage.getRows() == 0 ? (iPage.getTotal() / iPage.getRows()) : (iPage.getTotal() / iPage.getRows()) + 1;// 总页数
-			dataJson.put("totalPage", totalPage);
-			dataJson.put("currentPage", iPage.getPage());// 当前页
-			dataJson.put("numPerPage", iPage.getRows());// 每页数
-			dataJson.put("nextPage", totalPage - iPage.getPage() == 0 ? iPage.getPage() : iPage.getPage() + 1);// 下一页
-			dataJson.put("previousPage", iPage.getPage() - 0 == 1 ? iPage.getPage() : iPage.getPage() - 1);// 上一页
-			dataJson.put("hasPreviousPage", true);// 有上一页
-			dataJson.put("hasNextPage", true);// 有下一页
-			dataJson.put("firstPage", true);// 首页
-			dataJson.put("lastPage", true);// 尾页
-			dataJson.put("pageList",iPage.getPageList()); // 分页数据
+			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);
 		}
 
 		PrintWriter out;
 		try {
 			out = respone.getWriter();
-			out.print(resultJson.toString());
+			out.print(dataJson.toString());
 			out.flush();
 			out.close();
 		} catch (Exception e) {

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

@@ -143,8 +143,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         JSONObject jsonObject = new JSONObject();
         if (Func.checkNull(houseId) || Func.checkNull(startTime) || Func.checkNull(endTime)
                 || Func.checkNull(houseOrderNumber) || Func.checkNull(userName) || Func.checkNull(userPhone) || Func.checkNull(userId)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
@@ -156,22 +156,22 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         // 创建订单之前，先验证是否有房间
         String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
         if (Func.checkNull(backMessage)) {
-            jsonObject.put(B.CODE, ResultStatusCode.CANNTBOOKING.getStatus());
-            jsonObject.put(B.MESSAGE, backMessage);
+            jsonObject.put(B.code, ResultStatusCode.CANNTBOOKING.getStatus());
+            jsonObject.put(B.message, backMessage);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
 
         String mess = appBookService.createOrder(houseId, startDate, endDate, houseOrderNumber, userName, userPhone, userId);
         if (!Func.checkNull(mess)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, mess);
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, mess);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
 
-        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.MESSAGE, ResultStatusCode.OK.getMsg());
+        jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
         return null;
     }
@@ -186,8 +186,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         JSONObject jsonObject = new JSONObject();
         if (Func.checkNull(houseId) || Func.checkNull(startTime) || Func.checkNull(endTime)
                 || Func.checkNull(houseOrderNumber) || Func.checkNull(userName) || Func.checkNull(userPhone) || Func.checkNull(userId)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
@@ -199,16 +199,16 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         // 创建订单之前，先验证是否有房间
         String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
         if (Func.checkNull(backMessage)) {
-            jsonObject.put(B.CODE, ResultStatusCode.CANNTBOOKING.getStatus());
-            jsonObject.put(B.MESSAGE, backMessage);
+            jsonObject.put(B.code, ResultStatusCode.CANNTBOOKING.getStatus());
+            jsonObject.put(B.message, backMessage);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
 
         appBookService.reCreateOrder(houseId, startTime, endTime, houseOrderNumber, userName, userPhone, userId);
 
-        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.MESSAGE, ResultStatusCode.OK.getMsg());
+        jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
         return null;
     }
@@ -230,8 +230,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         // 取消订单，修改订单的支付状态
         String mess = bookService.cancelBooking(getBookingId());
         if (!Func.checkNull(mess)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, mess);
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, mess);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
@@ -243,16 +243,16 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         // 进行判断如果订单是已取消，并且标识字段微信退款，则进入退款流程
         if (Func.parseStr(PayEnum.SEVEN.getNum()).equals(booking.getOrderStatus()) && OrderEnum.微信退款.toString().equals(booking.getRefundWay())) {
             if (Func.checkNull(this.open_id) || Func.checkNull(this.bookingId)) {
-                jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-                jsonObject.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+                jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+                jsonObject.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
                 ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
                 return null;
             }
 
             Users users = userService.queryByOpenid(open_id); // 用户信息
             if (users == null || booking == null) {
-                jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-                jsonObject.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+                jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+                jsonObject.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
                 ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
                 return null;
             }
@@ -319,8 +319,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }
 
-        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.MESSAGE, ResultStatusCode.OK.getMsg());
+        jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
         return null;
     }
@@ -333,8 +333,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     public String refundBooking() throws Exception {
         JSONObject resultJson = new JSONObject();
         if (Func.checkNull(this.open_id) || Func.checkNull(this.bookingId)) {
-            resultJson.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
@@ -342,8 +342,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         Users users = userService.queryByOpenid(open_id); // 用户信息
         Booking booking = bookService.getById(Func.parseInt(bookingId)); // 订单信息
         if (users == null || booking == null) {
-            resultJson.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
@@ -490,14 +490,14 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
         String mess = bookService.delBooking(getBookingId());
         if (!Func.checkNull(mess)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, mess);
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, mess);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
 
-        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.MESSAGE, ResultStatusCode.OK.getMsg());
+        jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
         return null;
     }
@@ -514,8 +514,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     public String varificationHouse() {
         JSONObject jsonObject = new JSONObject();
         if (Func.checkNull(houseId) || Func.checkNull(startTime) || Func.checkNull(endTime)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
@@ -523,14 +523,14 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         String backMessage = appBookService.varificationHouse(houseId, startTime, endTime);
 
         if (!Func.checkNull(backMessage)) {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE, backMessage);
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message, backMessage);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
             return null;
         }
 
-        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.MESSAGE, OrderEnum.有空房.toString());
+        jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message, OrderEnum.有空房.toString());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
         return null;
     }
@@ -546,8 +546,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     public String pay() {
         JSONObject resultjson = new JSONObject();
         if (Func.checkNull(this.open_id) || Func.checkNull(this.bookingId)) {
-            resultjson.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultjson.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            resultjson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultjson.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
             return null;
         }
@@ -555,8 +555,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         Users users = userService.queryByOpenid(open_id); // 用户信息
         Booking booking = bookService.getById(Func.parseInt(bookingId)); // 订单信息
         if (users == null || booking == null) {
-            resultjson.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultjson.put(B.MESSAGE, ResultStatusCode.BAD_REQUEST.getMsg());
+            resultjson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultjson.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
             return null;
         }
@@ -633,13 +633,13 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 booking.setPayWay(OrderEnum.微信支付.toString());
                 bookService.updateBooking(booking);
 
-                resultjson.put(B.CODE, ResultStatusCode.OK.getStatus());
-                resultjson.put(B.MESSAGE, "支付成功");
+                resultjson.put(B.code, ResultStatusCode.OK.getStatus());
+                resultjson.put(B.message, "支付成功");
                 ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
             }
         } catch (Exception e) {
-            resultjson.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultjson.put(B.MESSAGE, e.getMessage());
+            resultjson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultjson.put(B.message, e.getMessage());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
         }
         return null;

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

@@ -47,7 +47,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
 
     public String userCode; // 第一次进来获取用户的code
     public String queryValue; // 首页查寻搜索关键词
-    private String hotelTownship; // 所属乡镇
+    private String hotel_township; // 所属乡镇
     public Date startTimeQuery; // 查询订房开始时间
     public Date endTimeQuery; // 查询订房结束时间
 
@@ -108,13 +108,13 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
     /**
      * 进入首页,展示民宿数据列表
      * queryValue 查询字段
-     * hotelTownship 所属乡镇
+     * hotel_townshipId 所属乡镇
      * @return
      */
     public String homePage()
     {
         // 获取民宿列表
-        IPage iPage = appHomePageService.getHotelList(queryValue, hotelTownship,page,rows);
+        IPage iPage = appHomePageService.getHotelList(queryValue, hotel_township,page,rows);
         ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(),iPage);
         return null;
     }
@@ -130,8 +130,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         // 如果未赋值，则直接跳出
         if (Func.checkNull(hotelId))
         {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE,ResultStatusCode.BAD_REQUEST.getMsg());
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message,ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
             return null;
         }
@@ -142,8 +142,8 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         Hotel hotel = appHomePageService.getHotelAndHouseByHotelId(hotelId,queryStartTime, queryEndTime);
 
         // 通过时间区间查询房间信息，并带好是否有房标识给前台
-        jsonObject.put(B.CODE,ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.DATA,ResultUtil.ok(hotel));
+        jsonObject.put(B.code,ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.data,ResultUtil.ok(hotel));
         ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
         return null;
     }
@@ -159,16 +159,16 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         // 如果未赋值，则直接跳出
         if (Func.checkNull(hotelId))
         {
-            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
-            jsonObject.put(B.MESSAGE,ResultStatusCode.BAD_REQUEST.getMsg());
+            jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.message,ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
             return null;
         }
 
         Hotel hotel = hotelService.getById(Func.parseInt(hotelId));
 
-        jsonObject.put(B.CODE,ResultStatusCode.OK.getStatus());
-        jsonObject.put(B.DATA,ResultUtil.ok(hotel));
+        jsonObject.put(B.code,ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.message,ResultUtil.ok(hotel));
         ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
         return null;
     }
@@ -215,11 +215,7 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         this.endTimeQuery = endTimeQuery;
     }
 
-    public String getHotelTownship() {
-        return hotelTownship;
-    }
-
-    public void setHotelTownship(String hotelTownship) {
-        this.hotelTownship = hotelTownship;
+    public void setHotel_township(String hotel_township) {
+        this.hotel_township = hotel_township;
     }
 }

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

@@ -150,9 +150,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         Users users = userService.queryByUserId(userId);
 
         JSONObject resultJson = new JSONObject();
-        resultJson.put(B.CODE, ResultStatusCode.OK.getStatus());
-        resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
-        resultJson.put(B.DATA,users);
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.data,users);
         ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
 
     }
@@ -172,16 +172,16 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
 //        // 验证手机号码
 //        if ( !Func.checkPhone(contactUserPhone))
 //        {
-//            resultJson.put(B.CODE,ResponseStatusEnum.FAILED.getStatus());
-//            resultJson.put(B.MESSAGE,"请确认手机号码");
+//            resultJson.put(B.code,ResponseStatusEnum.FAILED.getStatus());
+//            resultJson.put(B.message,"请确认手机号码");
 //            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
 //            return;
 //        }
 //        // 验证身份证
 //        if (!Func.isCard(contactUserIdNum))
 //        {
-//            resultJson.put(B.CODE,ResponseStatusEnum.FAILED.getStatus());
-//            resultJson.put(B.MESSAGE,"请确认身份证");
+//            resultJson.put(B.code,ResponseStatusEnum.FAILED.getStatus());
+//            resultJson.put(B.message,"请确认身份证");
 //            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
 //            return;
 //        }
@@ -189,8 +189,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         users.setCard_number(contactUserIdNum);
         userService.update(users);
 
-        resultJson.put(B.CODE,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
     }
 
@@ -214,8 +214,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         userService.insert(users);
 
         JSONObject resultJson = new JSONObject();
-        resultJson.put(B.CODE,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
     }
 
@@ -233,8 +233,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
 
         userService.update(users);
         JSONObject resultJson = new JSONObject();
-        resultJson.put(B.CODE,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
     }
 
@@ -250,8 +250,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         JSONObject resultJson = new JSONObject();
         userService.del(Func.parseInt(contactId));
 
-        resultJson.put(B.CODE,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
     }
 
@@ -280,8 +280,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
             OPEN_ID = result.getOpenid();
             if (Func.checkNull(OPEN_ID))
             {
-                resultJson.put(B.CODE,ResultStatusCode.BAD_REQUEST.getStatus());
-                resultJson.put(B.MESSAGE,"未获取到OpenId");
+                resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
+                resultJson.put(B.message,"未获取到OpenId");
                 ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             }
 
@@ -303,9 +303,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
                 users = userService.queryByOpenid(OPEN_ID);
             }
 
-            resultJson.put(B.CODE,ResultStatusCode.OK.getStatus());
-            resultJson.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
-            resultJson.put(B.DATA,users);
+            resultJson.put(B.code,ResultStatusCode.OK.getStatus());
+            resultJson.put(B.message,ResultStatusCode.OK.getMsg());
+            resultJson.put(B.data,users);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return ;
     }

mhotel/src/com/happy/dao/HotelDao.java

@@ -44,6 +44,8 @@ public interface HotelDao {
     List<Hotel> queryPage(String sqlx, int page, int rows);
 
 
+    int queryTotalPrice(String sqlx);
+
     /**
      * 描述：获取总条数
      * @param sqlx

mhotel/src/com/happy/dao/impl/HotelImplDao.java

@@ -133,7 +133,10 @@ public class HotelImplDao implements HotelDao {
     @Override
     public List<Hotel> queryPagePrice(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT a.*,b.min_price FROM `hotel` a left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT a.*,b.min_price,c.hotel_township FROM `hotel` a " +
+                "left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id " +
+                "left join (select manager_id,hotel_township hotel_township from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
+                " WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -142,6 +145,17 @@ public class HotelImplDao implements HotelDao {
         if (list != null && list.size() > 0) return list;
         return null;
     }
+    @Override
+    public int queryTotalPrice(String sqlx) {
+        String sql = "SELECT count(*) FROM`hotel` a " +
+                "left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id " +
+                "left join (select manager_id,hotel_township hotel_township from admin_manager group by manager_id) c on a.manager_id = c.manager_id " +
+                "where status=1 "+sqlx;
+
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        return namedParameterJdbcTemplate.queryForInt(sql, sps);
+    }
+
 
 
     @Override

mhotel/src/com/happy/service/AppHomePageService.java

@@ -19,7 +19,7 @@ public interface AppHomePageService {
      * @param rows
      * @return
      */
-    public IPage getHotelList(String queryValue,String hotelTownship, int page, int rows);
+    public IPage getHotelList(String queryValue,String hotel_township, int page, int rows);
 
     public int getHotelTotal(String queryValue);
 

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

@@ -37,14 +37,14 @@ public class AppHomePageImplService implements AppHomePageService {
 
 
     @Override
-    public IPage<Hotel> getHotelList(String queryValue,String hotelTownship, int page, int rows) {
+    public IPage<Hotel> getHotelList(String queryValue,String hotel_township, int page, int rows) {
         IPage<Hotel> iPage = new IPage();
         StringBuilder strSql = new StringBuilder("");
         if (!Func.checkNull(queryValue)){
             strSql.append(" and hname like '%").append(queryValue).append("%' ");
         }
-        if (!Func.checkNull(hotelTownship)){
-            strSql.append(" and hotel_township = '").append(hotelTownship).append("' ");
+        if (!Func.checkNull(hotel_township)){
+            strSql.append(" and c.hotel_township = '").append(hotel_township).append("' ");
         }
 
         return hotelService.queryPagePrice(strSql.toString(),page,rows);

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

@@ -52,7 +52,7 @@ public class HotelImplService implements HotelService {
     public IPage<Hotel> queryPagePrice(String sqlx, int page, int rows) {
         IPage<Hotel> iPage = new IPage();
         List<Hotel> hotelList = hotelDao.queryPagePrice(sqlx,page,rows);
-        int total = hotelDao.queryTotal(sqlx);
+        int total = hotelDao.queryTotalPrice(sqlx);
         iPage.setPageList(hotelList);
         iPage.setPage(page);
         iPage.setTotalPage( (int)Math.ceil((double)total/rows));