附近的站点增加车牌号显示。

common/src/main/java/com/jpsoft/bus/modules/bus/dto/NearbyShiftDTO.java

@@ -20,4 +20,6 @@ public class NearbyShiftDTO {
     private String currentStationName;
 
     private Integer distance;
+
+    private String licensePlateNumber;
 }

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/PassengerApiController.java

@@ -809,10 +809,6 @@ public class PassengerApiController {
                                     //当前站
                                     StationInfo currentStation = stationInfoService.get(shiftInfo.getCurrentStationId());
 
-
-
-
-
                                     NearbyShiftDTO nearbyShiftDTO = new NearbyShiftDTO();
                                     nearbyShiftDTO.setId(shiftInfo.getVehicleId());
                                     nearbyShiftDTO.setRouteName(routeInfo.getName());
@@ -820,6 +816,9 @@ public class PassengerApiController {
                                     nearbyShiftDTO.setEndStationName(endStation.getName());
                                     nearbyShiftDTO.setCurrentStationName(currentStation.getName());
 
+                                    //增加车牌号
+                                    nearbyShiftDTO.setLicensePlateNumber(vehicleInfo.getLicensePlateNumber());
+
                                     //距离
                                     GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(vehicleInfo.getLatitude()), Double.valueOf(vehicleInfo.getLongitude()));
                                     GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(latitude), Double.valueOf(longitude));

web/src/main/java/com/jpsoft/bus/modules/pay/wechat/WxPayController.java

@@ -75,7 +75,7 @@ public class WxPayController {
             MergeOrderInfo mergeOrderInfo = mergeOrderInfoService.get(id);
 
             if (mergeOrderInfo == null) {
-                throw new Exception("订单不存在");
+                throw new Exception("订单不存在:" + id);
             }
 
             PaymentInfo paymentInfo = paymentInfoService.get(mergeOrderInfo.getPaymentId());