|
|
@@ -272,6 +272,7 @@ public class GatekeeperOrderService {
|
|
|
* @return
|
|
|
*/
|
|
|
private List<GatekeeperOrderResp> getGatekeeperOrderPageResult(List<KwtGatekeeperWaybillOrder> records) {
|
|
|
+ log.info("开始门卫订单查询,param:{}", JSON.toJSONString(records));
|
|
|
Set<Long> wOrderIds = records.stream().map(KwtGatekeeperWaybillOrder::getWOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
|
|
|
//查询运单
|
|
|
List<KwtWaybillOrder> waybillOrders = waybillOrderRepository.queryByBillOrderIds(wOrderIds);
|
|
|
@@ -326,6 +327,7 @@ public class GatekeeperOrderService {
|
|
|
List<GatekeeperOrderResp> rawOreGatekeeperOrderResp = records.stream()
|
|
|
.map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder,
|
|
|
waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrder)).toList();
|
|
|
+ log.info("门卫订单查询结束,result:{}", JSON.toJSONString(rawOreGatekeeperOrderResp));
|
|
|
return rawOreGatekeeperOrderResp;
|
|
|
|
|
|
}
|
|
|
@@ -342,7 +344,6 @@ public class GatekeeperOrderService {
|
|
|
Map<String, KwtWaybillOrderTicket> waybillOrderTicketMap,
|
|
|
Map<Long, KwtLogisticsOrder> logisticsOrderMap,
|
|
|
List<KwtLogisticsOrder> logisticsOrder) {
|
|
|
- log.info("开始门卫订单查询,param:{}", JSON.toJSONString(gatekeeperWaybillOrder));
|
|
|
GatekeeperOrderResp gatekeeper = new GatekeeperOrderResp();
|
|
|
gatekeeper.setId(gatekeeperWaybillOrder.getId());
|
|
|
gatekeeper.setEntId(gatekeeperWaybillOrder.getEntId());
|
|
|
@@ -395,7 +396,6 @@ public class GatekeeperOrderService {
|
|
|
gatekeeper.setPrEntName(orderUnit.getFirmName());
|
|
|
}
|
|
|
}
|
|
|
- log.info("门卫订单查询结束,result:{}", JSON.toJSONString(gatekeeper));
|
|
|
return gatekeeper;
|
|
|
}
|
|
|
|