修改bug

Pu Zhibing

1 天以前 bf174ea0bf750cf0818bc7b3472cbdc7485fdf18

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -5,12 +5,13 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.OrderMapper;
import com.supersavedriving.driver.modular.system.dao.TCompanyMapper;
import com.supersavedriving.driver.modular.system.model.*;
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.GaoDe.MapUtil;
import com.supersavedriving.driver.modular.system.util.GaoDe.model.District;
import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
@@ -23,13 +24,6 @@
import com.supersavedriving.driver.modular.system.util.zhenglian.model.TradeTerminalInfo;
import com.supersavedriving.driver.modular.system.util.zhenglian.model.ZLUserInfo;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.util.GaoDe.model.District;
import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
import com.supersavedriving.driver.modular.system.util.PushUtil;
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -140,9 +134,6 @@

    @Value("${callbackPath}")
    private String callbackPath;//支付回调网关地址

    @Autowired
    private TCompanyMapper companyMapper;



@@ -263,13 +254,13 @@
        this.insert(order);
        driverService.updateById(driver);
        if(null != appUser && null != order.getDriverId()){
            TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
            BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
            //调三方订单中心创建行程单
            CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
            request.setOrderNo("DJ" + order.getId());
            request.setCustomerId(appUser.getOnconUUID());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
            request.setSupplierShopId(branchOffice.getEnterCode());
            request.setServiceType(5);
            String travelItinerary = OrderUtil.createTravelItinerary(request);
            order.setTravelId(travelItinerary);
@@ -967,15 +958,14 @@
                appUser.setCancelCount(0);
                appUser.setIsException(1);
                appUserService.updateById(appUser);

                BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
                if(null == order.getTravelId()){
                    TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
                    //调三方订单中心创建行程单
                    CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
                    request.setOrderNo("DJ" + order.getId());
                    request.setCustomerId(appUser.getOnconUUID());
                    request.setDriverId(driver.getEmpId().toString());
                    request.setSupplierShopId(company.getEnterCode());
                    request.setSupplierShopId(branchOffice.getEnterCode());
                    request.setServiceType(5);
                    String travelItinerary = OrderUtil.createTravelItinerary(request);
                    order.setTravelId(travelItinerary);
@@ -985,9 +975,8 @@
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(order.getTravelId());
                    request.setStatus(getState(order.getState()));
                    TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
                    request.setDriverId(driver.getEmpId().toString());
                    request.setSupplierShopId(company.getEnterCode());
                    request.setSupplierShopId(branchOffice.getEnterCode());
                    OrderUtil.modifyTravelItinerary(request);
                }
            }
@@ -1228,9 +1217,9 @@
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(order.getTravelId());
            request.setStatus(getState(order.getState()));
            TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
            BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
            request.setSupplierShopId(branchOffice.getEnterCode());
            OrderUtil.modifyTravelItinerary(request);
        }

@@ -1441,9 +1430,9 @@
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(order.getTravelId());
            request.setStatus(getState(order.getState()));
            TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
            BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
            request.setSupplierShopId(branchOffice.getEnterCode());
            OrderUtil.modifyTravelItinerary(request);
        }

@@ -1579,9 +1568,9 @@
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(order.getTravelId());
            request.setStatus(getState(order.getState()));
            TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
            BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
            request.setSupplierShopId(branchOffice.getEnterCode());
            OrderUtil.modifyTravelItinerary(request);
        }

@@ -1625,9 +1614,9 @@
            ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
            request.setOrderId(order.getTravelId());
            request.setStatus(getState(order.getState()));
            TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
            BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
            request.setDriverId(driver.getEmpId().toString());
            request.setSupplierShopId(company.getEnterCode());
            request.setSupplierShopId(branchOffice.getEnterCode());
            OrderUtil.modifyTravelItinerary(request);
        }

@@ -1819,9 +1808,9 @@
                ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                request.setOrderId(order.getTravelId());
                request.setStatus(getState(order.getState()));
                TCompany company = companyMapper.selectById(driver.getBranchOfficeId());
                BranchOffice branchOffice = branchOfficeService.selectById(driver.getBranchOfficeId());
                request.setDriverId(driver.getEmpId().toString());
                request.setSupplierShopId(company.getEnterCode());
                request.setSupplierShopId(branchOffice.getEnterCode());
                OrderUtil.modifyTravelItinerary(request);
            }