Merge remote-tracking branch 'origin/master'

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

@@ -508,7 +508,7 @@ 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(Func.parseStr(PayEnum.NINE.getNum()));
+                book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum()));
                 bookService.updateBooking(book);