修改支付查询判断逻辑

puzhibing

2026-04-20 85dda79557028b2543cba2bcec716721568559bf

修改支付查询判断逻辑

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1148,12 +1148,11 @@
                        request.setCustomerId(userInfo.getOnconUUID());
                        request.setOrderNo("CC" + orderCrossCity1.getId());
                        request.setDriverId(driver.getEmpId().toString());
                        ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
                        TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
                        if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
                            GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
                            getPaymentInfoDataRequest1.setPartnerPayId(orderCrossCity.getTravelId());
                            GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
                        GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
                        getPaymentInfoDataRequest1.setPartnerPayId(orderCrossCity.getTravelId());
                        GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
                        String status = getPaymentInfo1.getStatus();
                        if("1".equals(status) || "2".equals(status)){
                            payOrderCrossCityCallback(orderCrossCity1.getId(), getPaymentInfo1.getPayId(), 1, null);
                            break;
                        }
@@ -2161,7 +2160,8 @@
            GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
            getPaymentInfoDataRequest1.setPartnerPayId(orderCrossCity.getTravelId());
            GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
            if("2".equals(getPaymentInfo1.getStatus())){
            String status = getPaymentInfo1.getStatus();
            if("1".equals(status) || "2".equals(status)){
                PaymentRecord query = paymentRecordService.query(1, null, null, id, 3, null, null);
                payOrderCrossCityCallback(orderCrossCity.getId(), getPaymentInfo1.getPayId(), query.getPayType(), null);
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -2323,12 +2323,11 @@
                        request.setCustomerId(userInfo.getOnconUUID());
                        request.setOrderNo("PR" + orderPrivateCar1.getId());
                        request.setDriverId(driver.getEmpId().toString());
                        ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
                        TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
                        if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
                            GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
                            getPaymentInfoDataRequest1.setPartnerPayId(orderPrivateCar1.getTravelId());
                            GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
                        GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
                        getPaymentInfoDataRequest1.setPartnerPayId(orderPrivateCar1.getTravelId());
                        GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
                        String status = getPaymentInfo1.getStatus();
                        if("1".equals(status) || "2".equals(status)){
                            payOrderPrivateCarCallback(orderPrivateCar1.getId(), getPaymentInfo1.getPayId(), 1);
                            break;
                        }