支付通知中乘客表中是否支付字段pay_status要写2.

common/src/main/resources/mapper/bus/PassengerInfo.xml

@@ -233,11 +233,12 @@
         bus_passenger_info t1
         inner join base_order_info t2 on t2.passenger_id = t1.id_
         inner join bus_shift_info t3 on t1.vehicle_shift_id = t3.id_
+        inner join base_merge_order_info t4 on t2.merge_order_id = t4.id_
         where t1.del_flag = 0
         and t1.status_=#{status}
         and t1.pay_status=#{payStatus}
         and t3.status_='1'
-        and t2.update_by=#{openId}
+        and t4.open_id=#{openId}
         order by t1.create_time desc
     </select>
     <select id="findByOpenIdAndVehicleShiftId" resultMap="PassengerInfoMap">
@@ -245,10 +246,11 @@
         bus_passenger_info t1
         inner join base_order_info t2 on t2.passenger_id = t1.id_
         inner join bus_shift_info t3 on t1.vehicle_shift_id = t3.id_
+        inner join base_merge_order_info t4 on t2.merge_order_id = t4.id_
         where t1.del_flag = 0
         and t1.status_=#{status}
         and t1.pay_status=#{payStatus}
-        and t2.update_by=#{openId}
+        and t4.open_id=#{openId}
         and t3.status_='1'
         and t3.id_ = #{vehicleShiftId}
         order by t1.create_time asc

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

@@ -189,7 +189,6 @@ public class WxPayController {
                                 mergeOrderInfo1.setDelFlag(true);
                                 mergeOrderInfoService.update(mergeOrderInfo1);
                             }
-
                         }
                     }
 
@@ -206,30 +205,22 @@ public class WxPayController {
                             orderInfo.setPayTime(payTime);
                             orderInfoService.update(orderInfo);
 
+                            try {
+                                PassengerInfo passengerInfo = passengerInfoService.get(orderInfo.getPassengerId());
 
-                            new Thread(() -> {
-                                try {
-                                    PassengerInfo passengerInfo = passengerInfoService.get(orderInfo.getPassengerId());
-                                    if (passengerInfo != null){
-                                        passengerInfo.setTicketUpStationId(orderInfo.getTicketUpStationId());
-                                        passengerInfo.setTicketDownStationId(orderInfo.getTicketDownStationId());
-                                        passengerInfo.setPayStatus("1");
-                                        passengerInfo.setTicketType(orderInfo.getTicketType());
-                                        passengerInfoService.update(passengerInfo);
-                                    }
-
-                                } catch (Exception ex) {
-                                    log.error(ex.getMessage(), ex);
+                                if (passengerInfo != null){
+                                    passengerInfo.setTicketUpStationId(orderInfo.getTicketUpStationId());
+                                    passengerInfo.setTicketDownStationId(orderInfo.getTicketDownStationId());
+                                    passengerInfo.setPayStatus("2");
+                                    passengerInfo.setTicketType(orderInfo.getTicketType());
+                                    passengerInfoService.update(passengerInfo);
                                 }
-
-
-                            }).start();
+                            } catch (Exception ex) {
+                                log.error(ex.getMessage(), ex);
+                            }
                         }
                     }
 
-
-
-
                     // 发送通知等
                     Map<String, String> xml = new HashMap<String, String>(2);
                     xml.put("return_code", "SUCCESS");