|
@@ -326,7 +326,8 @@ public class GatekeeperOrderService {
|
|
|
//组装铲车订单数据
|
|
//组装铲车订单数据
|
|
|
List<GatekeeperOrderResp> rawOreGatekeeperOrderResp = records.stream()
|
|
List<GatekeeperOrderResp> rawOreGatekeeperOrderResp = records.stream()
|
|
|
.map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder,
|
|
.map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder,
|
|
|
- waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrder)).toList();
|
|
|
|
|
|
|
+ waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrder))
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
log.info("门卫订单查询结束,result:{}", JSON.toJSONString(rawOreGatekeeperOrderResp));
|
|
log.info("门卫订单查询结束,result:{}", JSON.toJSONString(rawOreGatekeeperOrderResp));
|
|
|
return rawOreGatekeeperOrderResp;
|
|
return rawOreGatekeeperOrderResp;
|
|
|
|
|
|
|
@@ -428,6 +429,7 @@ public class GatekeeperOrderService {
|
|
|
* @param gatekeeperOrderPageResult
|
|
* @param gatekeeperOrderPageResult
|
|
|
*/
|
|
*/
|
|
|
private void sort(GatekeeperOrderQueryParam param, List<GatekeeperOrderResp> gatekeeperOrderPageResult) {
|
|
private void sort(GatekeeperOrderQueryParam param, List<GatekeeperOrderResp> gatekeeperOrderPageResult) {
|
|
|
|
|
+ log.info("门卫订单拍寻,param:{}, order:{}", JSON.toJSONString(param), JSON.toJSONString(gatekeeperOrderPageResult));
|
|
|
if (CollectionUtils.isEmpty(gatekeeperOrderPageResult)) {
|
|
if (CollectionUtils.isEmpty(gatekeeperOrderPageResult)) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|