Pu Zhibing
3 天以前 b219589d73f46bd98995bceb4caf16dadb56b869
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -498,22 +498,6 @@
            }
        }
        //中台修改订单状态
        ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
        request1.setOrderId(orderCrossCity.getTravelId());
        request1.setStatus(orderCrossCity.getState());
        if (null != orderCrossCity.getDriverId()) {
            TDriver driver2 = tDriverService.selectById(orderCrossCity.getDriverId());
            TCompany company = iTCompanyService.selectById(driver2.getCompanyId());
            request1.setDriverId(driver2.getEmpId().toString());
            request1.setSupplierShopId(company.getEnterCode());
        }
        if (2 == orderCrossCity.getPromotion() && null != orderCrossCity.getPromotionDriverId()) {
            TDriver driver2 = tDriverService.selectById(orderCrossCity.getPromotionDriverId());
            request1.setPromoterId(driver2.getEmpId().toString());
        }
        OrderUtil.modifyTravelItinerary(request1);
        //未支付,调取消订单
        if(null == orderCrossCity.getPayType() && ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
            OrderUtil.tradeOrderCancel(orderCrossCity.getTravelId());
@@ -576,7 +560,7 @@
                        request2.setRefundType("5");
                        request2.setApplyRefundCharge(orderCrossCity.getPayMoney());
                        request2.setActualRefundCharge(orderCrossCity.getPayMoney());
                        request2.setRefundAccount(user1.getEnterId().toString());
                        request2.setRefundAccount(user1.getEmpId().toString());
                        request2.setRemark("服务商取消订单退款");
                        OrderUtil.orderRefundNotice(request2);
                        //添加交易明细