Merge remote-tracking branch 'origin/master'

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

@@ -128,9 +128,6 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         this.status = status;
     }
 
-
-
-
     /**
      * 定时任务
      * @return
@@ -742,12 +739,12 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 // 手动接单，发消息给商家
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
                 String live_end = booking.getOrderStartTime().substring(0,10)  +"~"+  booking.getOrderEndTime().substring(0,10);
-                String hotelName = "";
+                String hotelName = booking.getHotelName();
                 if (Func.checkNull(booking.getHotelName()))
                 {
                     hotelName = booking.getHouseName();
                 }
-
+                System.out.println(adminManager.getOpenid()+"==="+order_num +"==="+booking.getHouseName()+"==="+live_end+"==="+booking.getUserName()+"==="+hotelName);
                 Message2.send(adminManager.getOpenid(),order_num,booking.getHouseName(),live_end,booking.getUserName(),hotelName);
 
                 int m = bookService.updateBooking(booking);

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

@@ -104,7 +104,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         try{
             switch (type){
                 case 1://接单
-                    if(book.getOrderStatus()!="2"){
+                    if(!"2".equals(book.getOrderStatus())){
                         resultJson.put("message", "已支付状态才能接单");
                         resultJson.put("code", 502);
                         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -116,7 +116,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     sendMsg = "商家已接单";
                     break;
                 case 2://入住
-                    if(book.getOrderStatus()!="3"){
+                    if(!"3".equals(book.getOrderStatus())){
                         resultJson.put("message", "待入住状态才能办理入住");
                         resultJson.put("code", 502);
                         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -127,7 +127,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     msg = "入住办理";
                     break;
                 case 3://退房
-                    if(book.getOrderStatus()!="4"){
+                    if(!"4".equals(book.getOrderStatus())){
                         resultJson.put("message", "已入住状态才能办理退房");
                         resultJson.put("code", 502);
                         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -139,7 +139,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     msg = "退房";
                     break;
                 case 4://退单
-                    if(book.getOrderStatus()!="2"){
+                    if(!"4".equals(book.getOrderStatus())){
                         resultJson.put("message", "已支付状态才能退单");
                         resultJson.put("code", 502);
                         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());