|
@@ -3102,7 +3102,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
CompletableFuture<Set<Long>> goodsIdsFuture = CompletableFuture.completedFuture(Collections.emptySet());
|
|
CompletableFuture<Set<Long>> goodsIdsFuture = CompletableFuture.completedFuture(Collections.emptySet());
|
|
|
CompletableFuture<List<TradeOrderContractVo>> tradeOrderContractFuture = CompletableFuture.completedFuture(Collections.emptyList());
|
|
CompletableFuture<List<TradeOrderContractVo>> tradeOrderContractFuture = CompletableFuture.completedFuture(Collections.emptyList());
|
|
|
CompletableFuture<List<TradeContractGoodsDto>> contractGoodsFuture = CompletableFuture.completedFuture(Collections.emptyList());
|
|
CompletableFuture<List<TradeContractGoodsDto>> contractGoodsFuture = CompletableFuture.completedFuture(Collections.emptyList());
|
|
|
- if (Objects.nonNull(logisticsOrder) && logisticsOrder.getOrderType() != 1) {
|
|
|
|
|
|
|
+ if (Objects.nonNull(logisticsOrder) && !Objects.equals(logisticsOrder.getOrderType(), 1)) {
|
|
|
log.info("非原矿订单,订单iD: {}, 订单类型: {}", logisticsOrder.getId(), logisticsOrder.getOrderType());
|
|
log.info("非原矿订单,订单iD: {}, 订单类型: {}", logisticsOrder.getId(), logisticsOrder.getOrderType());
|
|
|
log.debug("开始提取贸易订单ID");
|
|
log.debug("开始提取贸易订单ID");
|
|
|
tradeOrderIdsFuture =
|
|
tradeOrderIdsFuture =
|