过站消息发送

common/src/main/java/com/jpsoft/bus/modules/bus/callback/GpsDataCallbackImpl.java

@@ -219,6 +219,45 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
                                 }
                             }
+
+                            new Thread(()->{
+                                //查询乘客有过站的情况
+                                List<PassengerInfo> passengerInfoList1 = passengerInfoService.findByShiftStatusPayStatusNotTicketDown(shiftInfo.getId(),"1","2",stationId);
+                                if (passengerInfoList1.size()>0){
+                                    for (PassengerInfo passengerInfo : passengerInfoList1){
+                                        List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
+                                        OrderInfo orderInfo = orderInfoList.get(0);
+                                        //综合账单
+                                        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();
+                                                    passengerMessage.setId(UUID.randomUUID().toString());
+                                                    passengerMessage.setOpenId(mergeOrderInfo.getOpenId());
+                                                    passengerMessage.setPassengerId(passengerInfo.getId());
+                                                    passengerMessage.setCreateTime(new Date());
+                                                    passengerMessageService.insert(passengerMessage);
+                                                }
+                                                else {
+                                                    passengerMessage0.setReadStatus(false);
+                                                    passengerMessageService.update(passengerMessage0);
+                                                }
+                                            }
+
+
+
+
+                                        }
+                                    }
+
+                                }
+
+                            }).start();
+
                         }
 
                         if (gpsDataInfo0 != null){

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

@@ -376,7 +376,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
                     //创建订单
                     OrderInfo orderInfo = new OrderInfo();
                     orderInfo.setId(UUID.randomUUID().toString());
-                    orderInfo.setTotalFee(new BigDecimal(totalFee));
+                    orderInfo.setTotalFee(price);
                     orderInfo.setBody("买车票");
                     orderInfo.setPayStatus(10);
                     orderInfo.setOutOrderNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
@@ -387,6 +387,7 @@ public class PassengerInfoServiceImpl implements PassengerInfoService {
 
                     if (!goodTicketStatus){
                         orderInfo.setGoodsTicket(new BigDecimal(goodsTicket));
+                        orderInfo.setTotalFee(price.add(new BigDecimal(goodsTicket)));
                         goodTicketStatus = true;
                     }