1.乘客列表中增加金额显示。

2.查询最近站点时，最多只查n-2个站点，避免首尾两站相连。

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
 
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -119,4 +120,7 @@ public class PassengerInfo {
 
     @ApiModelProperty(value = "购票方式")
     private String payName;
+
+    @Transient
+    private BigDecimal totalFee;
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/GpsServiceImpl.java

@@ -329,6 +329,7 @@ public class GpsServiceImpl implements GpsService {
             StationInfo endStation = stationInfoService.get(shiftInfo.getEndStationId());
 
             boolean frontToEnd = true;
+            int maxPassStation = stationInfoList.size() - 1; //一次性最多查n-1个站点，避免环形
         //    int distance = 100;
 
             if (stationInfoList.size() > 0) {
@@ -362,7 +363,7 @@ public class GpsServiceImpl implements GpsService {
                         if (!manual) {
                             n++;
 
-                            if (n >= 2) {
+                            if (n >= maxPassStation) {
                                 break;
                             }
                         }
@@ -392,7 +393,7 @@ public class GpsServiceImpl implements GpsService {
                         //非人为设置当前站点则只查后两站
                         if (!manual) {
                             n++;
-                            if (n >= 2) {
+                            if (n >= maxPassStation) {
                                 break;
                             }
                         }

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

@@ -720,14 +720,16 @@ 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);
+            for (PassengerInfo passengerInfo : page.getResult()) {
+                if ("1".equals(passengerInfo.getPayStatus())) {
+                    List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(), 20);
 
-                //乘客最后一次购票信息
-//                if (orderInfoList.size()>0){
-//                    passengerInfo.setTicketType(orderInfoList.get(0).getTicketType());
-//                }
-//            }
+                    //乘客最后一次购票信息
+                    if (orderInfoList.size() > 0) {
+                        passengerInfo.setTotalFee(orderInfoList.get(0).getTotalFee());
+                    }
+                }
+            }
 
             messageResult.setData(PojoUtils.pageWrapper(page));
             messageResult.setResult(true);