|
@@ -229,11 +229,11 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
|
|
|
MergeOrderInfo mergeOrderInfo = mergeOrderInfoService.get(orderInfo.getMergeOrderId());
|
|
|
if (StringUtils.isNotBlank(mergeOrderInfo.getOpenId())){
|
|
|
|
|
|
- UserInfo userInfo = userInfoService.findByOpenId(mergeOrderInfo.getOpenId());
|
|
|
- if (userInfo.getAcceptMessage()){
|
|
|
- PassengerMessage passengerMessage0 = passengerMessageService.findByPassengerId(orderInfo.getPassengerId());
|
|
|
- if (passengerMessage0 ==null){
|
|
|
- PassengerMessage passengerMessage = new PassengerMessage();
|
|
|
+// UserInfo userInfo = userInfoService.findByOpenId(mergeOrderInfo.getOpenId());
|
|
|
+// if (userInfo.getAcceptMessage()){
|
|
|
+ PassengerMessage passengerMessage = passengerMessageService.findByPassengerId(orderInfo.getPassengerId());
|
|
|
+ if (passengerMessage ==null){
|
|
|
+ passengerMessage = new PassengerMessage();
|
|
|
passengerMessage.setId(UUID.randomUUID().toString());
|
|
|
passengerMessage.setOpenId(mergeOrderInfo.getOpenId());
|
|
|
passengerMessage.setPassengerId(passengerInfo.getId());
|
|
@@ -241,10 +241,10 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
|
|
|
passengerMessageService.insert(passengerMessage);
|
|
|
}
|
|
|
else {
|
|
|
- passengerMessage0.setReadStatus(false);
|
|
|
- passengerMessageService.update(passengerMessage0);
|
|
|
+ passengerMessage.setReadStatus(false);
|
|
|
+ passengerMessageService.update(passengerMessage);
|
|
|
}
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
}
|