黔云通代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
puzhibing
2 天以前 0b4272657073faf38fc41e6f83518bd3d9ada276 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java


@@ -1196,7 +1196,7 @@


            tradeOrderCreateData.setOrderDesc("完成订单");


            tradeOrderCreateData.setRetUrl(path);


            tradeOrderCreateData.setClientIp(ip);


            tradeOrderCreateData.setServiceType(3);


            tradeOrderCreateData.setServiceType(5);




            List<GoodsInfoRequest> goodsInfo = new ArrayList<>();


            GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();


@@ -1252,6 +1252,7 @@


                    request.setOrderNo("DJ" + order1.getId());


                    request.setDriverId(driver.getEmpId().toString());


                    ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);


                    if(!travelItineraryList.getList().isEmpty()){


                    TravelItinerary travelItinerary = travelItineraryList.getList().get(0);


                    if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){


                        GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();


@@ -1260,6 +1261,7 @@


                        orderPayCallback(order1.getId().toString(), getPaymentInfo1.getPayId());


                        break;


                    }


                    }


                    Thread.sleep(wait);


                    num++;


                }