Merge remote-tracking branch 'origin/master'

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

@@ -125,11 +125,15 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
 
         if (passengerInfoList.size() > 0) {
             PassengerInfo passengerInfo = passengerInfoList.get(0);
-            passengerInfo.setLocalImageUrl(localImageUrl);
-            passengerInfo.setDownTime(recordDate);
-            passengerInfo.setDownStationId(stationId);
-            passengerInfo.setStatus("2");
-            update(passengerInfo);
+
+            //如果已过站则不改状态
+            if(!"2".equals(passengerInfo.getPayStatus())) {
+                passengerInfo.setLocalImageUrl(localImageUrl);
+                passengerInfo.setDownTime(recordDate);
+                passengerInfo.setDownStationId(stationId);
+                passengerInfo.setStatus("2");
+                update(passengerInfo);
+            }
         } else {
             //查询此班次是否有已下车的记录
             List<PassengerInfo> passengerInfoList1 = findByPersonIdShiftIdStatus(personId, shiftInfo.getId(), "2");

web/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://mysql57/jp_housekeeper_2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://mysql57/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: jpsoft8121234
   devtools: