Merge remote-tracking branch 'origin/master'

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

@@ -161,6 +161,8 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
                                 frontToEnd = false;
                             }
 
+
+
                             //查询乘客表是否有过站的情况
                             List<PassengerInfo> passengerInfoList = passengerInfoService.findByShiftStatusPayStatusNotTicketDown(shiftInfo.getId(),"1","1",stationId);
 
@@ -183,7 +185,7 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
                                     //过站发消息
                                     if (passengerInfo.getPayStatus().equals("2")){
-                                        new Thread(()->{
+
                                             List<OrderInfo> orderInfoList = orderInfoService.findByPassengerIdAndPayStatus(passengerInfo.getId(),20);
                                             OrderInfo orderInfo = orderInfoList.get(0);
                                             //综合账单
@@ -214,11 +216,50 @@ public class GpsDataCallbackImpl implements GpsDataCallback {
 
 
 
-                                        }).start();
+
                                     }
 
                                 }
                             }
+
+
+                                //查询乘客有过站的情况
+                                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);
+                                                }
+                                            }
+
+
+
+
+                                        }
+                                    }
+
+                                }
+
+
+
                         }
 
                         if (gpsDataInfo0 != null){

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

@@ -23,4 +23,6 @@ public class PassengerMessageDTO {
 
     private String statusName;
 
+    private String imageUrl;
+
 }

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;
                     }
 

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

@@ -189,7 +189,7 @@ public class PassengerApiController {
                 userInfo1.setName("乘客_" + com.jpsoft.bus.modules.common.utils.StringUtils.random(8, com.jpsoft.bus.modules.common.utils.StringUtils.RandomType.ALL));
                 userInfo1.setPhone(phone);
                 userInfo1.setPassword(des3.encrypt(jwtSecret, phone));
-                userInfo1.setAcceptMessage(false);
+                userInfo1.setAcceptMessage(true);
                 userInfo1.setCreateTime(new Date());
                 userInfo1.setDelFlag(false);
                 userInfo1.setOpenId(openId);
@@ -955,6 +955,7 @@ public class PassengerApiController {
                     passengerMessageDTO.setRouteName(routeInfo.getName());
                     passengerMessageDTO.setSendTime(DateUtil.format(passengerMessage.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
                     passengerMessageDTO.setStatusName("已过站");
+                    passengerMessageDTO.setImageUrl(passengerInfo.getImageUrl());
                     list.add(passengerMessageDTO);
 
                     passengerMessage.setReadStatus(true);

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

@@ -53,8 +53,8 @@ wx:
     portalUrl: http://xpgj.xiaoxinda.com/test/business/#/
 
   jpsoft:
-    appId: wx343bf93d2a3dc8af
-    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
+    appId: wx907e84ad32e6e142
+    appSecret: 1d891ee3f4cc8002ff0330d1e04acf2c
     mchId: 1509055881
     subMchId: 1523544111
     mchKey: xxd33333333333333333333333333333