|
@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
@@ -194,7 +195,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
|
|
|
*/
|
|
*/
|
|
|
private KwtLogisticsOrder checkLogOrder(OrderCirculateTakingQueryParam param) {
|
|
private KwtLogisticsOrder checkLogOrder(OrderCirculateTakingQueryParam param) {
|
|
|
KwtLogisticsOrder logOrder = logisticsOrderRepository.queryByLogOrderIdAndStatus(param.getLogOrderId(), LogisticsOrderV1Enum.IN_TRANSIT.getCode());
|
|
KwtLogisticsOrder logOrder = logisticsOrderRepository.queryByLogOrderIdAndStatus(param.getLogOrderId(), LogisticsOrderV1Enum.IN_TRANSIT.getCode());
|
|
|
- if (logOrder == null) {
|
|
|
|
|
|
|
+ if (logOrder == null || logOrder.getEndTime().isBefore(LocalDateTime.now())) {
|
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.LOGISTICS_ORDER_STATUS_ERROR, "物流订单非可接单状态");
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.LOGISTICS_ORDER_STATUS_ERROR, "物流订单非可接单状态");
|
|
|
}
|
|
}
|
|
|
return logOrder;
|
|
return logOrder;
|