|
|
@@ -3237,20 +3237,6 @@ public class KwtWaybillOrderV1Service {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (StringUtils.isNotBlank(req.getBillingMethod() )){
|
|
|
- List<KwtLogisticsOrder> kwtLogisticsOrder = logisticsOrderRepository.queryByBillMethod(req.getBillingMethod());
|
|
|
- if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(kwtLogisticsOrder)){
|
|
|
- Set<Long> logisticsOrderIds = kwtLogisticsOrder.stream()
|
|
|
- .map(KwtLogisticsOrder::getId)
|
|
|
- .collect(Collectors.toSet());
|
|
|
- logOrderIds.addAll(logisticsOrderIds);
|
|
|
- logOrderIds =logOrderIds.stream()
|
|
|
- .filter(logisticsOrderIds::contains)
|
|
|
- .collect(Collectors.toSet());
|
|
|
- }else {
|
|
|
- logOrderIds = Sets.newHashSet();
|
|
|
- }
|
|
|
- }
|
|
|
if (StringUtils.isNotBlank(req.getLogisticsOrderNo())){
|
|
|
KwtLogisticsOrder kwtLogisticsOrder = logisticsOrderRepository.queryByLogisticsOrderNo(req.getLogisticsOrderNo());
|
|
|
if (Objects.nonNull(kwtLogisticsOrder)){
|