Merge remote-tracking branch 'origin/master'

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

@@ -608,8 +608,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
         try {
             // 支付费用
-            Double totalPrice = booking.getHouseTotalPrice() * 100;
-            int totalfee = Func.parseInt(totalPrice);
+            double totalPrice = booking.getHouseTotalPrice() ;
+            int totalfee = Func.parseInt(totalPrice * 100);
 
             WechatUnifiedOrder w = new WechatUnifiedOrder();
             w.setAppid(WeiXinUtil.appid_c);
@@ -675,7 +675,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 bookService.updateBooking(booking);
 
                 resultjson.put(B.code, ResultStatusCode.OK.getStatus());
-                resultjson.put(B.message, "支付成功");
+                resultjson.put(B.message, "返回成功");
+                resultjson.put(B.data, pay);
                 ResponseUtil.writeJson(ServletActionContext.getResponse(), resultjson.toString());
             }
         } catch (Exception e) {
@@ -730,12 +731,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/AppMePageAction.java

@@ -2,6 +2,7 @@ package com.happy.action;
 
 import com.baidubce.model.User;
 import com.google.gson.Gson;
+import com.happy.Model.Booking;
 import com.happy.Model.weixin.*;
 import com.happy.Until.*;
 import com.happy.Until.Enum.B;
@@ -48,6 +49,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
     public int page = 1; // 当前页
     public int rows = 5;// 每页显示的行数rows
     private String userId; // 用户id
+    private String bookingId; // 订单id
     private String userName; // 用户姓名
     private String headPhoto; // 用户头像地址
     private String contactId; // 相关联系人的id
@@ -123,6 +125,31 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
     }
 
     /**
+     * 通过订单id查订单数据
+     * @return
+     */
+    public String getBookingById()
+    {
+        if (Func.checkNull(bookingId))
+            return null;
+        // 通过用户id查询所有订单列表数据
+        JSONObject resultJson = new JSONObject();
+        Booking book = bookService.getById(Func.parseInt(bookingId));
+        if (book == null) {
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message,"查无此数据");
+            return null;
+        }
+
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.data,book);
+        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        return null;
+    }
+
+
+    /**
      * userId 当前用户id，获取列表
      * 进入我的页面，跳转常用旅客列表
      */
@@ -457,4 +484,12 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getBookingId() {
+        return bookingId;
+    }
+
+    public void setBookingId(String bookingId) {
+        this.bookingId = bookingId;
+    }
 }