|
|
@@ -1491,9 +1491,11 @@ public class AcceptCarriageOrderService {
|
|
|
orderStatusList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
|
|
|
List<KwtLogisticsOrder> logisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
|
|
|
.eq(KwtLogisticsOrder::getTOrderId, logisticsOrder.getTOrderId())
|
|
|
- .in(KwtLogisticsOrder::getStatus, statusList));
|
|
|
+ .in(KwtLogisticsOrder::getStatus, orderStatusList));
|
|
|
if (org.springframework.util.CollectionUtils.isEmpty(logisticsOrders)) {
|
|
|
tradeOrder.setIsAllComplete(true);
|
|
|
+ }else {
|
|
|
+ tradeOrder.setIsAllComplete(false);
|
|
|
}
|
|
|
tradeOrder.setTOrderId(logisticsOrder.getTOrderId());
|
|
|
// tradeOrder.setActualLoadAmount(map.get("totalLoadAmount"));
|