...
|
...
|
@@ -30,10 +30,7 @@ import org.slf4j.Logger; |
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
...
|
...
|
@@ -357,7 +354,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements |
|
|
// OrderAttributes oa = OrderAttributes.getOrderAttributes(oac);
|
|
|
// TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode,
|
|
|
// buyerOrder.getStatus(), buyerOrder.getCreateTime(), oa);
|
|
|
Integer leftTime = timeoutBo.getLeftTime();
|
|
|
Integer leftTime = Optional.ofNullable(timeoutBo).map(TimeoutBo::getLeftTime).orElse(null);
|
|
|
orderListInfo.setLeftTime(leftTime);
|
|
|
orderListInfo.setTimeLimit(timeoutBo.getTimelimit());
|
|
|
|
...
|
...
|
|