java/QYTDriving.git

parent: 4228cb0f | 补丁 | 提交 | ignore whitespace

Pu Zhibing

2 天以前 bf174ea0bf750cf0818bc7b3472cbdc7485fdf18

修改bug

3个文件已删除

4个文件已修改

1个文件已添加

	driver/guns-admin/lib/zl-util-security-1.2.2.jar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/TCompanyMapper.java	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/TCompanyMapper.xml	635 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/BranchOffice.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/TCompany.java	760 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 driver/guns-admin/lib/zl-util-security-1.2.2.jar

Binary files differ

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java

@@ -4,17 +4,20 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.MonthOrderMapper;
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.ALiSendSms;
import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
import com.supersavedriving.driver.modular.system.util.MiniPay.MiniAppPay;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import com.supersavedriving.driver.modular.system.util.juhe.OCRUtil;
import com.supersavedriving.driver.modular.system.util.qianyuntong.SMSUtil;
import com.supersavedriving.driver.modular.system.util.qianyuntong.UserUtil;
@@ -26,14 +29,6 @@
import com.supersavedriving.driver.modular.system.util.zhenglian.model.TokenRequest;
import com.supersavedriving.driver.modular.system.util.zhenglian.model.TradeTerminalInfo;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.util.RedisUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import com.supersavedriving.driver.modular.system.warpper.DriverPositionWarpper;
import com.supersavedriving.driver.modular.system.warpper.DriverRegisterWarpper;
import com.supersavedriving.driver.modular.system.warpper.PromotionWarpper;
import com.supersavedriving.driver.modular.system.warpper.TokenWarpper;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -43,7 +38,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
@@ -111,9 +105,6 @@

    @Value("${qyt.admin_url}")
    private String adminUrl;

    @Autowired
    private TCompanyMapper companyMapper;



@@ -1086,8 +1077,8 @@
                return ResponseWarpper.tokenErr();
            }
            Driver driver1 = driverService.selectById(uid);
            TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
            BranchOffice branchOffice = branchOfficeService.selectById(driver1.getBranchOfficeId());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), branchOffice.getEnterCode());
            if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
                return new ResponseWarpper(500, "账号未注册");
            }
@@ -1119,8 +1110,8 @@
                return ResponseWarpper.tokenErr();
            }
            Driver driver1 = driverService.selectById(uid);
            TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
            BranchOffice branchOffice = branchOfficeService.selectById(driver1.getBranchOfficeId());
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), branchOffice.getEnterCode());
            if (null == userInfoByPhone || userInfoByPhone.size() == 0) {
                return new ResponseWarpper(500, "账号未注册");
            }

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/TCompanyMapper.java

File was deleted

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/TCompanyMapper.xml

File was deleted

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/BranchOffice.java

@@ -82,4 +82,14 @@
     */
    @TableField("createTime")
    private Date createTime;
    /**
     * 中台企业编号
     */
    @TableField("enterCode")
    private String enterCode;
    /**
     * 中台新增标识（0=否，1=是）
     */
    @TableField("enterNew")
    private Integer enterNew;
}

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/TCompany.java

File was deleted

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

@@ -346,25 +346,25 @@
        tokenWarpper.setValidTime(7200L);
        tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);

        String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
        if(ToolUtil.isNotEmpty(RYToken)){
            JSONObject jsonObject = JSON.parseObject(RYToken);
            Integer code1 = jsonObject.getInteger("code");
            if(200 == code1){
                tokenWarpper.setRytoken(jsonObject.getString("token"));
            }
        }

        if(ToolUtil.isEmpty(driver.getReferralCode())){
            String s = wechatMiniProgramORCode(driver.getId());
            driver.setReferralCode(s);
            this.updateById(driver);
        }
        if(ToolUtil.isEmpty(driver.getOrderQRCode())){
            String s = wechatMiniOrderQRCode(driver.getId());
            driver.setOrderQRCode(s);
            this.updateById(driver);
        }
//        String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
//        if(ToolUtil.isNotEmpty(RYToken)){
//            JSONObject jsonObject = JSON.parseObject(RYToken);
//            Integer code1 = jsonObject.getInteger("code");
//            if(200 == code1){
//                tokenWarpper.setRytoken(jsonObject.getString("token"));
//            }
//        }
        // todo 正式放开
//        if(ToolUtil.isEmpty(driver.getReferralCode())){
//            String s = wechatMiniProgramORCode(driver.getId());
//            driver.setReferralCode(s);
//            this.updateById(driver);
//        }
//        if(ToolUtil.isEmpty(driver.getOrderQRCode())){
//            String s = wechatMiniOrderQRCode(driver.getId());
//            driver.setOrderQRCode(s);
//            this.updateById(driver);
//        }
        return ResultUtil.success(tokenWarpper);
    }

@@ -459,13 +459,14 @@
            redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
            redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天

            // todo 正式放开
            //下线
            for (int i = 0; i < 5; i++) {
                Integer code = pushUtil.pushOffline(driver.getId(), 2);
                if(200 == code){
                    break;
                }
            }
//            for (int i = 0; i < 5; i++) {
//                Integer code = pushUtil.pushOffline(driver.getId(), 2);
//                if(200 == code){
//                    break;
//                }
//            }
            return token;
        }
        return "";

 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);
            }

			@@ -4,17 +4,20 @@
			import cn.hutool.http.HttpRequest;
			import cn.hutool.http.HttpResponse;
			import cn.hutool.http.HttpUtil;
			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.supersavedriving.driver.core.util.ToolUtil;
			import com.supersavedriving.driver.modular.system.dao.MonthOrderMapper;
			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.ALiSendSms;
			import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
			import com.supersavedriving.driver.modular.system.util.MiniPay.MiniAppPay;
			import com.supersavedriving.driver.modular.system.util.RedisUtil;
			import com.supersavedriving.driver.modular.system.util.ResultUtil;
			import com.supersavedriving.driver.modular.system.util.UUIDUtil;
			import com.supersavedriving.driver.modular.system.util.juhe.OCRUtil;
			import com.supersavedriving.driver.modular.system.util.qianyuntong.SMSUtil;
			import com.supersavedriving.driver.modular.system.util.qianyuntong.UserUtil;
			@@ -26,14 +29,6 @@
			import com.supersavedriving.driver.modular.system.util.zhenglian.model.TokenRequest;
			import com.supersavedriving.driver.modular.system.util.zhenglian.model.TradeTerminalInfo;
			import com.supersavedriving.driver.modular.system.warpper.*;
			import com.supersavedriving.driver.core.util.ToolUtil;
			import com.supersavedriving.driver.modular.system.util.RedisUtil;
			import com.supersavedriving.driver.modular.system.util.ResultUtil;
			import com.supersavedriving.driver.modular.system.util.UUIDUtil;
			import com.supersavedriving.driver.modular.system.warpper.DriverPositionWarpper;
			import com.supersavedriving.driver.modular.system.warpper.DriverRegisterWarpper;
			import com.supersavedriving.driver.modular.system.warpper.PromotionWarpper;
			import com.supersavedriving.driver.modular.system.warpper.TokenWarpper;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			@@ -43,7 +38,6 @@
			import org.springframework.web.bind.annotation.*;
			import org.springframework.web.multipart.MultipartFile;

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;
			import java.io.File;
			@@ -111,9 +105,6 @@

			@Value("${qyt.admin_url}")
			private String adminUrl;

			@Autowired
			private TCompanyMapper companyMapper;



			@@ -1086,8 +1077,8 @@
			return ResponseWarpper.tokenErr();
			}
			Driver driver1 = driverService.selectById(uid);
			TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
			BranchOffice branchOffice = branchOfficeService.selectById(driver1.getBranchOfficeId());
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), branchOffice.getEnterCode());
			if (null == userInfoByPhone \|\| userInfoByPhone.size() == 0) {
			return new ResponseWarpper(500, "账号未注册");
			}
			@@ -1119,8 +1110,8 @@
			return ResponseWarpper.tokenErr();
			}
			Driver driver1 = driverService.selectById(uid);
			TCompany company = companyMapper.selectById(driver1.getBranchOfficeId());
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), company.getEnterCode());
			BranchOffice branchOffice = branchOfficeService.selectById(driver1.getBranchOfficeId());
			List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver1.getPhone(), branchOffice.getEnterCode());
			if (null == userInfoByPhone \|\| userInfoByPhone.size() == 0) {
			return new ResponseWarpper(500, "账号未注册");
			}

			@@ -82,4 +82,14 @@
			*/
			@TableField("createTime")
			private Date createTime;
			/**
			* 中台企业编号
			*/
			@TableField("enterCode")
			private String enterCode;
			/**
			* 中台新增标识（0=否，1=是）
			*/
			@TableField("enterNew")
			private Integer enterNew;
			}

			@@ -346,25 +346,25 @@
			tokenWarpper.setValidTime(7200L);
			tokenWarpper.setIsSetPassword(ToolUtil.isEmpty(driver.getPassword()) ? 0 : 1);

			String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
			if(ToolUtil.isNotEmpty(RYToken)){
			JSONObject jsonObject = JSON.parseObject(RYToken);
			Integer code1 = jsonObject.getInteger("code");
			if(200 == code1){
			tokenWarpper.setRytoken(jsonObject.getString("token"));
			}
			}

			if(ToolUtil.isEmpty(driver.getReferralCode())){
			String s = wechatMiniProgramORCode(driver.getId());
			driver.setReferralCode(s);
			this.updateById(driver);
			}
			if(ToolUtil.isEmpty(driver.getOrderQRCode())){
			String s = wechatMiniOrderQRCode(driver.getId());
			driver.setOrderQRCode(s);
			this.updateById(driver);
			}
			// String RYToken = rongYunUtil.getToken(driver.getId().toString(), driver.getName(), driver.getAvatar());
			// if(ToolUtil.isNotEmpty(RYToken)){
			// JSONObject jsonObject = JSON.parseObject(RYToken);
			// Integer code1 = jsonObject.getInteger("code");
			// if(200 == code1){
			// tokenWarpper.setRytoken(jsonObject.getString("token"));
			// }
			// }
			// todo 正式放开
			// if(ToolUtil.isEmpty(driver.getReferralCode())){
			// String s = wechatMiniProgramORCode(driver.getId());
			// driver.setReferralCode(s);
			// this.updateById(driver);
			// }
			// if(ToolUtil.isEmpty(driver.getOrderQRCode())){
			// String s = wechatMiniOrderQRCode(driver.getId());
			// driver.setOrderQRCode(s);
			// this.updateById(driver);
			// }
			return ResultUtil.success(tokenWarpper);
			}

			@@ -459,13 +459,14 @@
			redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
			redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天

			// todo 正式放开
			//下线
			for (int i = 0; i < 5; i++) {
			Integer code = pushUtil.pushOffline(driver.getId(), 2);
			if(200 == code){
			break;
			}
			}
			// for (int i = 0; i < 5; i++) {
			// Integer code = pushUtil.pushOffline(driver.getId(), 2);
			// if(200 == code){
			// break;
			// }
			// }
			return token;
			}
			return "";

			@@ -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);
			}