message

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

@@ -628,14 +628,14 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 // 推给用户（需求确定，用户点取消退款以后[标识订单状态已取消]只发商家，不发用户。  商家点拒单以后[标识订单状态已退单]只发用户不发商家）
                 int status = Func.parseInt(book.getOrderStatus());
                 if (status == PayEnum.已退单.getNum()){
-                    Message.send(users.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                    Message.send(users.getOpenid(),book.getHotelName(),book.getOrderStatus(), book.getOrderStartTime(),book.getOrderEndTime(), book.getHouseName());
                 }
 
                 // 推给商家
                 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.已取消.getNum()) {
-                    Message2.send(adminManager.getOpenid(), book.getOrderNum(), book.getHouseName(), live_end, book.getUserName(), hotelName, Func.parseStr(book.getId()));
+                    Message2.send(adminManager.getOpenid(), book.getHotelType(), book.getHouseName(), live_end, book.getUserName(), hotelName, Func.parseStr(book.getId()));
                 }
             }
         }
@@ -841,38 +841,38 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             PayResult result = requestBinder.fromXml(xmlString);// Xml到Java，用fromXML()方法
             String order_num = result.getOut_trade_no();
             System.out.println("支付成功回调，订单号："+order_num);
-            Booking booking = bookService.queryByOrder(order_num);
+            Booking book = bookService.queryByOrder(order_num);
             // 支付成功
-            if (result.getResult_code().equals("SUCCESS") && booking!=null && ("1").equals(booking.getOrderStatus())) {
+            if (result.getResult_code().equals("SUCCESS") && book!=null && ("1").equals(book.getOrderStatus())) {
                 // 保存支付信息
-                booking.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
-                booking.setOrderStatus(Func.parseStr(PayEnum.已支付.getNum()));
-                booking.setPayTime(DateUtil.getFormatPaternDate(new Date()));
-                booking.setPayWay(OrderEnum.微信支付.toString());
+                book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+                book.setOrderStatus(Func.parseStr(PayEnum.已支付.getNum()));
+                book.setPayTime(DateUtil.getFormatPaternDate(new Date()));
+                book.setPayWay(OrderEnum.微信支付.toString());
                 // 进行业务判断，如果是商家设定了自动接单，则支付状态直接变为待入住  接单设置（1自动接单 2手动接单）
-                if ("1".equals(booking.getHotelIsOrder()))
+                if ("1".equals(book.getHotelIsOrder()))
                 {
                     // 自动接单，订单状态修改为待入住
-                    booking.setOrderStatus(Func.parseStr(PayEnum.待入住.getNum()));
-                    String userId = booking.getCreateUserid();
+                    book.setOrderStatus(Func.parseStr(PayEnum.待入住.getNum()));
+                    String userId = book.getCreateUserid();
                     Users users = userService.queryByUserId(userId);
                     String mess = "您已成功订房，订单号："+order_num;
-                    Message.send(users.getOpenid(),order_num, users.getUser_name(),mess, booking.getPayTime());
+                    Message.send(users.getOpenid(),book.getHotelName(),book.getOrderStatus(), book.getOrderStartTime(),book.getOrderEndTime(), book.getHouseName());
                 }
 
                 // 手动接单，发消息给商家
-                AdminManager adminManager = adminManagerService.getById(Func.parseInt(booking.getHotelManagerId()));
-                String live_end = booking.getOrderStartTime().substring(0,10)  +"~"+  booking.getOrderEndTime().substring(0,10);
-                String hotelName = booking.getHotelName();
-                if (Func.checkNull(booking.getHotelName()))
+                AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
+                String live_end = book.getOrderStartTime().substring(0,10)  +"~"+  book.getOrderEndTime().substring(0,10);
+                String hotelName = book.getHotelName();
+                if (Func.checkNull(book.getHotelName()))
                 {
-                    hotelName = booking.getHouseName();
+                    hotelName = book.getHouseName();
                 }
-                Message2.send(adminManager.getOpenid(),order_num,booking.getHouseName(),live_end,booking.getUserName(),hotelName, Func.parseStr(booking.getId()));
+                Message2.send(adminManager.getOpenid(),order_num,book.getHotelType(),live_end,book.getUserName(),hotelName, Func.parseStr(book.getId()));
 
-                int m = bookService.updateBooking(booking);
+                int m = bookService.updateBooking(book);
                 //用户支付，写入数据操作
-                bookinglogService.addBooklog("用户支付成功" ,booking);
+                bookinglogService.addBooklog("用户支付成功" ,book);
 
                 if (m>0){
                     String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.happy.Model.weixin.WeiXinUtil;
+import com.happy.Until.Enum.PayEnum;
+import com.happy.Until.Func;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,7 +47,7 @@ public class Message {
         string1.put("value", hotel_name);
         // 订单状态
         JSONObject phrase2 = new JSONObject();
-        phrase2.put("value", order_status);
+        phrase2.put("value", PayEnum.getValueBykey(Func.parseInt(order_status)));
         // 到店时间
         JSONObject date5 = new JSONObject();
         date5.put("value", live_time);