增加派件任务逻辑，根据发货地和收货地决定快递员分配

alexyang
1 parent 1e633c24
Showing 1 changed file with 15 additions and 0 deletions
sl-express-ms-work-service/src/main/java/com/sl/ms/work/mq/CourierMQListener.java
 package com.sl.ms.work.mq;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
@@ -97,6 +98,20 @@ public class CourierMQListener {
             return;
         }
+        // 根据中瑞要求，如果是同城配送，则派件使用取件快递员
+        if (PickupDispatchTaskType.DISPATCH.getCode().equals(courierTaskMsg.getTaskType())) {
+            list = pickupDispatchTaskService.findByOrderId(
+                    courierTaskMsg.getOrderId(),
+                    PickupDispatchTaskType.PICKUP);
+            if (CollUtil.isNotEmpty(list)) {
+                list.forEach(task -> {
+                    if (orderDTO.getSenderCityId().equals(orderDTO.getReceiverCityId())) {
+                        courierTaskMsg.setCourierId(task.getCourierId());
+                    }
+                });
+            }
+        }
+
         PickupDispatchTaskEntity pickupDispatchTask = BeanUtil.toBean(courierTaskMsg, PickupDispatchTaskEntity.class);
 //        任务类型