| | |
|---|
| | | orderCrossCity.setIsReassign(2); |
|---|
| | | orderCrossCityService.updateById(orderCrossCity); |
|---|
| | | |
|---|
| | | if(ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){ |
|---|
| | | Company company = companyService.selectById(driver.getCompanyId()); |
|---|
| | | //中台修改订单状态 |
|---|
| | | ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); |
|---|
| | | request.setOrderId(orderCrossCity.getTravelId()); |
|---|
| | | request.setStatus(orderCrossCity.getState()); |
|---|
| | | request.setDriverId(driver.getEmpId().toString()); |
|---|
| | | if (2 == orderCrossCity.getPromotion()) { |
|---|
| | | Driver driver1 = driverService.selectById(orderCrossCity.getPromotionDriverId()); |
|---|
| | | request.setPromoterId(driver1.getEmpId().toString()); |
|---|
| | | } |
|---|
| | | request.setSupplierShopId(company.getEnterCode()); |
|---|
| | | OrderUtil.modifyTravelItinerary(request); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //添加已收入明细 |
|---|
| | | incomeService.saveData(1, orderCrossCity.getCompanyId(), 4, orderCrossCity.getId(), 3, reassign.getMoney()); |
|---|
| | | } |
|---|
| | |
|---|
| | | // jgPushUtil.push(2, "有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId()); |
|---|
| | | // } |
|---|
| | | } |
|---|
| | | if (reassign.getPayType() == 4) { |
|---|
| | | |
|---|
| | | String[] split1 = ids.split(","); |
|---|
| | | resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0])); |
|---|
| | | for (String id : split1) { |
|---|
| | | // if (reassign.getPayType() == 4) { |
|---|
| | | // |
|---|
| | | // String[] split1 = ids.split(","); |
|---|
| | | // resultUtil = placeAnOrder1(new BigDecimal(aDouble), 4, 3, Integer.valueOf(split1[0])); |
|---|
| | | // for (String id : split1) { |
|---|
| | | // TODO 司机云闪付 跨城改派调起云闪付 |
|---|
| | | paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据 |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // paymentRecordService.saveData(1, uid, 2, Integer.valueOf(id), 3, 4, aDouble, "", 1);//添加预支付数据 |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | } |
|---|
| | | return resultUtil; |
|---|
| | | } |
|---|
