订单功能流程

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

@@ -29,7 +29,9 @@ public class Booking {
   private String hotelConfig; // 民宿配置
   private List hotelConfigList; // 民宿配置列表
   private String hotelType; // 民宿类型
-  private String hotelIsCanorder; // 是否可取消订单 接单设置（1自动接单 2手动接单）
+  private String hotelIsCanorder; // 是否可取消订单 （1是 2否）
+  private String hotelIsOrder; // 是否自动接单 接单设置（1自动接单 2手动接单）
+  private String hotelIsCheckout; // 是否自动退房（1是 2否）
   private String houseId; // 房型id
   private String houseName; // 户型名称
   private String houseConfig; //房间配置
@@ -461,4 +463,20 @@ public class Booking {
   public void setHouseConfigList(List houseConfigList) {
     this.houseConfigList = houseConfigList;
   }
+
+  public String getHotelIsOrder() {
+    return hotelIsOrder;
+  }
+
+  public void setHotelIsOrder(String hotelIsOrder) {
+    this.hotelIsOrder = hotelIsOrder;
+  }
+
+  public String getHotelIsCheckout() {
+    return hotelIsCheckout;
+  }
+
+  public void setHotelIsCheckout(String hotelIsCheckout) {
+    this.hotelIsCheckout = hotelIsCheckout;
+  }
 }

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

@@ -8,7 +8,10 @@ import com.happy.Until.Func;
  */
 public enum PayEnum {
 
-    ONE(1,"待支付"),TWO(2,"已支付"),THREE(3,"待入住"),FOUR(4,"已入住"),FIVE(5,"已消费"),SIX(6,"支付超时"),SEVEN(7,"已取消"),EIGHT(8,"已退单"),NINE(9,"已退款"),TEN(10,"退款中"),ELEVEN(11,"状态异常");
+    待支付(1,"待支付"),已支付(2,"已支付"),待入住(3,"待入住"),
+    已入住(4,"已入住"),已消费(5,"已消费"),支付超时(6,"支付超时"),
+    已取消(7,"已取消"),已退单(8,"已退单"),已退款(9,"已退款"),
+    退款中(10,"退款中"),    状态异常(11,"状态异常");
 
     private int num;
     private String payStatus;
@@ -23,7 +26,7 @@ public enum PayEnum {
      * @param num
      * @return
      */
-    public static String getValueBykey(int num) {
+    public static String getKeyBykey(int num) {
         try {
             for (PayEnum type : PayEnum.values()) {
                 if (Func.parseInt(type.getNum()) == num) {
@@ -31,9 +34,48 @@ public enum PayEnum {
                 }
             }
         } catch (Exception e) {
-            return Func.parseStr(ELEVEN.getNum());
+            return Func.parseStr(状态异常.getNum());
+        }
+        return Func.parseStr(状态异常.getNum());
+    }
+
+    /**
+     * 遍历枚举类
+     * @param num
+     * @return
+     */
+    public static String getValueBykey(int num) {
+        try {
+            for (PayEnum type : PayEnum.values()) {
+                if (Func.parseInt(type.getNum()) == num) {
+                    return type.getPayStatus();
+                }
+            }
+        } catch (Exception e) {
+            return 状态异常.getPayStatus();
+        }
+        return 状态异常.getPayStatus();
+    }
+
+    /**
+     * 遍历枚举类
+     * @param value
+     * @return
+     */
+    public static int getKeyByValue(String value) {
+        try {
+            if (Func.checkNull(value))
+                return 状态异常.getNum();
+
+            for (PayEnum type : PayEnum.values()) {
+                if (value.equals(Func.parseStr(type.getPayStatus()))) {
+                    return type.getNum();
+                }
+            }
+        } catch (Exception e) {
+            return 状态异常.getNum();
         }
-        return Func.parseStr(ELEVEN.getNum());
+        return 状态异常.getNum();
     }
 
 

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

@@ -136,7 +136,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     {
         // 获取所有的订单待支付状态
         StringBuffer strSqlBook = new StringBuffer();
-        strSqlBook.append(" and order_status = '").append(PayEnum.ONE.getNum()).append("' ");
+        strSqlBook.append(" and order_status = '").append(PayEnum.待支付.getNum()).append("' ");
         List<Booking> bookingList = bookService.queryList(strSqlBook.toString());
         if (bookingList == null || bookingList.size() <= 0){
             return null;
@@ -155,7 +155,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 if (flag)
                 {
                     // 如果超时，则将订单状态修改为已超时
-                    booking.setOrderStatus(Func.parseStr(PayEnum.SIX.getNum()));
+                    booking.setOrderStatus(Func.parseStr(PayEnum.支付超时.getNum()));
                     booking.setUpdateTime(TimeExchange.getDate());
                     bookService.updateBooking(booking);
                     System.out.println("已将订单"+booking.getOrderNum()+"标识为支付超时");
@@ -194,7 +194,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             if (flag)
             {
                 // 如果超时，则将订单状态修改为已超时
-                booking.setOrderStatus(Func.parseStr(PayEnum.SIX.getNum()));
+                booking.setOrderStatus(Func.parseStr(PayEnum.支付超时.getNum()));
                 booking.setUpdateTime(TimeExchange.getDate());
                 bookService.updateBooking(booking);
                 System.out.println("已将订单"+booking.getOrderNum()+"标识为支付超时");
@@ -260,42 +260,42 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         return null;
     }
 
-    /**
-     * 再次预订
-     *
-     * @return
-     */
-    public String reCreateOrder() {
-        // 插入订单数据到表中
-        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());
-            ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
-            return null;
-        }
-
-        // 将时间统一转化为 yyyy/MM/dd
-        String startDate = DateUtil.parseDateToStr((Func.parseDate(startTime)), DateUtil.Time_Formatter_Day);
-        String endDate = DateUtil.parseDateToStr((Func.parseDate(endTime)), DateUtil.Time_Formatter_Day);
-
-        // 创建订单之前，先验证是否有房间
-        String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
-        if (Func.checkNull(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());
-        ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
-        return null;
-    }
+//    /**
+//     * 再次预订
+//     *
+//     * @return
+//     */
+//    public String reCreateOrder() {
+//        // 插入订单数据到表中
+//        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());
+//            ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
+//            return null;
+//        }
+//
+//        // 将时间统一转化为 yyyy/MM/dd
+//        String startDate = DateUtil.parseDateToStr((Func.parseDate(startTime)), DateUtil.Time_Formatter_Day);
+//        String endDate = DateUtil.parseDateToStr((Func.parseDate(endTime)), DateUtil.Time_Formatter_Day);
+//
+//        // 创建订单之前，先验证是否有房间
+//        String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
+//        if (Func.checkNull(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());
+//        ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
+//        return null;
+//    }
 
     /**
      * bookingId 订单id
@@ -317,7 +317,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         int status = Func.parseInt(book.getOrderStatus());
         if (status == 1)
         {
-            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
+            book.setOrderStatus(Func.parseStr(PayEnum.已取消.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
             bookService.updateBooking(book);
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
@@ -326,12 +326,12 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }else if (status == 2 || status == 3)
         {
-            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
-            book.setRemake(Func.parseStr(PayEnum.EIGHT.getNum()));
+            book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
+            book.setRemake(Func.parseStr(PayEnum.已退单.getPayStatus()));
         }else if(status == 4)
         {
-            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
-            book.setRemake(Func.parseStr(PayEnum.NINE.getNum()));
+            book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum())); // 如果在2已支付,3待入住 情况，商家点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
+            book.setRemake(Func.parseStr(PayEnum.已退款.getPayStatus()));
         }
 
         if (book.getPayAccount() > 0)
@@ -388,9 +388,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         int status = Func.parseInt(book.getOrderStatus());
         if (status == 1)
         {
-            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
+            book.setOrderStatus(Func.parseStr(PayEnum.已取消.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.SEVEN.getNum()));
+            book.setRemake(Func.parseStr(PayEnum.已取消.getPayStatus()));
             bookService.updateBooking(book);
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
             jsonObject.put(B.message, "已取消订单");
@@ -400,9 +400,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         }else if (status == 2 || status == 3)
         {
             // 如果在2已支付,3待入住 情况，用户点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
-            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum()));
+            book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum()));
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.SEVEN.getNum()));
+            book.setRemake(Func.parseStr(PayEnum.已取消.getPayStatus()));
             if (book.getPayAccount() > 0)
             {
                 // 注明如果支付金额大于0，则需要退款: （标识走退款操作）
@@ -442,7 +442,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         }
 
         // 进行判断如果订单是退款中，并且标识字段微信退款，则进入退款流程
-        if (Func.parseStr(PayEnum.TEN.getNum()).equals(book.getOrderStatus()) && OrderEnum.微信退款.toString().equals(book.getRefundWay())) {
+        if (Func.parseStr(PayEnum.退款中.getNum()).equals(book.getOrderStatus()) && OrderEnum.微信退款.toString().equals(book.getRefundWay())) {
             String ip = WeiXinUtil.ip;
             double money = book.getPayAccount();
             int a = (int) (money * 100);
@@ -495,7 +495,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             }
 
             // 设置订单状态为退款中
-            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum()));
+            book.setOrderStatus(Func.parseStr(PayEnum.退款中.getNum()));
             book.setUpdateTime(DateUtil.parseDateToStr(new Date(),DateUtil.Time_Formatter_Second));
             bookService.updateBooking(book);  // 退款中
 
@@ -600,7 +600,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
         // 查询本地数据库中，正在退款中
         StringBuffer strSqlBook = new StringBuffer();
-        strSqlBook.append(" and order_status = '").append(PayEnum.TEN.getNum()).append("' ");
+        strSqlBook.append(" and order_status = '").append(PayEnum.退款中.getNum()).append("' ");
         List<Booking> booking = bookService.queryList(strSqlBook.toString());
         if (booking==null){
             return null;
@@ -635,23 +635,23 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 book.setRefundTime(DateUtil.parseDateToStr(new Date(),DateUtil.Time_Formatter_Second));
                 book.setRefundAmount(book.getHouseTotalPrice());
                 book.setUpdateTime(DateUtil.parseDateToStr(new Date(),DateUtil.Time_Formatter_Second));
-                book.setOrderStatus(PayEnum.getValueBykey(Func.parseInt(book.getRemake()))); // 将走微信前的标识，写入回调函数
+                book.setOrderStatus(Func.parseStr(PayEnum.getKeyByValue(book.getRemake()))); // 将走微信前的标识，写入回调函数
                 bookService.updateBooking(book);
 
                 // 发送成功消息给商家和用户
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
                 Users users = userService.queryByUserId(book.getCreateUserid());
-                String sendMsg = "订单:"+ book.getOrderNum();
+                String sendMsg = book.getRemake();
                 // 推给用户（需求确定，用户点取消退款以后[标识订单状态已取消]只发商家，不发用户。  商家点拒单以后[标识订单状态已退单]只发用户不发商家）
                 int status = Func.parseInt(book.getOrderStatus());
-                if (status == PayEnum.EIGHT.getNum()){
+                if (status == PayEnum.已退单.getNum()){
                     Message.send(users.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
                 }
 
                 // 推给商家
                 String live_end = book.getOrderStartTime().substring(0,10)  +"~"+  book.getOrderEndTime().substring(0,10);
                 String hotelName = Func.checkNull(book.getHotelName()) ? book.getHotelName() : book.getHouseName();
-                if (status ==  PayEnum.SEVEN.getNum()) {
+                if (status ==  PayEnum.已取消.getNum()) {
                     Message2.send(adminManager.getOpenid(), book.getOrderNum(), book.getHouseName(), live_end, book.getUserName(), hotelName, Func.parseStr(book.getId()));
                 }
             }
@@ -745,7 +745,7 @@ 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 || booking.getOrderStatus().equals(Func.parseStr(PayEnum.SIX.getNum()))) {
+        if (users == null || booking == null || booking.getOrderStatus().equals(Func.parseStr(PayEnum.支付超时.getNum()))) {
             resultjson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
             resultjson.put(B.message, ResultStatusCode.BAD_REQUEST.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
@@ -814,7 +814,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 pay.setPaySign(PayWxUtil.getSign(requestMap, WeiXinUtil.key));
                 // 保存支付信息
                 booking.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-                booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum()));
+                booking.setOrderStatus(Func.parseStr(PayEnum.待支付.getNum()));
                 booking.setPayTime(DateUtil.getFormatPaternDate(new Date()));
                 booking.setPayAccount(totalPrice);
                 booking.setPayWay(OrderEnum.微信支付.toString());
@@ -857,17 +857,17 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             System.out.println("支付成功回调，订单号："+order_num);
             Booking booking = bookService.queryByOrder(order_num);
             // 支付成功
-            if (result.getResult_code().equals("SUCCESS") && booking!=null && booking.getOrderStatus().equals("1")) {
+            if (result.getResult_code().equals("SUCCESS") && booking!=null && ("1").equals(booking.getOrderStatus())) {
                 // 保存支付信息
                 booking.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-                booking.setOrderStatus(Func.parseStr(PayEnum.TWO.getNum()));
+                booking.setOrderStatus(Func.parseStr(PayEnum.已支付.getNum()));
                 booking.setPayTime(DateUtil.getFormatPaternDate(new Date()));
                 booking.setPayWay(OrderEnum.微信支付.toString());
                 // 进行业务判断，如果是商家设定了自动接单，则支付状态直接变为待入住  接单设置（1自动接单 2手动接单）
-                if ("1".equals(booking.getHotelIsCanorder()))
+                if ("1".equals(booking.getHotelIsOrder()))
                 {
                     // 自动接单，订单状态修改为待入住
-                    booking.setOrderStatus(Func.parseStr(PayEnum.THREE.getNum()));
+                    booking.setOrderStatus(Func.parseStr(PayEnum.待入住.getNum()));
                     String userId = booking.getCreateUserid();
                     Users users = userService.queryByUserId(userId);
                     String mess = "您已成功订房，订单号："+order_num;

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

@@ -22,18 +22,18 @@ public interface AppBookService {
     public String createOrder(String bookingId, String houseId,String startTime,String endTime,String houseOrderNumber,String userName,String userPhone, String userId);
 
 
-    /**
-     * 再次预订订单信息
-     * @param houseId
-     * @param startTime
-     * @param endTime
-     * @param houseOrderNumber
-     * @param userName
-     * @param userPhone
-     * @param userId
-     * @return
-     */
-    public String reCreateOrder(String houseId,String startTime,String endTime,String houseOrderNumber,String userName,String userPhone, String userId);
+//    /**
+//     * 再次预订订单信息
+//     * @param houseId
+//     * @param startTime
+//     * @param endTime
+//     * @param houseOrderNumber
+//     * @param userName
+//     * @param userPhone
+//     * @param userId
+//     * @return
+//     */
+//    public String reCreateOrder(String houseId,String startTime,String endTime,String houseOrderNumber,String userName,String userPhone, String userId);
 
     /**
      * 验证单个房间是否

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

@@ -74,12 +74,12 @@ public interface BookService {
      */
     BookTypeEto getBookStatusSum(String sqlx);
 
-    /**
-     * 取消订单功能
-     * @param bookingId
-     * @return
-     */
-    String cancelBooking(String bookingId) throws Exception;
+//    /**
+//     * 取消订单功能
+//     * @param bookingId
+//     * @return
+//     */
+//    String cancelBooking(String bookingId) throws Exception;
 
     /**
      * 删除订单(假删除)

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

@@ -68,7 +68,9 @@ public class AppBookImplService implements AppBookService {
         booking.setHotelTownship(adminManager.getHotelTownship());
         booking.setHotelConfig(hotel.getHconfig());
         booking.setHotelType(hotel.getHtype());
-        booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder()));
+        booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder())); // 是否自动取消订单
+        booking.setHotelIsOrder(Func.parseStr(hotel.getIsOrder())); // 是否自动接单
+        booking.setHotelIsCheckout(Func.parseStr(hotel.getIsCheckout())); // 是否自动离店
         booking.setHotelPhone(adminManager.getCorpnPhone());
         booking.setHotelPerson(adminManager.getCorpnName());
         booking.setLockTime(hotel.getLockTime());
@@ -94,7 +96,7 @@ public class AppBookImplService implements AppBookService {
 
         // 订单信息
         booking.setOrderNum(Func.parseStr(WxUtil.mchOrderNo()));// 订单号
-        booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum())); // 1待支付状态
+        booking.setOrderStatus(Func.parseStr(PayEnum.待支付.getNum())); // 1待支付状态
         booking.setCreateTime(DateUtil.getFormatPaternDate(DateUtil.getCurrentDate()));
         booking.setCreateUserid(userId);
         booking.setId(Func.parseInt(bookingId));
@@ -105,65 +107,65 @@ public class AppBookImplService implements AppBookService {
         return null;
     }
 
-    @Override
-    public String reCreateOrder(String houseId, String startTime, String endTime, String houseOrderNumber, String userName, String userPhone, String userId) {
-        if (Func.checkNull(houseId) ||Func.checkNull(startTime) ||Func.checkNull(endTime)
-                ||Func.checkNull(houseOrderNumber) ||Func.checkNull(userName) ||Func.checkNull(userPhone) ||Func.checkNull(userId))
-            return null;
-
-        House house = houseService.getById(Func.parseInt(houseId));
-        StringBuilder s1 = new StringBuilder("");
-        s1.append(" and manager_id = '").append(house.getManagerId()).append("'");
-        Hotel hotel = hotelService.getOen(s1.toString());
-        Users user = userService.queryByUserId(userId);
-        AdminManager adminManager = adminManagerService.getById(Func.parseInt(house.getManagerId()));
-        if (house == null || hotel == null || user == null  || adminManager == null)
-            return "无法获取数据";
-
-        Booking booking = new Booking();
-
-        // 设置民宿信息
-        booking.setHotelId(Func.parseStr(hotel.getId()));
-        booking.setHotelName(hotel.getHname());
-        booking.setHotelHposition(hotel.getHposition());
-        booking.setHotelHpositionWens(hotel.getHpositionWens());
-        booking.setHotelManagerId(hotel.getManagerId());
-        booking.setHotelTownship(adminManager.getHotelTownship());
-        booking.setHotelConfig(hotel.getHconfig());
-        booking.setHotelType(hotel.getHtype());
-        booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder()));
-        booking.setHotelManagerId(house.getManagerId());
-        booking.setLockTime(hotel.getLockTime());
-
-        // 设置房型信息
-        booking.setHouseId(Func.parseStr(house.getId()));
-        booking.setHouseName(house.gethName());
-        booking.setHouseConfig(house.gethConfig());
-        booking.setHouseUnitPrice(house.getPrice());
-        booking.setHouseOrderNumber(Func.parseInt(houseOrderNumber));
-        booking.setHouseAreas(house.gethAreas());
-        booking.setHouseRemake(house.getRemark());
-        double totalPrice = Func.parseInt(houseOrderNumber) * house.getPrice();
-        booking.setHouseTotalPrice(totalPrice);
-
-        // 设置住客信息
-        booking.setUserName(userName);
-        booking.setUserPhone(userPhone);
-        booking.setOrderStartTime(startTime);
-        booking.setOrderEndTime(endTime);
-        int day = DateUtil.getDayDiff(startTime,endTime);
-        String orderLiveTime= day+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
-        booking.setOrderLiveTime(orderLiveTime);
-
-        // 订单信息
-        booking.setOrderNum(Func.parseStr(WxUtil.mchOrderNo()));// 订单号
-        booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum())); // 待支付状态
-        booking.setCreateTime(DateUtil.getFormatPaternDate(DateUtil.getCurrentDate()));
-        bookService.insertBooking(booking);
-
-
-        return null;
-    }
+//    @Override
+//    public String reCreateOrder(String houseId, String startTime, String endTime, String houseOrderNumber, String userName, String userPhone, String userId) {
+//        if (Func.checkNull(houseId) ||Func.checkNull(startTime) ||Func.checkNull(endTime)
+//                ||Func.checkNull(houseOrderNumber) ||Func.checkNull(userName) ||Func.checkNull(userPhone) ||Func.checkNull(userId))
+//            return null;
+//
+//        House house = houseService.getById(Func.parseInt(houseId));
+//        StringBuilder s1 = new StringBuilder("");
+//        s1.append(" and manager_id = '").append(house.getManagerId()).append("'");
+//        Hotel hotel = hotelService.getOen(s1.toString());
+//        Users user = userService.queryByUserId(userId);
+//        AdminManager adminManager = adminManagerService.getById(Func.parseInt(house.getManagerId()));
+//        if (house == null || hotel == null || user == null  || adminManager == null)
+//            return "无法获取数据";
+//
+//        Booking booking = new Booking();
+//
+//        // 设置民宿信息
+//        booking.setHotelId(Func.parseStr(hotel.getId()));
+//        booking.setHotelName(hotel.getHname());
+//        booking.setHotelHposition(hotel.getHposition());
+//        booking.setHotelHpositionWens(hotel.getHpositionWens());
+//        booking.setHotelManagerId(hotel.getManagerId());
+//        booking.setHotelTownship(adminManager.getHotelTownship());
+//        booking.setHotelConfig(hotel.getHconfig());
+//        booking.setHotelType(hotel.getHtype());
+//        booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder()));
+//        booking.setHotelManagerId(house.getManagerId());
+//        booking.setLockTime(hotel.getLockTime());
+//
+//        // 设置房型信息
+//        booking.setHouseId(Func.parseStr(house.getId()));
+//        booking.setHouseName(house.gethName());
+//        booking.setHouseConfig(house.gethConfig());
+//        booking.setHouseUnitPrice(house.getPrice());
+//        booking.setHouseOrderNumber(Func.parseInt(houseOrderNumber));
+//        booking.setHouseAreas(house.gethAreas());
+//        booking.setHouseRemake(house.getRemark());
+//        double totalPrice = Func.parseInt(houseOrderNumber) * house.getPrice();
+//        booking.setHouseTotalPrice(totalPrice);
+//
+//        // 设置住客信息
+//        booking.setUserName(userName);
+//        booking.setUserPhone(userPhone);
+//        booking.setOrderStartTime(startTime);
+//        booking.setOrderEndTime(endTime);
+//        int day = DateUtil.getDayDiff(startTime,endTime);
+//        String orderLiveTime= day+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
+//        booking.setOrderLiveTime(orderLiveTime);
+//
+//        // 订单信息
+//        booking.setOrderNum(Func.parseStr(WxUtil.mchOrderNo()));// 订单号
+//        booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum())); // 待支付状态
+//        booking.setCreateTime(DateUtil.getFormatPaternDate(DateUtil.getCurrentDate()));
+//        bookService.insertBooking(booking);
+//
+//
+//        return null;
+//    }
 
     @Override
     public String varificationHouse(String houseId, String startTime, String endTime) {
@@ -181,10 +183,10 @@ public class AppBookImplService implements AppBookService {
             strSqlBook.append(" and order_end_time < '").append(endTime).append(" 23:59:59 ' ");
 
         //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款
-        strSqlBook.append(" and  ( order_status = '").append(PayEnum.ONE.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.TWO.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.THREE.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.FOUR.getNum()).append("' ) ");
+        strSqlBook.append(" and  ( order_status = '").append(PayEnum.待支付.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.已支付.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.待入住.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.已入住.getNum()).append("' ) ");
 
         List<Booking> bookList = bookService.queryList(strSqlBook.toString());
         if (bookList == null)

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

@@ -117,10 +117,10 @@ public class AppHomePageImplService implements AppHomePageService {
 
 
         //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款
-        strSqlBook.append(" and  ( order_status = '").append(PayEnum.ONE.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.TWO.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.THREE.getNum()).append("' ");
-        strSqlBook.append(" or order_status = '").append(PayEnum.FOUR.getNum()).append("   ' ) ");
+        strSqlBook.append(" and  ( order_status = '").append(PayEnum.待支付.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.已支付.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.待入住.getNum()).append("' ");
+        strSqlBook.append(" or order_status = '").append(PayEnum.已入住.getNum()).append("   ' ) ");
         List<Booking> bookList = bookService.queryList(strSqlBook.toString());
 
         // 订房数据字典Map<houseid, 订房数量>

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

@@ -83,44 +83,44 @@ public class BookImplService implements BookService {
         return bookDao.getBookStatusSum(sqlx);
     }
 
-    @Override
-    public String cancelBooking(String bookingId) throws Exception {
-        if (Func.checkNull(bookingId))
-            return "未传入订单id";
-
-        Booking book = bookDao.getById(Func.parseInt(bookingId));
-        //是否能取消订单（1是 2否）
-        if (Func.parseInt(book.getHotelIsCanorder()) == 2)
-            return "商家设置不可取消订单，请联系商家";
-
-        AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
-
-        //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款,10退款中
-        int status = Func.parseInt(book.getOrderStatus());
-        if (status == 1)
-        {
-            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
-            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.FIVE.getNum()));
-            bookDao.updateBooking(book);
-
-            return null;
-        }else if (status == 2 || status == 3)
-        {
-            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum())); // 如果在2已支付,3待入住 情况，用户点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
-            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-            book.setRemake(Func.parseStr(PayEnum.FIVE.getNum()));
-            if (book.getPayAccount() > 0)
-            {
-                // 注明如果支付金额大于0，则需要退款: （标识走退款操作）
-                book.setRefundWay(OrderEnum.微信退款.toString());
-            }
-            bookDao.updateBooking(book);
-
-            return null;
-        }
-        return "当前状态下，不可取消订单";
-    }
+//    @Override
+//    public String cancelBooking(String bookingId) throws Exception {
+//        if (Func.checkNull(bookingId))
+//            return "未传入订单id";
+//
+//        Booking book = bookDao.getById(Func.parseInt(bookingId));
+//        //是否能取消订单（1是 2否）
+//        if (Func.parseInt(book.getHotelIsCanorder()) == 2)
+//            return "商家设置不可取消订单，请联系商家";
+//
+//        AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
+//
+//        //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款,10退款中
+//        int status = Func.parseInt(book.getOrderStatus());
+//        if (status == 1)
+//        {
+//            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
+//            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+//            book.setRemake(Func.parseStr(PayEnum.FIVE.getPayStatus()));
+//            bookDao.updateBooking(book);
+//
+//            return null;
+//        }else if (status == 2 || status == 3)
+//        {
+//            book.setOrderStatus(Func.parseStr(PayEnum.TEN.getNum())); // 如果在2已支付,3待入住 情况，用户点击取消订单按钮，后台先修改状态为退款中，然后走退款流程
+//            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+//            book.setRemake(Func.parseStr(PayEnum.FIVE.getPayStatus()));
+//            if (book.getPayAccount() > 0)
+//            {
+//                // 注明如果支付金额大于0，则需要退款: （标识走退款操作）
+//                book.setRefundWay(OrderEnum.微信退款.toString());
+//            }
+//            bookDao.updateBooking(book);
+//
+//            return null;
+//        }
+//        return "当前状态下，不可取消订单";
+//    }
 
     @Override
     public String delBooking(String bookingId) {