订单总的

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TradeOrderTransportInfoService.java

@@ -13,21 +13,11 @@ import com.sckw.order.api.model.TradeOrderVo;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.system.api.RemoteSystemService;
-import com.sckw.transport.model.KwtLogisticsOrder;
-import com.sckw.transport.model.KwtLogisticsOrderAddress;
-import com.sckw.transport.model.KwtLogisticsOrderGoods;
-import com.sckw.transport.model.KwtWaybillOrder;
-import com.sckw.transport.model.KwtWaybillOrderSubtask;
-import com.sckw.transport.model.KwtWaybillOrderTicket;
+import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.TradeOrderTransportQueryReq;
 import com.sckw.transport.model.param.WaybillTransportQueryReq;
 import com.sckw.transport.model.vo.TradeOrderTransportInfoResp;
-import com.sckw.transport.repository.KwtLogisticsOrderAddressRepository;
-import com.sckw.transport.repository.KwtLogisticsOrderGoodsRepository;
-import com.sckw.transport.repository.KwtLogisticsOrderRepository;
-import com.sckw.transport.repository.KwtWaybillOrderRepository;
-import com.sckw.transport.repository.KwtWaybillOrderSubtaskRepository;
-import com.sckw.transport.repository.KwtWaybillOrderTicketRepository;
+import com.sckw.transport.repository.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -64,6 +54,7 @@ public class TradeOrderTransportInfoService {
     private final KwtWaybillOrderTicketRepository waybillOrderTicketRepository;
     private final KwtLogisticsOrderGoodsRepository logisticsOrderGoodsRepository;
     private final KwtLogisticsOrderAddressRepository logisticsOrderAddressRepository;
+    private final KwtGatekeeperWaybillOrderRepository kwtGatekeeperWaybillOrderRepository;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
@@ -502,6 +493,13 @@ public class TradeOrderTransportInfoService {
         // 1. 设置任务编号
         if (Objects.nonNull(waybillOrder)) {
             taskInfo.setTaskNo(waybillOrder.getWOrderNo());
+            //查询门卫
+            KwtGatekeeperWaybillOrder kwtGatekeeperWaybillOrder = kwtGatekeeperWaybillOrderRepository.queryGatekeeperWaybillOrderByWOrderId(waybillOrder.getId(), 1);
+            String weigherName = Optional.ofNullable(kwtGatekeeperWaybillOrder)
+                    .map(KwtGatekeeperWaybillOrder::getGatekeeperName)
+                    .orElse("");
+            taskInfo.setWeigherName(weigherName);
+
             log.debug("设置任务编号: {}", waybillOrder.getWOrderNo());
         }