fix: 修复驾驶员接单报错，修复继续派发报错。

guzijian
1 parent d9491a6a
Showing 1 changed file with 35 additions and 18 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +29,6 @@ import com.trash.driver.service.IDriverService;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
-
 import cn.hutool.core.collection.CollectionUtil;
 /**
@@ -118,7 +116,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 || user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription())) {
             return getOrderDetailVoResponsible(id, user);
         }
-        // TODO 订单分发获取 处理人员
+        //  订单分发获取 处理人员
         if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
             return getOrderDetailVoDriver(id, user);
         }
@@ -295,8 +293,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
                 LambdaUpdateWrapper<GarOrderMatchHandler> uw = new LambdaUpdateWrapper<>();
                 uw.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
-                        .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
-                        .set(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel());
+                        .eq(GarOrderMatchHandler::getGarOrderHandlerTel, user.getGarUserTel())
+                        .set(GarOrderMatchHandler::getGarOrderStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue());
                 handlerService.update(uw);
                 return "已接受派单";
             }
@@ -305,6 +303,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     && 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);
             }
@@ -477,27 +476,45 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public void dispatchOrder(DispatchDto dto) {
-        // TODO
         GarOrder order = getById(dto.getGarOrderId());
         List<GarOrderMatchHandler> handlerList = new ArrayList<>(dto.getDispatchList().size());
-        for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {
-            GarOrderMatchHandler handler = new GarOrderMatchHandler();
-            handler.setGarOrderHandlerTel(detail.getTel());
-            handler.setGarOrderHandlerName(detail.getName());
-            handler.setGarHandlerCarCode(detail.getCarCode());
-            handler.setGarCancelFlag(order.getGarCancelFlag());
-            handler.setGarOrderId(order.getGarOrderId());
-            handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
-            handler.setGarOrderHandlerCompanyName(order.getGarOrderCompanyName());
-            handler.setGarOrderHandlerCompanyId(order.getGarOrderCompanyId());
-            handler.setGarOrderStatus(GlobalStatus.GarOrderStatus.DISPATCH_HANDLE_NEW.getValue());
-            handlerList.add(handler);
+        // 已分配 继续下发
+        if (order.getGarOrderMatchFlag().equals(GlobalStatus.GarOrderStatus.MATCH_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));
+            for (DispatchDto.DispatchDetail dispatchDetail : dto.getDispatchList()) {
+                if (handlerMap.containsKey(dispatchDetail.getTel())) {
+                    continue;
+                }
+                GarOrderMatchHandler handler = getGarOrderMatchHandler(order, dispatchDetail);
+                handlerList.add(handler);
+            }
+        } else {
+            for (DispatchDto.DispatchDetail detail : dto.getDispatchList()) {
+                GarOrderMatchHandler handler = getGarOrderMatchHandler(order, detail);
+                handlerList.add(handler);
+            }
         }
         handlerService.saveBatch(handlerList);
         order.setGarOrderMatchFlag(GlobalStatus.GarOrderStatus.MATCH_YES.getValue());
         updateById(order);
     }
+    private GarOrderMatchHandler getGarOrderMatchHandler(GarOrder order, DispatchDto.DispatchDetail detail) {
+        GarOrderMatchHandler handler = new GarOrderMatchHandler();
+        handler.setGarOrderHandlerTel(detail.getTel());
+        handler.setGarOrderHandlerName(detail.getName());
+        handler.setGarHandlerCarCode(detail.getCarCode());
+        handler.setGarCancelFlag(order.getGarCancelFlag());
+        handler.setGarOrderId(order.getGarOrderId());
+        handler.setGarOrderHandlerStatus(order.getGarOrderHandlerStatus());
+        handler.setGarOrderHandlerCompanyName(order.getGarOrderCompanyName());
+        handler.setGarOrderHandlerCompanyId(order.getGarOrderCompanyId());
+        handler.setGarOrderStatus(GlobalStatus.GarOrderStatus.DISPATCH_HANDLE_NEW.getValue());
+        return handler;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<DispatchDriverVo> queryDispatch(String orderId) {