8.11 unknown

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -128,7 +128,7 @@ public class MethodGoodsDemandService {
 
             //关联一级市场订单表 根据创建时间 和 appUserID 进行查询
             List<OrderDto> orderDtos = levelOneServerInterface.selectOrderList(new Date(), appLoginUserInfo.getLoginId());
-            if(orderDtos.size() != 1)throw new RuntimeException("一级市场暂未接单!");
+            if(orderDtos.size() != 1)throw new ServiceException("一级市场暂未接单!");
             //开始创建订单
             TbOrders tbOrders = new TbOrders();
             //一级市场关联二级市场

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -77,9 +77,9 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		//检查登录
 		StpUtil.checkLogin();
 		// PC端只能admin进行登录,默认查询所有
-		soMap.set("order_finish",ordersStatus); // 订单的完成状态
-		soMap.set("sortType",22);  // 根据时间降序
-		return tbOrdersMapper.getList();
+		soMap.put("orderFinish",ordersStatus); // 订单的完成状态
+		soMap.put("sortType",22);  // 根据时间降序
+		return tbOrdersMapper.getList(soMap);
 	}
 
 	/**

sp-service/transport-server/src/main/java/com/pj/project/tb_car_record/AppCarRecordController.java

@@ -47,7 +47,7 @@ public class AppCarRecordController {
 
 	/** app:查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getAppList")
-	public AjaxJson getList(@RequestParam(value = "driverResult",required = false) Integer driverResult) {
+	public AjaxJson getAppList(@RequestParam(value = "driverResult",required = false) Integer driverResult) {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbCarRecord> list = tbCarRecordService.getAppList(so.startPage(),driverResult);
 		return AjaxJson.getPageData(so.getDataCount(), list);

sp-service/transport-server/src/main/java/com/pj/project/tb_car_record/TbCarRecord.java

@@ -120,9 +120,26 @@ public class TbCarRecord extends Model<TbCarRecord> implements Serializable {
 	private Long createBy;	
 
 	/**
-	 * 创建人名称 
+	 * 车辆类型
 	 */
-	private String createName;	
+	private Integer vehicleType;
+	/**
+	 * 车辆品牌名称
+	 */
+	private String vehicleModel;
+	/**
+	 * 创建人名称
+	 */
+	private String createName;
+
+	/**
+	 * 卸货地址
+	 */
+	private String unloadingAddress;
+	/**
+	 * 装货地址
+	 */
+	private String loadingAddress;
 
 	/**
 	 * 创建时间 

sp-service/transport-server/src/main/java/com/pj/project/tb_car_record/TbCarRecordMapper.xml

@@ -24,7 +24,10 @@
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
 			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("driverResult") '> and driver_result = #{driverResult} </if>
 			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
+			<if test=' this.has("vehicleType") '> and vehicle_type = #{vehicleType} </if>
+			<if test=' this.has("vehicleModel") '> and vehicle_model = #{vehicleModel} </if>
 			<if test=' this.has("driverId") '> and driver_id = #{driverId} </if>
 			<if test=' this.has("enterpriseId") '> and enterprise_id = #{enterpriseId} </if>
 			<if test=' this.has("orderId") '> and order_id = #{orderId} </if>

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/MethodDriverService.java

@@ -1,15 +1,27 @@
 package com.pj.project.tb_driver;
 
+import com.pj.common.core.exception.ServiceException;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.enummj.DeleteStatus;
+import com.pj.project.tb_car_record.TbCarRecord;
+import com.pj.project.tb_car_record.TbCarRecordMapper;
+import com.pj.project.tb_logistics.TbLogistics;
+import com.pj.project.tb_logistics.TbLogisticsMapper;
+import com.pj.project.tb_vehicle.TbVehicle;
+import com.pj.project.tb_vehicle.TbVehicleMapper;
+import com.pj.project.tb_driver.param.SucessDriverResultParam;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -25,6 +37,62 @@ public class MethodDriverService {
     @Autowired
     private TbDriverService tbDriverService;
 
+    @Autowired
+    private TbLogisticsMapper tbLogisticsMapper;
+
+    @Autowired
+    private TbCarRecordMapper tbCarRecordMapper;
+
+    @Autowired
+    private TbVehicleMapper tbVehicleMapper;
+
+    /** 司机同意 */
+    public boolean agree(APPLoginUserInfo appLoginInfo, SucessDriverResultParam driverResultParam){
+
+        //叫车表修改状态
+        TbCarRecord tbCarRecord = tbCarRecordMapper.selectById(driverResultParam.getCarRecordId());
+        if(tbCarRecord == null)throw new ServiceException("服务器繁忙!");
+        tbCarRecord.setDriverResult(1); // 同意
+        int update = tbCarRecordMapper.updateById(tbCarRecord);
+        if(update != 1)throw new RuntimeException("接单失败~");
+        //修改车辆状态
+        TbVehicle tbVehicle = tbVehicleMapper.selectById(driverResultParam.getVehicleId());
+        if(tbVehicle == null)throw new ServiceException("车辆信息异常!");
+        tbVehicle.setVehicleStatus(1); // 将状态修改成作业中
+        int updateById = tbVehicleMapper.updateById(tbVehicle);
+        if(updateById != 1)throw new RuntimeException("车辆状态异常");
+        //生成物流信息
+        TbLogistics logistics = new TbLogistics();
+        //数据拷贝
+        BeanUtils.copyProperties(driverResultParam,logistics);
+//        logistics.setDeclarationNumber(); //申报订单号
+//        logistics.setPrepare();  //订单待确认(0=待确认,1=订单已确认,2=订单确认失败)[j switch=true]
+        logistics.setPrepareTime(new Date()); // 确认接单时间
+        logistics.setLoading(0); //装货状态0,默认待装货
+//        logistics.setLoadingTime(); //  装货时间
+        logistics.setDelivery(0); // 发货状态,默认未发货
+//        logistics.setDeliveryTime(); // 发货时间
+        logistics.setClearedCustom(0); // 海关状态0, 默认未出海关
+//        logistics.setClearedCustomTime();  // 出海关时间
+        logistics.setMakeCargo(1);  // 接货人确定接货(0=禁用,1=启用)[j switch=true]
+        logistics.setMakeCargoTime(null); // 接货完成时间
+        logistics.setConfirmReceipt(1);  // 收购商确认(0=禁用,1=启用)[j switch=true]
+        logistics.setConfirmReceiptTime(null);  // 收货方确认时间(相当于订单完成时间)
+        logistics.setOrderFinish(0); // 订单完成状态, 默认未完成
+
+        //设置基本字段属性
+        logistics.setCreateBy(appLoginInfo.getLoginId());
+        logistics.setCreateName(appLoginInfo.getLoginName());
+        logistics.setCreateTime(new Date());
+        logistics.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
+
+        //保存物流信息
+        int insert = tbLogisticsMapper.insert(logistics);
+        if(insert != 1)throw new RuntimeException("物流信息保存异常!");
+
+        return true;
+    }
+
 
 
     /**

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverAppController.java

@@ -1,18 +1,11 @@
 package com.pj.project.tb_driver;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pj.project4sp.SP;
+import com.pj.project.tb_driver.param.SucessDriverResultParam;
+import com.pj.project.tb_driver.param.FailDriverResultParam;
 import com.pj.utils.sg.AjaxJson;
-import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -41,7 +34,29 @@ public class TbDriverAppController {
 		return AjaxJson.getSuccess();
 	}
 
+	/**
+	 * 司机处理结果,同意
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("driverAgree")
+	public AjaxJson driverDispose(@Validated @RequestBody SucessDriverResultParam driverResultParam) throws Exception {
+		boolean dispose = tbDriverService.driverAgree(driverResultParam);
+		if(dispose)return AjaxJson.getSuccess();
+		return AjaxJson.getError();
+	}
 
+	/**
+	 * 司机处理结果,拒绝
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("driverRefuse")
+	public AjaxJson driverRefuse(FailDriverResultParam failDriverResultParam) throws Exception {
+		boolean dispose = tbDriverService.driverRefuse(failDriverResultParam);
+		if(dispose)return AjaxJson.getSuccess();
+		return AjaxJson.getError();
+	}
 
 
 

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverService.java

@@ -8,6 +8,12 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.dto.DriverDto;
+import com.pj.common.core.exception.ServiceException;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.project.tb_car_record.TbCarRecord;
+import com.pj.project.tb_driver.param.SucessDriverResultParam;
+import com.pj.project.tb_driver.param.FailDriverResultParam;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -19,11 +25,12 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
-import com.pj.utils.sg.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.swing.filechooser.FileSystemView;
 
+import static com.pj.project.tb_car_record.TbCarRecordUtil.tbCarRecordMapper;
+
 /**
  * Service: tb_driver -- 司机
  * @author qzy 
@@ -39,6 +46,7 @@ public class TbDriverService extends ServiceImpl<TbDriverMapper, TbDriver> imple
 	@Autowired
 	private MethodDriverService methodDriverService;
 
+
 	/** 增 */
 	void add(TbDriver t){
 		save(t);
@@ -65,8 +73,43 @@ public class TbDriverService extends ServiceImpl<TbDriverMapper, TbDriver> imple
 		return tbDriverMapper.getList(so);	
 	}
 
+	/**
+	 * 司机处理订单,同意
+	 * @return
+	 */
+	public boolean driverAgree(SucessDriverResultParam driverResultParam){
+		//获取当前登录人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		boolean agree = methodDriverService.agree(appLoginInfo, driverResultParam);
+		//todo: 将司机车辆状态返还给航通
+		if(agree){
+			//车辆状态, 默认作业中
+
+		}
+		return agree;
+	}
+
 
+	/**
+	 * 司机处理订单,拒绝
+	 * @param failDriverResultParam
+	 * @return
+	 */
+	public boolean driverRefuse(FailDriverResultParam failDriverResultParam) throws Exception {
+
+		//将叫车表状态改成已拒绝
+		TbCarRecord tbCarRecord = tbCarRecordMapper.selectById(failDriverResultParam.getCarRecordId());
+		if(tbCarRecord == null)throw new ServiceException("叫车记录信息异常!");
+		tbCarRecord.setDriverResult(2); // 2=司机拒绝接单
+		//执行保存
+		int i = tbCarRecordMapper.updateById(tbCarRecord);
+		if(i == 1){
+			//todo:司机拒绝,发送通知短信给收购商
+//		smsRetryService.sendSmsMsg(failDriverResultParam.getEnterprisePhone());
+		}
+		return i == 1;
 
+	}
 
 
 

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/param/FailDriverResultParam.java → sp-service/transport-server/src/main/java/com/pj/project/tb_driver/param/FailDriverResultParam.java

@@ -1,4 +1,4 @@
-package com.pj.project.tb_vehicle.param;
+package com.pj.project.tb_driver.param;
 
 import lombok.Data;
 

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/param/SucessDriverResultParam.java → sp-service/transport-server/src/main/java/com/pj/project/tb_driver/param/SucessDriverResultParam.java

@@ -1,4 +1,4 @@
-package com.pj.project.tb_vehicle.param;
+package com.pj.project.tb_driver.param;
 
 import lombok.Data;
 
@@ -35,10 +35,11 @@ public class SucessDriverResultParam {
     @NotBlank(message = "loadingAddress,装货地址不能为空!")
     private String loadingAddress;
 
+    //todo: 届时放开卸货地址
     /**
      * 卸货地址
      */
-    @NotBlank(message = "unloadingAddress,卸货地址不能为空!")
+//    @NotBlank(message = "unloadingAddress,卸货地址不能为空!")
     private String unloadingAddress;
 
     /**

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/MethodVehicleService.java

@@ -5,14 +5,11 @@ import com.pj.api.dto.EnterpriseDto;
 import com.pj.api.dto.GoodsTransitDto;
 import com.pj.api.dto.OrderDto;
 import com.pj.common.core.exception.ServiceException;
-import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.project.tb_car_record.TbCarRecord;
 import com.pj.project.tb_car_record.TbCarRecordMapper;
-import com.pj.project.tb_logistics.TbLogistics;
 import com.pj.project.tb_logistics.TbLogisticsMapper;
-import com.pj.project.tb_vehicle.param.SucessDriverResultParam;
 import com.pj.project.tb_vehicle.param.MakeCarRecordParam;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -42,10 +39,7 @@ public class MethodVehicleService {
     private TbVehicleService tbVehicleService;
     @Autowired
     private TbVehicleMapper tbVehicleMapper;
-    @Autowired
-    private TbLogisticsMapper tbLogisticsMapper;
-    @Autowired
-    private TbCarRecordMapper tbCarRecordMapper;
+
     @Autowired
     private LevelOneServerInterface levelOneServerInterface;
 
@@ -56,6 +50,8 @@ public class MethodVehicleService {
         //数据拷贝
         BeanUtils.copyProperties(makeCarRecordParam,carRecord);
         //获取先决条件
+        TbVehicle tbVehicle = tbVehicleMapper.selectById(makeCarRecordParam.getVehicleId());
+        if(tbVehicle == null)throw new ServiceException("车辆信息有误!");
         OrderDto orderDtoById = levelOneServerInterface.getOrderDtoById(makeCarRecordParam.getOrderId());
         if(orderDtoById == null)throw new ServiceException("一级市场订单信息异常!");
         GoodsTransitDto goodsTransitById = levelOneServerInterface.getGoodsTransitById(orderDtoById.getGoodsId(), orderDtoById.getEnterpriseId());
@@ -63,6 +59,8 @@ public class MethodVehicleService {
         EnterpriseDto enterpriseById = levelOneServerInterface.getEnterpriseById(makeCarRecordParam.getEnterpriseId());
         if(enterpriseById == null)throw new ServiceException("一级市场商户信息错误!");
         //赋值基本信息
+        carRecord.setVehicleType(tbVehicle.getVehicleType()); // 车辆类型
+        carRecord.setVehicleModel(tbVehicle.getVehicleModel());  // 车辆品牌型号
         carRecord.setGoodsName(goodsTransitById.getGoodsName()); //过审商品名称
         carRecord.setGoodsImg(goodsTransitById.getGoodsImg()); // 过审商品图片
         carRecord.setGoodsWeight(goodsTransitById.getGrossWeight()); // 过审商品毛重
@@ -79,53 +77,6 @@ public class MethodVehicleService {
         return carRecord;
     }
 
-    /** 司机同意 */
-    public boolean agree(APPLoginUserInfo appLoginInfo, SucessDriverResultParam driverResultParam){
-
-        //叫车表修改状态
-        TbCarRecord tbCarRecord = tbCarRecordMapper.selectById(driverResultParam.getCarRecordId());
-        if(tbCarRecord == null)throw new ServiceException("服务器繁忙!");
-        tbCarRecord.setDriverResult(1); // 同意
-        int update = tbCarRecordMapper.updateById(tbCarRecord);
-        if(update != 1)throw new RuntimeException("接单失败~");
-        //修改车辆状态
-        TbVehicle tbVehicle = tbVehicleMapper.selectById(driverResultParam.getVehicleId());
-        if(tbVehicle == null)throw new ServiceException("车辆信息异常!");
-        tbVehicle.setVehicleStatus(1); // 将状态修改成作业中
-        int updateById = tbVehicleMapper.updateById(tbVehicle);
-        if(updateById != 1)throw new RuntimeException("车辆状态异常");
-        //生成物流信息
-        TbLogistics logistics = new TbLogistics();
-        //数据拷贝
-        BeanUtils.copyProperties(driverResultParam,logistics);
-//        logistics.setDeclarationNumber(); //申报订单号
-//        logistics.setPrepare();  //订单待确认(0=待确认,1=订单已确认,2=订单确认失败)[j switch=true]
-        logistics.setPrepareTime(new Date()); // 确认接单时间
-        logistics.setLoading(0); //装货状态0,默认待装货
-//        logistics.setLoadingTime(); //  装货时间
-        logistics.setDelivery(0); // 发货状态,默认未发货
-//        logistics.setDeliveryTime(); // 发货时间
-        logistics.setClearedCustom(0); // 海关状态0, 默认未出海关
-//        logistics.setClearedCustomTime();  // 出海关时间
-        logistics.setMakeCargo(1);  // 接货人确定接货(0=禁用,1=启用)[j switch=true]
-        logistics.setMakeCargoTime(null); // 接货完成时间
-        logistics.setConfirmReceipt(1);  // 收购商确认(0=禁用,1=启用)[j switch=true]
-        logistics.setConfirmReceiptTime(null);  // 收货方确认时间(相当于订单完成时间)
-        logistics.setOrderFinish(0); // 订单完成状态, 默认未完成
-
-        //设置基本字段属性
-        logistics.setCreateBy(appLoginInfo.getLoginId());
-        logistics.setCreateName(appLoginInfo.getLoginName());
-        logistics.setCreateTime(new Date());
-        logistics.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 默认可用
-
-        //保存物流信息
-        int insert = tbLogisticsMapper.insert(logistics);
-        if(insert != 1)throw new RuntimeException("物流信息保存异常!");
-
-        return true;
-    }
-
 
 
 

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicleAppController.java

@@ -1,8 +1,6 @@
 package com.pj.project.tb_vehicle;
 
 import com.pj.enummj.DeleteStatus;
-import com.pj.project.tb_vehicle.param.FailDriverResultParam;
-import com.pj.project.tb_vehicle.param.SucessDriverResultParam;
 import com.pj.project.tb_vehicle.param.MakeCarRecordParam;
 import com.pj.project.tb_vehicle.vo.TbVehicleVo;
 import com.pj.utils.sg.AjaxJson;
@@ -68,28 +66,6 @@ public class TbVehicleAppController {
 		return AjaxJson.getSuccess();
 	}
 
-	/**
-	 * 司机处理结果,同意
-	 * @return
-	 * @throws Exception
-	 */
-	@RequestMapping("driverAgree")
-	public AjaxJson driverDispose(@Validated @RequestBody SucessDriverResultParam driverResultParam) throws Exception {
-		boolean dispose = tbVehicleService.driverAgree(driverResultParam);
-		if(dispose)return AjaxJson.getSuccess();
-		return AjaxJson.getError();
-	}
 
-	/**
-	 * 司机处理结果,拒绝
-	 * @return
-	 * @throws Exception
-	 */
-	@RequestMapping("driverRefuse")
-	public AjaxJson driverRefuse(FailDriverResultParam failDriverResultParam) throws Exception {
-		boolean dispose = tbVehicleService.driverRefuse(failDriverResultParam);
-		if(dispose)return AjaxJson.getSuccess();
-		return AjaxJson.getError();
-	}
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/TbVehicleService.java

@@ -11,15 +11,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.common.core.exception.ServiceException;
-import com.pj.current.dto.APPLoginUserInfo;
-import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.project.tb_car_record.TbCarRecord;
 import com.pj.project.tb_car_record.TbCarRecordMapper;
 import com.pj.project.tb_driver.TbDriver;
 import com.pj.project.tb_driver.TbDriverMapper;
-import com.pj.project.tb_vehicle.param.FailDriverResultParam;
-import com.pj.project.tb_vehicle.param.SucessDriverResultParam;
 import com.pj.project.tb_vehicle.param.MakeCarRecordParam;
 import com.pj.project.tb_vehicle.vo.TbVehicleVo;
 import com.pj.retry.SmsRetryService;
@@ -129,7 +125,7 @@ public class TbVehicleService extends ServiceImpl<TbVehicleMapper, TbVehicle> im
 				(new LambdaQueryWrapper<TbCarRecord>()
 						.eq(TbCarRecord::getOrderId, makeCarRecordParam.getOrderId())
 						.eq(TbCarRecord::getEnterpriseId, makeCarRecordParam.getEnterpriseId())
-						.ne(TbCarRecord::getDriverResult,2) // 非司机拒绝
+						.ne(TbCarRecord::getDriverResult,2) // 非司机拒绝,大于1
 						.eq(TbCarRecord::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode()));
 		if(tbCarRecords != 0)throw new ServiceException("您当前订单已正在叫车中,请勿重复叫车~");
 		//通过driverId查询司机表
@@ -147,39 +143,7 @@ public class TbVehicleService extends ServiceImpl<TbVehicleMapper, TbVehicle> im
 
 
 
-	/**
-	 * 司机处理订单,同意
-	 * @return
-	 */
-	public boolean driverAgree(SucessDriverResultParam driverResultParam){
-		//获取当前登录人
-		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-		boolean agree = methodVehicleService.agree(appLoginInfo, driverResultParam);
-		//todo: 将司机车辆状态返还给航通
-		if(agree){
-			//车辆状态, 默认作业中
-
-		}
-		return agree;
-	}
 
-	/**
-	 * 司机处理订单,拒绝
-	 * @param failDriverResultParam
-	 * @return
-	 */
-	public boolean driverRefuse(FailDriverResultParam failDriverResultParam) throws Exception {
-		//todo:司机拒绝,发送通知短信给收购商
-//		smsRetryService.sendSmsMsg(failDriverResultParam.getEnterprisePhone());
-		//将叫车表状态改成已拒绝
-		TbCarRecord tbCarRecord = tbCarRecordMapper.selectById(failDriverResultParam.getCarRecordId());
-		if(tbCarRecord == null)throw new ServiceException("叫车记录信息异常!");
-		tbCarRecord.setDriverResult(2); // 2=司机拒绝接单
-		//执行保存
-		int i = tbCarRecordMapper.updateById(tbCarRecord);
-		return i == 1;
-
-	}