查询司机是否在当前车上打卡。

common/src/main/java/com/jpsoft/bus/modules/bus/entity/PassengerInfo.java

@@ -82,6 +82,10 @@ public class PassengerInfo {
     @ApiModelProperty(value = "购票的下车站点名")
     private String ticketDownStationName;
 
+    //保存在订单表中
+    @ApiModelProperty(value = "购票类型")
+    private String ticketType;
+
     public String getStatusName() {
         String statusName = "";
 
@@ -112,5 +116,4 @@ public class PassengerInfo {
         }
         return payStatusName;
     }
-
 }

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -642,6 +642,15 @@ public class DriverApiController {
             sortList.add(new Sort("create_time","desc"));
             Page<PassengerInfo> page = passengerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
+            for (PassengerInfo passengerInfo : page.getResult()) {
+                List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
+
+                //乘客最后一次购票信息
+                if (orderInfoList.size()>0){
+                    passengerInfo.setTicketType(orderInfoList.get(0).getTicketType());
+                }
+            }
+
             messageResult.setData(PojoUtils.pageWrapper(page));
             messageResult.setResult(true);
             messageResult.setCode(200);