|
@@ -2,6 +2,7 @@ package com.happy.action;
|
|
|
|
|
|
|
|
import com.baidubce.model.User;
|
|
import com.baidubce.model.User;
|
|
|
import com.google.gson.Gson;
|
|
import com.google.gson.Gson;
|
|
|
|
|
+import com.happy.Model.Booking;
|
|
|
import com.happy.Model.weixin.*;
|
|
import com.happy.Model.weixin.*;
|
|
|
import com.happy.Until.*;
|
|
import com.happy.Until.*;
|
|
|
import com.happy.Until.Enum.B;
|
|
import com.happy.Until.Enum.B;
|
|
@@ -48,6 +49,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
|
|
|
public int page = 1; // 当前页
|
|
public int page = 1; // 当前页
|
|
|
public int rows = 5;// 每页显示的行数rows
|
|
public int rows = 5;// 每页显示的行数rows
|
|
|
private String userId; // 用户id
|
|
private String userId; // 用户id
|
|
|
|
|
+ private String bookingId; // 订单id
|
|
|
private String userName; // 用户姓名
|
|
private String userName; // 用户姓名
|
|
|
private String headPhoto; // 用户头像地址
|
|
private String headPhoto; // 用户头像地址
|
|
|
private String contactId; // 相关联系人的id
|
|
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,获取列表
|
|
* userId 当前用户id,获取列表
|
|
|
* 进入我的页面,跳转常用旅客列表
|
|
* 进入我的页面,跳转常用旅客列表
|
|
|
*/
|
|
*/
|
|
@@ -457,4 +484,12 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
|
|
|
public void setCode(String code) {
|
|
public void setCode(String code) {
|
|
|
this.code = code;
|
|
this.code = code;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ public String getBookingId() {
|
|
|
|
|
+ return bookingId;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public void setBookingId(String bookingId) {
|
|
|
|
|
+ this.bookingId = bookingId;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|