修改bug及数据加密传输

Pu Zhibing

20 小时以前 aa72a1d1d8c792b322281f5ab01996bc62820b13

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

@@ -24,7 +24,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.impl.CarServiceImpl;
import com.stylefeng.guns.modular.system.service.impl.CompanyServiceImpl;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
@@ -165,7 +164,8 @@
    private CarModelMapper carModelMapper;
    @Autowired
    private CarServiceImpl carServiceImpl;
    private CompanyServiceImpl companyServiceImpl;
    @Autowired
    private ICompanyService companyService;


    /**
@@ -270,7 +270,7 @@
        }
        UserInfo userInfo = userInfoMapper.selectById(orderCrossCity.getUserId());
        Driver driver = driverService.selectById(orderCrossCity.getDriverId());
        Company company = companyServiceImpl.selectById(driver.getCompanyId());
        Company company = companyService.selectById(driver.getCompanyId());
        switch (state){
            case 3://出发前往预约点
                orderCrossCity.setState(3);
@@ -299,6 +299,7 @@
                orderCrossCity.setGetoffTime(new Date());
                orderCrossCity.setState(8);//跨城直接到待评价
                orderCrossCity.setEndServiceTime(new Date());
                this.updateById(orderCrossCity);
                //添加抽成及收入记录

                //非追缴单才需要记录收入
@@ -407,19 +408,21 @@
        }
        this.updateById(orderCrossCity);

        //中台修改订单状态
        ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
        request1.setOrderId(orderCrossCity.getTravelId());
        request1.setStatus(orderCrossCity.getState());
        if (null != orderCrossCity.getDriverId()) {
            request1.setDriverId(driver.getEmpId().toString());
            request1.setSupplierShopId(company.getEnterCode());
        if(ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
            //中台修改订单状态
            ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
            request1.setOrderId(orderCrossCity.getTravelId());
            request1.setStatus(orderCrossCity.getState());
            if (null != orderCrossCity.getDriverId()) {
                request1.setDriverId(driver.getEmpId().toString());
                request1.setSupplierShopId(company.getEnterCode());
            }
            if (2 == orderCrossCity.getPromotion()) {
                Driver driver2 = driverService.selectById(orderCrossCity.getPromotionDriverId());
                request1.setPromoterId(driver2.getEmpId().toString());
            }
            OrderUtil.modifyTravelItinerary(request1);
        }
        if (2 == orderCrossCity.getPromotion()) {
            Driver driver2 = driverService.selectById(orderCrossCity.getPromotionDriverId());
            request1.setPromoterId(driver2.getEmpId().toString());
        }
        OrderUtil.modifyTravelItinerary(request1);


        // TODO: 2020/6/5 推送状态