feat: 用户修改车辆信息

guzijian
1 parent 10c0daf3
Showing 26 changed files with 363 additions and 129 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/mapper/GarOrderMatchDisposalMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchHandler.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DispatchDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/DispatchDriverVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/GarOrderDisposalVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailTransportVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/ScanDriverDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/TransportationEnterpriseVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
@@ -18,7 +18,6 @@ import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.GarOrder;
-import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
@@ -78,6 +77,10 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryOrderDetail(id));
     }
+    @GetMapping("/handler/qrCode/{orderId}")
+    public Result<String> createHandlerQrCode(@PathVariable("orderId") String orderId) {
+        return Result.OK(garOrderService.createHandlerQrCode(orderId));
+    }
     @GetMapping("/detail/transport/{id}")
     public Result<OrderDetailTransportVo> queryOrderTransportDetail(@PathVariable("id") String id) {
@@ -91,8 +91,8 @@ public class GlobalStatus {
         ALL_ORDER(2, "全部订单"),
         SUCCESS_ORDER(3, "已完成"),
         FAIL_ORDER(9, "订单处理失败"),
-        MATCH_NO(0,"未分配"),
-        MATCH_YES(1,"已分配"),
+        SCAN_HANDLER_NO(0,"未扫码处理"),
+        SCAN_HANDLER_YES(1,"已扫码处理"),
         DISPATCH_HANDLE_NEW(0,"未接受"),
         DISPATCH_HANDLE_ACTIVE(1,"已接受"),
         DISPATCH_HANDLE_SUCCESS(3,"已完成"),
@@ -26,7 +26,7 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     List<GarOrderDisposalVo> queryDisposalOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer value);
-    ScanDriverDetailVo queryDriverDetailByTelWithOrderId(@Param("garUserTel") String tel,@Param("orderId") String orderId);
+    ScanDriverDetailVo queryDriverDetailByTelWithOrderId(@Param("orderId") String orderId,@Param("userId") String userId);
     OrderDetailTransportVo queryOrderTransportDetail(@Param("orderId") String id);
@@ -15,7 +15,7 @@ import java.util.List;
 */
 public interface GarOrderMatchDisposalMapper extends BaseMapper<GarOrderMatchDisposal> {
-    List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId,@Param("companyId") Long id);
+    List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId);
 }
@@ -56,6 +56,8 @@ public class GarOrder implements Serializable {
      * 垃圾类型
      */
     private String garOrderTrashType;
+    private String garOrderCompanyUserId;
+
     /**
      * 订单人电话
@@ -132,7 +134,7 @@ public class GarOrder implements Serializable {
 	/**
 	 * 分配标识
 	 */
-	private Integer garOrderMatchFlag;
+	private Integer garOrderScanHandlerFlag;
 	/**
 	 * 经度
@@ -177,12 +179,12 @@ public class GarOrder implements Serializable {
 	}
-	public Integer getGarOrderMatchFlag() {
-		return garOrderMatchFlag;
+	public Integer getGarOrderScanHandlerFlag() {
+		return garOrderScanHandlerFlag;
 	}
-	public void setGarOrderMatchFlag(Integer garOrderMatchFlag) {
-		this.garOrderMatchFlag = garOrderMatchFlag;
+	public void setGarOrderScanHandlerFlag(Integer garOrderScanHandlerFlag) {
+		this.garOrderScanHandlerFlag = garOrderScanHandlerFlag;
 	}
 	public String getGarOrderId() {
@@ -423,4 +425,19 @@ public class GarOrder implements Serializable {
 		this.garRealCarCount = garRealCarCount;
 	}
+	public String getGarOrderCompanyUserId() {
+		return garOrderCompanyUserId;
+	}
+
+	public void setGarOrderCompanyUserId(String garOrderCompanyUserId) {
+		this.garOrderCompanyUserId = garOrderCompanyUserId;
+	}
+
+	public Boolean getGarInCarStore() {
+		return garInCarStore;
+	}
+
+	public void setGarInCarStore(Boolean garInCarStore) {
+		this.garInCarStore = garInCarStore;
+	}
 }
 \ No newline at end of file
@@ -30,7 +30,7 @@ public class GarOrderCar implements Serializable {
     private String garOrderCarType;
     /**
-     * 0预计 1 实际（一条记录代表一辆车）
+     * 0预计 1 实际（一条记录代表一辆车）  暂时没有用到
      */
     private Integer garOrderCarUserType;
@@ -43,7 +43,7 @@ public class GarOrderMatchAsk implements Serializable {
      * 
      */
     private String garOrderHandlerCompanyId;
-
+    private String garOrderContainerVolume;
     /**
      * 
      */
@@ -189,4 +189,12 @@ public class GarOrderMatchAsk implements Serializable {
     public void setGarOrderHandlerId(String garOrderHandlerId) {
         this.garOrderHandlerId = garOrderHandlerId;
     }
+
+    public String getGarOrderContainerVolume() {
+        return garOrderContainerVolume;
+    }
+
+    public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+        this.garOrderContainerVolume = garOrderContainerVolume;
+    }
 }
 \ No newline at end of file
@@ -32,6 +32,7 @@ public class GarOrderMatchHandler implements Serializable {
      * 处理人手机号
      */
     private String garOrderHandlerTel;
+    private String garOrderContainerVolume;
     /**
      * 处理人id
      */
@@ -117,6 +118,14 @@ public class GarOrderMatchHandler implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+    public String getGarOrderContainerVolume() {
+        return garOrderContainerVolume;
+    }
+
+    public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+        this.garOrderContainerVolume = garOrderContainerVolume;
+    }
+
     public Integer getGarOrderStatus() {
         return garOrderStatus;
     }
@@ -22,6 +22,7 @@ public class AskTransportDto {
     @NotBlank(message = "车牌号不能为空")
     private String garHandlerCarCode;
     private String garOrderHandlerName;
+    private String garOrderContainerVolume;
     @NotBlank(message = "company不能为空")
     private String garOrderHandlerCompanyId;
     @NotBlank(message = "company不能为空")
@@ -112,4 +113,12 @@ public class AskTransportDto {
     public void setGarOrderCompanyTel(String garOrderCompanyTel) {
         this.garOrderCompanyTel = garOrderCompanyTel;
     }
+
+    public String getGarOrderContainerVolume() {
+        return garOrderContainerVolume;
+    }
+
+    public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+        this.garOrderContainerVolume = garOrderContainerVolume;
+    }
 }
@@ -15,11 +15,20 @@ public class DispatchDto {
     @ToString
     @EqualsAndHashCode
     public static class DispatchDetail{
+        private String garOrderContainerVolume;
         private String carCode;
         private String tel;
         private String name;
         private String id;
+        public String getGarOrderContainerVolume() {
+            return garOrderContainerVolume;
+        }
+
+        public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+            this.garOrderContainerVolume = garOrderContainerVolume;
+        }
+
         public String getId() {
             return id;
         }
 package com.trash.garbage.pojo.dto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -88,7 +90,8 @@ public class OrderDto {
     private List<CarInfo> garCarInfoList;
-    @Data
+    @ToString
+    @EqualsAndHashCode
     public static class CarInfo {
         /**
          * 车辆数量
@@ -115,6 +118,7 @@ public class OrderDto {
         public void setGarOrderCarType(String garOrderCarType) {
             this.garOrderCarType = garOrderCarType;
         }
+
     }
     public List<CarInfo> getGarCarInfoList() {
 package com.trash.garbage.pojo.dto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import java.util.List;
 /**
  * @author 20412
  */
-@Data
+@EqualsAndHashCode
+@ToString
 public class OrderUpdateDto {
 	/**
@@ -19,8 +22,6 @@ public class OrderUpdateDto {
 	private String garReason;
-	private String validCode;
-
 	/**
      * 订单id
      */
@@ -31,7 +32,69 @@ public class OrderUpdateDto {
      */
     private Integer handleType;
-    /**
+	private Boolean updated;
+
+	private Integer garRealCarCount;
+
+	private String garOrderCompanyTel;
+	private List<OrderDto.CarInfo> garCarInfoList;
+	@ToString
+	@EqualsAndHashCode
+	public static class CarInfo {
+		/**
+		 * 车辆数量
+		 */
+		private Integer garOrderCarNumber;
+
+		/**
+		 * 车子类型
+		 */
+		private String garOrderCarType;
+
+		public Integer getGarOrderCarNumber() {
+			return garOrderCarNumber;
+		}
+
+		public void setGarOrderCarNumber(Integer garOrderCarNumber) {
+			this.garOrderCarNumber = garOrderCarNumber;
+		}
+
+		public String getGarOrderCarType() {
+			return garOrderCarType;
+		}
+
+		public void setGarOrderCarType(String garOrderCarType) {
+			this.garOrderCarType = garOrderCarType;
+		}
+
+	}
+
+
+	public String getGarOrderCompanyTel() {
+		return garOrderCompanyTel;
+	}
+
+	public void setGarOrderCompanyTel(String garOrderCompanyTel) {
+		this.garOrderCompanyTel = garOrderCompanyTel;
+	}
+
+	public Boolean getUpdated() {
+		return updated;
+	}
+
+	public void setUpdated(Boolean updated) {
+		this.updated = updated;
+	}
+
+	public Integer getGarRealCarCount() {
+		return garRealCarCount;
+	}
+
+	public void setGarRealCarCount(Integer garRealCarCount) {
+		this.garRealCarCount = garRealCarCount;
+	}
+
+	/**
      * 照片url
       */
     private List<String> imageUrls;
@@ -85,11 +148,11 @@ public class OrderUpdateDto {
 		this.garOrderHandleTel = garOrderHandleTel;
 	}
-	public String getValidCode() {
-		return validCode;
+	public List<OrderDto.CarInfo> getGarCarInfoList() {
+		return garCarInfoList;
 	}
-	public void setValidCode(String validCode) {
-		this.validCode = validCode;
+	public void setGarCarInfoList(List<OrderDto.CarInfo> garCarInfoList) {
+		this.garCarInfoList = garCarInfoList;
 	}
 }
@@ -27,6 +27,7 @@ public class DispatchDriverVo {
     /**
      * 人员信息
      */
+    @ToString
     @EqualsAndHashCode
     public static class Personnel {
         /**
@@ -15,6 +15,7 @@ import java.util.Date;
 @ToString
 public class GarOrderDisposalVo extends GarOrder {
     private Integer garOrderDisposalStatus;
+    private Integer garNowCarCount;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date garCreateTime;
@@ -36,4 +37,12 @@ public class GarOrderDisposalVo extends GarOrder {
     public void setGarOrderDisposalStatus(Integer garOrderDisposalStatus) {
         this.garOrderDisposalStatus = garOrderDisposalStatus;
     }
+
+    public Integer getGarNowCarCount() {
+        return garNowCarCount;
+    }
+
+    public void setGarNowCarCount(Integer garNowCarCount) {
+        this.garNowCarCount = garNowCarCount;
+    }
 }
@@ -65,6 +65,15 @@ public class OrderDetailTransportVo {
         private String fillImage;
         private String garAskId;
         private String garHandlerCarCode;
+        private String garOrderContainerVolume;
+
+        public String getGarOrderContainerVolume() {
+            return garOrderContainerVolume;
+        }
+
+        public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+            this.garOrderContainerVolume = garOrderContainerVolume;
+        }
         public String getFillImage() {
             return fillImage;
@@ -22,9 +22,9 @@ public class OrderDetailVo {
     private Integer garCancelFlag;
-    private String validCode;
     private String garReason;
     private String garOrderHandlerId;
+    private Integer garOrderScanHandlerFlag;
     private Integer garEvaluateFlag;
@@ -150,14 +150,6 @@ public class OrderDetailVo {
         this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
-    public String getValidCode() {
-        return validCode;
-    }
-
-    public void setValidCode(String validCode) {
-        this.validCode = validCode;
-    }
-
     public String getGarHandlerCarCode() {
         return garHandlerCarCode;
     }
@@ -402,4 +394,11 @@ public class OrderDetailVo {
         this.garCoordinate = garCoordinate;
     }
+    public Integer getGarOrderScanHandlerFlag() {
+        return garOrderScanHandlerFlag;
+    }
+
+    public void setGarOrderScanHandlerFlag(Integer garOrderScanHandlerFlag) {
+        this.garOrderScanHandlerFlag = garOrderScanHandlerFlag;
+    }
 }
@@ -14,7 +14,15 @@ public class ScanDriverDetailVo extends GarOrder {
     private String garOrderHandlerTel;
     private String garHandlerCarCode;
     private String garOrderHandlerId;
+    private String garOrderContainerVolume;
+    public String getGarOrderContainerVolume() {
+        return garOrderContainerVolume;
+    }
+
+    public void setGarOrderContainerVolume(String garOrderContainerVolume) {
+        this.garOrderContainerVolume = garOrderContainerVolume;
+    }
     public String getGarOrderHandlerId() {
         return garOrderHandlerId;
@@ -10,7 +10,6 @@ import java.text.DecimalFormat;
 @EqualsAndHashCode
 public class TransportationEnterpriseVo extends TransportationEnterprise {
     private String score;
-
     private Integer cleanNumber;
     private String distance;
@@ -44,4 +43,5 @@ public class TransportationEnterpriseVo extends TransportationEnterprise {
         DecimalFormat df = new DecimalFormat("#0.0");
         this.distance = df.format(distance);
     }
+
 }
@@ -13,5 +13,5 @@ import java.util.List;
 */
 public interface GarOrderMatchDisposalService extends IService<GarOrderMatchDisposal> {
-    List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId, Long id);
+    List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId);
 }
@@ -88,4 +88,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     OrderDetailTransportVo queryOrderTransportDetail(String id);
     GarOrderMatchAskVo scanDetail(String askId);
+
+    String createHandlerQrCode(String orderId);
+
 }
@@ -19,8 +19,8 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
     implements GarOrderMatchDisposalService {
     @Override
-    public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId, Long id) {
-        return baseMapper.queryDisposalListWithDispatchStatus(orderId,id);
+    public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) {
+        return baseMapper.queryDisposalListWithDispatchStatus(orderId);
     }
 }
@@ -88,11 +88,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public String saveOrder(OrderDto dto) {
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarOrder order = new GarOrder();
-        BeanUtils.copyProperties(dto, order, "garOrderCompanyId");
+        // companyId
+        BeanUtils.copyProperties(dto, order);
         order.setGarOrderUserId(userId);
         order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
         order.setGarCancelFlag(GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
-        order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_NO.getValue());
+        order.setGarOrderScanHandlerFlag(GlobalStatus.GarOrderStatus.SCAN_HANDLER_NO.getValue());
+        // 预估车辆等于用户选择得车辆
+        order.setGarRealCarCount(dto.getGarCarInfoList().stream().mapToInt(OrderDto.CarInfo::getGarOrderCarNumber).sum());
         save(order);
         // 保存车辆信息
@@ -133,7 +136,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 || user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
             return getOrderDetailVoResponsible(id, user);
         }
-        //  订单分发获取 处理人员
+        //  订单分发获取 驾驶员
         if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
             return getOrderDetailVoDriver(id, user);
         }
@@ -171,9 +174,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         qwc.eq(GarOrderCar::getGarOrderId, orderVo.getGarOrderId());
         List<GarOrderCar> carList = garOrderCarService.list(qwc);
         vo.setGarCarInfoList(carList);
-        // 验证码
-        String validCode = redisCache.getCacheMapValue(user.getGarUserTel(), orderId);
-        vo.setValidCode(validCode);
         return vo;
     }
@@ -285,6 +285,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String updateOrder(OrderUpdateDto dto) {
         String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         GarUser user = garUserService.getById(userId);
@@ -309,37 +310,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     private String handlerDisposalSiteOrderStatus(OrderUpdateDto dto, GarUser user) {
-        GarOrderDriverVo order = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), dto.getGarOrderId(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
-        // 处理场所负责人 清运中 ==》已完成 TODO 修改  只有与预估车辆相匹配以后才会完成订单
-//        if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
-//                && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
-//            LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
-//            uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
-//                    .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())
-//                    .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
-//            handlerService.update(uw);
-//            return "订单已完成";
-//        }
-        // 根据传入的validCode 和订单id去生成一条清运记录  一条记录生成一个validCode
-        // TODO 生成记录
-//        GarOrderMatchAsk ask = new GarOrderMatchAsk();
-//        BeanUtils.copyProperties(order, ask, "garCreateTime", "garUpdateTime", "garCreateBy", "garUpdateBy");
-//        String code = ValidateCodeUtil.generatorCode(6);
-//        redisCache.setCacheMapValue(dto.getGarOrderHandleTel(), dto.getGarOrderId(), code);
-//        matchAskService.save(ask);
-//        return "当前趟次记录成功";
-        // TODO 记录数
-        // update order count
         throw new BizException(ResultCode.CODE_500);
     }
-    private boolean checkCode(String code) {
+    private boolean checkCode(String code, String orderId, String userId) {
         if (StringUtils.isNotBlank(code)) {
-            String[] params = code.split(",");
-            if (params.length == 3) {
-                String validCode = redisCache.getCacheMapValue(params[0], params[1]);
-                return code.equals(validCode);
-            }
+            String validCode = redisCache.getCacheMapValue(orderId, userId);
+            return code.equals(validCode);
         }
         return false;
     }
@@ -356,12 +333,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
             uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
                     .eq(GarOrderMatchHandler::getGarOrderHandlerTel, tel)
-                    .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
+                    .set(GarOrderMatchHandler::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
                     .set(GarOrderMatchHandler::getGarOrderHandlerId, user.getGarUserId());
             handlerService.update(uw);
-            // TODO 以订单id和人员手机号 hash key返回前端生成二维码  存放到redis中
-            String code = tel + "," + order.getGarOrderId() + "," + ValidateCodeUtil.generatorCode(6);
-            redisCache.setCacheMapValue(tel, order.getGarOrderId(), code);
             return "已接受订单";
         }
         throw new BizException(ResultCode.CODE_500);
@@ -369,12 +343,12 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private String handlerOrderStatus(OrderUpdateDto dto, GarUser user) {
         GarOrder order = getById(dto.getGarOrderId());
-        // 取消订单
+        // 取消订单公用
         if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_YES.getValue().equals(dto.getGarCancelFlag())) {
             LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
             uw.set(GarOrder::getGarCancelFlag, dto.getGarCancelFlag())
-                    .set(GarOrder::getGarReason, dto.getGarReason())
-                    .eq(GarOrder::getGarOrderId, dto.getGarOrderId());
+                    .eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                    .set(GarOrder::getGarReason, dto.getGarReason());
             update(uw);
             // TODO 短信提醒  公司 | 居民
             String tel = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
@@ -384,18 +358,44 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             smsUtils.sendMessage(tel, message);
             return "订单取消成功";
         }
-        // 企业负责人
-        else {
+        // 用户修改
+        else if (GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) && dto.getUpdated()) {
+            // TODO 待优化  可能出现线程安全 需要上锁
+            if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) {
+                throw new BizException(ResultCode.CODE_400, "当前订单无法修改，因为已有驾驶员确认");
+            }
+            // 删除之前的车辆数
+            LambdaQueryWrapper<GarOrderCar> qw = new LambdaQueryWrapper<>();
+            qw.eq(GarOrderCar::getGarOrderId, dto.getGarOrderId());
+            garOrderCarService.remove(qw);
+            // 保存车辆信息
+            List<OrderDto.CarInfo> garCarInfoList = dto.getGarCarInfoList();
+            List<GarOrderCar> garOrderCars = new ArrayList<>();
+            for (OrderDto.CarInfo carInfo : garCarInfoList) {
+                for (int index = 0; index < carInfo.getGarOrderCarNumber(); index++) {
+                    GarOrderCar car = new GarOrderCar();
+                    car.setGarOrderCarType(carInfo.getGarOrderCarType());
+                    car.setGarOrderId(dto.getGarOrderId());
+                    car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.REAL_CAR_TYPE.getValue());
+                    garOrderCars.add(car);
+                }
+            }
+            garOrderCarService.saveBatch(garOrderCars);
+            order.setGarRealCarCount(garOrderCars.size());
+            updateById(order);
+            // TODO  发送短信用户修改订单了
+            smsUtils.sendMessage(dto.getGarOrderCompanyTel(), "您的清运订单有修改，请及时查看并处理!");
+            return "修改成功";
+        }
+        // 企业负责人 清运-》完成
+        else if (GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription().equals(user.getGarUserType())) {
             // 公司所属 待清运- 》 清运中
             if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
                     || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
-                if (StringUtils.isNotEmpty(order.getGarOrderCompanyId())) {
-                    throw new BizException(ResultCode.CODE_500, "订单已经接受了");
-                }
                 LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
                 uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
                         .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
-                        .set(GarOrder::getGarOrderCompanyId, user.getGarUserId());
+                        .set(GarOrder::getGarOrderCompanyUserId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
                 smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。");
@@ -410,11 +410,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarHandlerEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue())
                         .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
                 update(uw);
+                smsUtils.sendMessage(order.getGarOrderContactTel(), "您的清运订单已完成，可前往小程序进行评价，感谢您的使用");
+                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
+                // 更新disposal
+                LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
+                uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrderMatchDisposal::getGarOrderDisposalStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+                disposalService.update(uwd);
+                // 更新handler
+                LambdaUpdateWrapper<GarOrderMatchHandler> uwh = new LambdaUpdateWrapper<>();
+                uwh.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrderMatchHandler::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+                handlerService.update(uwh);
             }
             // TODO 短信提醒
             smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已完成订单号为 " + order.getGarOrderId() + " 的订单。");
             return "订单已完成";
         }
+
+        throw new BizException(ResultCode.CODE_400);
     }
     @Override
@@ -635,7 +649,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size());
         // 每次下发统计选中驾驶员更新实际派车数量
         // 已分配 继续下发
-        if (order.getGarOrderMatchFlag().equals(GlobalStatus.GarOrderStatus.MATCH_YES.getValue())) {
+        if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue())) {
             LambdaQueryWrapper<GarOrderMatchHandler> qw = new LambdaQueryWrapper<>();
             qw.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId());
             Map<String, GarOrderMatchHandler> handlerMap = handlerService.list(qw).stream().collect(Collectors.toMap(item -> item.getGarOrderHandlerTel(), item -> item));
@@ -653,11 +667,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
         }
         handlerService.saveBatch(handlerList);
-        order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
         List<String> tels = handlerList.stream().map(GarOrderMatchHandler::getGarOrderHandlerTel).collect(Collectors.toList());
         // TODO 短信通知
         smsUtils.sendMessage(tels, "您有新的清运任务！请打开小程序查看当前任务。");
-        updateById(order);
     }
     private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
@@ -667,9 +679,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         handler.setGarHandlerCarCode(detail.getCarCode());
         handler.setGarCancelFlag(order.getGarCancelFlag());
         handler.setGarOrderId(order.getGarOrderId());
-        handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
+        handler.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
         handler.setGarOrderHandlerCompanyName(order.getGarOrderCompanyName());
         handler.setGarOrderHandlerCompanyId(order.getGarOrderCompanyId());
+        handler.setGarOrderContainerVolume(detail.getGarOrderContainerVolume());
 //        handler.setGarOrderHandlerId(detail.getId());
         handler.setGarOrderStatus(GlobalStatus.GarOrderStatus.DISPATCH_HANDLE_NEW.getValue());
         return handler;
@@ -749,45 +762,90 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // TODO
         // String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
         // 选中的司机处理场所
-        List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId, null);
+        List<DispatchDisposalVo> voList = disposalService.queryDisposalListWithDispatchStatus(orderId);
         return voList;
     }
     @Override
     public ScanDriverDetailVo checkValidCode(String validCode) {
-        // TODO check code
-        if (checkCode(validCode)) {
+        if (StringUtils.isNotBlank(validCode)) {
             String[] params = validCode.split(",");
-            ScanDriverDetailVo vo = baseMapper.queryDriverDetailByTelWithOrderId(params[0], params[1]);
-            return vo;
+            String orderId = params[0];
+            String userId = params[1];
+            // TODO check code
+            if (checkCode(validCode, orderId, userId)) {
+                ScanDriverDetailVo vo = baseMapper.queryDriverDetailByTelWithOrderId(orderId, userId);
+                return vo;
+            }
         }
+
         throw new BizException(ResultCode.CODE_400, "二维码验证不通过");
     }
     @Override
     public String askTransport(AskTransportDto dto) {
-        GarOrderMatchAsk ask = new GarOrderMatchAsk();
-        BeanUtils.copyProperties(dto, ask);
-        matchAskService.save(ask);
+
         // TODO 判断是否运载完毕  已经到预估趟次则不在生成验证码
-        String tel = dto.getGarOrderHandlerTel();
         String orderId = dto.getGarOrderId();
-        String code = tel + "," + orderId + "," + ValidateCodeUtil.generatorCode(6);
-//        redisCache.setCacheMapValue(tel, orderId, code);*
-        // 保存图片url
-        List<GarOrderImage> imageList = new ArrayList<>(dto.getFillImageList().size());
-        for (String fillImageUrl : dto.getFillImageList()) {
-            GarOrderImage image = new GarOrderImage();
-            image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
-            image.setGarOrderId(orderId);
-            image.setGarOrderImageUrl(fillImageUrl);
-            image.setGarRemark(ask.getGarId());
-            imageList.add(image);
+
+        // 查询当前运载几趟  如果全部运输完毕则发送成功短信
+        LambdaQueryWrapper<GarOrderMatchAsk> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarOrderMatchAsk::getGarOrderId, dto.getGarOrderId());
+        int transportCount = askService.list(qw).size();
+        GarOrder order = getById(orderId);
+        if (transportCount <= order.getGarRealCarCount() - 1) {
+            // 第一次的话需要修改订单状态为已扫码
+            if (order.getGarOrderScanHandlerFlag().equals(GlobalStatus.GarOrderStatus.SCAN_HANDLER_NO.getValue())) {
+                order.setGarOrderScanHandlerFlag(GlobalStatus.GarOrderStatus.SCAN_HANDLER_YES.getValue());
+                updateById(order);
+            }
+            GarOrderMatchAsk ask = new GarOrderMatchAsk();
+            BeanUtils.copyProperties(dto, ask);
+            matchAskService.save(ask);
+            // 保存图片url
+            List<GarOrderImage> imageList = new ArrayList<>(dto.getFillImageList().size());
+            for (String fillImageUrl : dto.getFillImageList()) {
+                GarOrderImage image = new GarOrderImage();
+                image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
+                image.setGarOrderId(orderId);
+                image.setGarOrderImageUrl(fillImageUrl);
+                image.setGarRemark(ask.getGarId());
+                imageList.add(image);
+            }
+            garOrderImageService.saveBatch(imageList);
+            if (transportCount == (order.getGarRealCarCount() - 1)) {
+                // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
+                smsUtils.sendMessage(order.getGarOrderContactTel(), "您的清运订单已完成，可前往小程序进行评价，感谢您的使用");
+                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
+                successOrder(order, dto);
+                redisCache.deleteObject(orderId);
+                return "当前订单已完成";
+            }
+            //TODO 短信通知
+            return "当前趟次记录成功";
         }
-        garOrderImageService.saveBatch(imageList);
-        return "当前趟次记录成功";
+
+        throw new BizException(ResultCode.CODE_400, "当前记录无效,已完成所有趟次！");
+    }
+
+    private void successOrder(GarOrder order, AskTransportDto dto) {
+        order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+        order.setGarHandlerEvaluateFlag(GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
+        order.setGarEvaluateFlag(GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
+        updateById(order);
+        // 更新disposal
+        LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
+        uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
+                .set(GarOrderMatchDisposal::getGarOrderDisposalStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+        disposalService.update(uwd);
+        // 更新handler
+        LambdaUpdateWrapper<GarOrderMatchHandler> uwh = new LambdaUpdateWrapper<>();
+        uwh.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
+                .set(GarOrderMatchHandler::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+        handlerService.update(uwh);
     }
+
     @Override
     public OrderDetailTransportVo queryOrderTransportDetail(String id) {
         // 根据当前订单id查订单数据 - 查扫码趟次数据
@@ -825,12 +883,23 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 图片url
         LambdaQueryWrapper<GarOrderImage> qw = new LambdaQueryWrapper<>();
         qw.eq(GarOrderImage::getGarOrderId, ask.getGarOrderId())
+                .eq(GarOrderImage::getGarRemark, askId)
                 .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue());
         List<String> fillImageList = garOrderImageService.list(qw).stream().map(GarOrderImage::getGarOrderImageUrl).collect(Collectors.toList());
         vo.setFillImageList(fillImageList);
         return vo;
     }
+    @Override
+    public String createHandlerQrCode(String orderId) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        // 返回验证码
+        // TODO 以订单id和用户id hash key返回前端生成二维码  存放到redis中
+        String code = orderId + "," + userId + "," + ValidateCodeUtil.generatorCode(6);
+        redisCache.setCacheMapValue(orderId, userId, code);
+        return code;
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
@@ -13,6 +13,7 @@
         <result property="garOrderTrashType" column="gar_order_trash_type" jdbcType="VARCHAR"/>
         <result property="garOrderContactTel" column="gar_order_contact_tel" jdbcType="VARCHAR"/>
         <result property="garOrderCompanyId" column="gar_order_company_id" jdbcType="VARCHAR"/>
+        <result property="garOrderCompanyUserId" column="gar_order_company_user_id" jdbcType="VARCHAR"/>
         <result property="garOrderCompanyName" column="gar_order_company_name" jdbcType="VARCHAR"/>
         <result property="garOrderCompanyTel" column="gar_order_company_tel" jdbcType="VARCHAR"/>
         <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="INTEGER"/>
@@ -26,7 +27,7 @@
         <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
         <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
         <result property="garHandlerEvaluateFlag" column="gar_handler_evaluate_flag" jdbcType="TINYINT"/>
-        <result property="garOrderMatchFlag" column="gar_order_match_flag" jdbcType="TINYINT"/>
+        <result property="garOrderScanHandlerFlag" column="gar_order_scan_handler_flag" jdbcType="TINYINT"/>
         <result property="garLatitude" column="gar_latitude" jdbcType="DOUBLE"/>
         <result property="garLongitude" column="gar_longitude" jdbcType="DOUBLE"/>
         <result property="garCoordinate" column="gar_coordinate" jdbcType="DOUBLE"/>
@@ -49,6 +50,7 @@
         <collection property="transportDetails"
                     ofType="com.trash.garbage.pojo.vo.OrderDetailTransportVo$TransportDetail">
             <result property="garHandlerCarCode" column="gar_handler_car_code"/>
+            <result property="garOrderContainerVolume" column="gar_order_container_volume"/>
             <result property="fillImage" column="fill_image"/>
             <result property="garAskId" column="gar_ask_id"/>
         </collection>
@@ -62,7 +64,7 @@
         gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
         gar_order_agreement_time,gar_create_time,gar_update_time,
         gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
-        gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_match_flag,gar_coordinate,gar_longitude,gar_latitude,gar_real_car_count
+        gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_scan_handler_flag,gar_coordinate,gar_longitude,gar_latitude,gar_real_car_count
     </sql>
     <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
         select gar_order_company_id, count(gar_order_company_id) as count
@@ -84,17 +86,16 @@
         `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_coordinate,
         `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
         `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_latitude,
-        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,
-        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status
-        gar_order_status,
-        `handler`.gar_order_status
-        gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`order`.gar_real_car_count
+        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,
+        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,
+--         `order`.gar_order_handler_status gar_order_status,
+        `handler`.gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`order`.gar_real_car_count
         FROM gar_order `order`
         INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id
         <where>
             `handler`.gar_order_handler_tel = #{garUserTel}
             <if test="type != null">
-                AND `handler`.gar_order_status = #{type}
+                AND `handler`.gar_order_handler_status = #{type}
             </if>
             <if test="cancelFlag != null">
                 AND `handler`.gar_cancel_flag = #{cancelFlag}
@@ -106,11 +107,9 @@
         `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
         `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
         `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
-        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_match_flag,`order`.gar_real_car_count,
-        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,`order`.gar_order_handler_status
-        gar_order_status,
-        `handler`.gar_order_status
-        gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
+        `order`.gar_order_company_name,`order`.gar_order_company_tel,`order`.gar_order_scan_handler_flag,`order`.gar_real_car_count,
+        `order`.gar_order_agreement_time,`order`.gar_remark,`order`.gar_handler_evaluate_flag,
+        `handler`.gar_order_handler_status,`handler`.gar_cancel_flag,`handler`.gar_reason,`handler`.gar_handler_car_code
         FROM gar_order `order`
         INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND
         `order`.gar_order_id = #{orderId}
@@ -133,13 +132,22 @@
         `order`.gar_order_trash_type,
         `order`.gar_order_contact_tel,
         `order`.gar_order_company_id,
+        `order`.gar_order_company_user_id,
         `order`.gar_latitude,
         `order`.gar_order_company_name,
         `order`.gar_order_company_tel,
         `order`.gar_order_agreement_time,
         `disposal`.gar_create_time,
         `disposal`.gar_order_disposal_status,
-        `order`.gar_real_car_count
+        `order`.gar_real_car_count,
+        (
+            CASE
+            `order`.gar_order_id
+            WHEN `order`.gar_order_id THEN
+            ( SELECT count(*) FROM gar_order_match_ask ask INNER JOIN gar_order ON `gar_order`.gar_order_id =
+            `ask`.gar_order_id WHERE `order`.gar_order_id = `gar_order`.gar_order_id )
+            END
+        ) AS gar_now_car_count
         FROM
         gar_order `order`
         INNER JOIN gar_order_match_disposal `disposal` ON `order`.gar_order_id = `disposal`.gar_order_id
@@ -152,7 +160,7 @@
     </select>
     <select id="queryDriverDetailByTelWithOrderId" resultType="com.trash.garbage.pojo.vo.ScanDriverDetailVo">
         SELECT
-        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,
+        `order`.gar_order_id ,`order`.gar_order_user_id,`order`.gar_latitude,`order`.gar_order_company_user_id,
         `order`.gar_order_address,`order`.gar_order_address_details,`order`.gar_order_contact_name,`order`.gar_longitude,
         `order`.gar_order_trash_type,`order`.gar_order_contact_tel,`order`.gar_order_company_id,`order`.gar_coordinate,
         `order`.gar_order_company_name,`order`.gar_order_company_tel,`handler`.gar_create_time,
@@ -160,12 +168,13 @@
         gar_order_status,`handler`.gar_handler_car_code,`handler`.gar_order_handler_name,
         `handler`.gar_handler_car_code,
         `handler`.gar_order_handler_tel,
-        `handler`.gar_order_handler_id
+        `handler`.gar_order_handler_id,
+        `handler`.gar_order_container_volume
         FROM gar_order `order`
         INNER JOIN gar_order_match_handler `handler` ON `order`.gar_order_id = `handler`.gar_order_id AND
         `order`.gar_order_id = #{orderId}
         <where>
-            `handler`.gar_order_handler_tel = #{garUserTel}
+            `handler`.gar_order_handler_id = #{userId}
         </where>
     </select>
     <select id="queryOrderTransportDetail" resultMap="TransportDetailVo">
@@ -179,6 +188,7 @@
                `order`.gar_order_trash_type,
                `order`.gar_order_contact_tel,
                `order`.gar_order_company_id,
+               `order`.gar_order_company_user_id,
                `order`.gar_latitude,
                `order`.gar_order_company_name,
                `order`.gar_order_company_tel,
@@ -9,6 +9,7 @@
             <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
+            <result property="garOrderContainerVolume" column="gar_order_container_volume" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerCompanyId" column="gar_order_handler_company_id" jdbcType="VARCHAR"/>
             <result property="garOrderHandlerCompanyName" column="gar_order_handler_company_name" jdbcType="VARCHAR"/>
             <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
@@ -19,7 +20,7 @@
     </resultMap>
     <sql id="Base_Column_List">
-        gar_id,gar_order_id,gar_order_handler_tel,
+        gar_id,gar_order_id,gar_order_handler_tel,gar_order_container_volume,
         gar_order_handler_name,gar_order_handler_company_id,gar_order_handler_company_name,
         gar_create_time,gar_update_time,gar_create_by,
         gar_update_by,gar_remark
@@ -44,13 +44,15 @@
                disposal.construction_unit_person_phone AS tel,
                disposal.construction_unit_person,
                CASE
-
-                   WHEN gar.gar_order_id IS NULL THEN
+                   WHEN `temp`.gar_order_id IS NULL THEN
                        0
                    ELSE 1
                    END                                 AS checked
         FROM disposal_site disposal
-                 LEFT JOIN gar_order_match_disposal gar
-                           ON disposal.construction_unit_person_phone = gar.gar_order_disposal_tel
+                 LEFT JOIN (SELECT gar.gar_order_id, gar.gar_order_disposal_tel
+                            FROM gar_order_match_disposal gar
+                                     INNER JOIN gar_order `order` ON `order`.gar_order_id = gar.gar_order_id
+                            WHERE `order`.gar_order_id = #{orderId}) `temp`
+                           ON `temp`.gar_order_disposal_tel = disposal.construction_unit_person_phone
     </select>
 </mapper>
@@ -8,6 +8,7 @@
         <id property="garId" column="gar_id" jdbcType="VARCHAR"/>
         <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
         <result property="garOrderHandlerTel" column="gar_order_handler_tel" jdbcType="VARCHAR"/>
+        <result property="garOrderContainerVolume" column="gar_order_container_volume" jdbcType="VARCHAR"/>
         <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="TINYINT"/>
         <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
         <result property="garOrderHandlerName" column="gar_order_handler_name" jdbcType="VARCHAR"/>
@@ -33,7 +34,7 @@
     <sql id="Base_Column_List">
         gar_id
-        ,gar_order_id,gar_order_handler_tel,
+        ,gar_order_id,gar_order_handler_tel,gar_order_container_volume,
         gar_order_handler_status,gar_cancel_flag,gar_order_handler_name,gar_order_handler_company_id,
         gar_order_handler_company_name,gar_create_time,gar_update_time,
         gar_craete_by,gar_update_by,gar_reason,gar_handler_car_code