增加获取班次信息接口。

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

@@ -658,6 +658,8 @@ public class DriverApiController {
                 map.put("routeName", routeInfo.getName());
             }
 
+            map.put("shiftId", shiftInfo.getId());
+
             messageResult.setData(map);
             messageResult.setResult(true);
             messageResult.setCode(200);
@@ -849,14 +851,16 @@ public class DriverApiController {
             Page<PassengerInfo> page = passengerInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
             for (PassengerInfo passengerInfo : page.getResult()) {
-                if ("1".equals(passengerInfo.getPayStatus())) {
-                    List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(), 20);
+                List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(), 20);
 
-                    //乘客最后一次购票信息
-                    if (orderInfoList.size() > 0) {
-                        passengerInfo.setTotalFee(orderInfoList.get(0).getTotalFee());
-                    }
+                BigDecimal totalFee = new BigDecimal(0);
+
+                //乘客所有购票
+                for (OrderInfo orderInfo : orderInfoList) {
+                    totalFee = totalFee.add(orderInfo.getTotalFee());
                 }
+
+                passengerInfo.setTotalFee(totalFee);
             }
 
             messageResult.setData(PojoUtils.pageWrapper(page));