message跳转请求，下单后公众号跳转修改

mhotel/src/com/happy/common/http/Message2.java

@@ -39,7 +39,7 @@ public class Message2 {
         mp_template_msg.setUrl("index");
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("appid",WeiXinUtil.appid_c);
-        jsonObject1.put("pagepath","/pages/orderDetail/orderDetail?id="+id);
+        jsonObject1.put("pagepath","/pages/push/push?id="+id);
         mp_template_msg.setMiniprogram(jsonObject1);
         // 订单号
         JSONObject character_string1_ = new JSONObject();

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

@@ -169,13 +169,7 @@ public class AppBookImplService implements AppBookService {
             dayQueryList.add(time);
         }
 
-        // 将数据字典进行遍历，每天一天的房间
-//        for (Map.Entry<String, Integer> entry : timeMap.entrySet()) {
-//            System.out.println("key= " + entry.getKey() + " and value= " + entry.getValue());
-//            if (entry.getKey())
-//
-//
-//        }
+
         for (String dayQuery: dayQueryList) {
             if (Func.checkNull(dayQuery))
                 continue;
@@ -195,17 +189,6 @@ public class AppBookImplService implements AppBookService {
         }
 
 
-//
-//
-//        // 订单中房数量》= 总房间数量 表示已满
-//        if (totalNum >= house.getNumber())
-//            return OrderEnum.房间已满.toString();
-//
-//        // 现存房数量 《 要订的订房数量   表示已满
-//        if((house.getNumber() - totalNum) < Func.parseInt(houseOrderNumber))
-//            return OrderEnum.房间已满.toString();
-
-
         return null;
     }
 

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

@@ -149,11 +149,6 @@ public class AppHomePageImplService implements AppHomePageService {
         // 判断是否有房间，对每个房型进行标识
         StringBuffer strSqlBook = new StringBuffer();
         strSqlBook.append(" and hotel_manager_id = '").append(hotel.getManagerId()).append("  ' ");
-//        if (!Func.checkNull(queryStartTime))
-//            strSqlBook.append(" and order_start_time <= '").append(queryStartTime).append(" 00:00:00  ' ");
-//        if (!Func.checkNull(queryEndTime))
-//            strSqlBook.append(" and order_end_time >= '").append(queryEndTime).append(" 00:00:00  ' ");
-
 
         //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款
         strSqlBook.append(" and  ( order_status = '").append(PayEnum.待支付.getNum()).append("' ");
@@ -162,27 +157,6 @@ public class AppHomePageImplService implements AppHomePageService {
         strSqlBook.append(" or order_status = '").append(PayEnum.已入住.getNum()).append("   ' ) ");
         List<Booking> bookList = bookService.queryList(strSqlBook.toString());
 
-//        // 订房数据字典Map<houseid, 订房数量>
-//        Map<String, Integer> houseBookingMap =  new HashMap();
-//        if (bookList != null  && bookList.size() > 0)
-//        {
-//            Integer numberTemp = new Integer(0);
-//            for (Booking booking: bookList) {
-//                if (Func.checkNull(booking.getHouseId()))
-//                    continue;
-//
-//                if (houseBookingMap.containsKey(booking.getHouseId()))
-//                {
-//                    numberTemp = houseBookingMap.get(booking.getHouseId());
-//                    int i = Func.parseInt(numberTemp) + booking.getHouseOrderNumber();
-//                    houseBookingMap.put(booking.getHouseId(),i);
-//                }else {
-//                    houseBookingMap.put(booking.getHouseId(),booking.getHouseOrderNumber());
-//                }
-//
-//            }
-//        }
-
         Map<String,Integer> houseBookingMap = assignHouseRemainRooms(bookList,queryStartTime,queryEndTime,houseMap); // 每个房间留存房间数量Map<房间id,数量>
 
         for (House house:houseList) {