fixbug null exception

@@ -11,3 +11,4 @@ MANIFEST.MF
 deploy/.gitignore
 deploy/.gitignore
 product/.gitignore
 product/.gitignore
 */.factorypath
 */.factorypath
+.vscode/

@@ -356,14 +356,10 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
             }
             }
         }
         }
 
 
-        TimeoutBo timeoutBo = calcTimeout(buyerOrder, orderStatus, tabType, orderListInfo.getBidDepositInfo());
+        Optional<TimeoutBo> timeoutBo = Optional.ofNullable(calcTimeout(buyerOrder, orderStatus, tabType, orderListInfo.getBidDepositInfo()));
         // 当订单状态是待付款, 显示leftTime
         // 当订单状态是待付款, 显示leftTime
-//        OrderAttributes oa = OrderAttributes.getOrderAttributes(oac);
-//        TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode,
-//                buyerOrder.getStatus(), buyerOrder.getCreateTime(), oa);
-        Integer leftTime = Optional.ofNullable(timeoutBo).map(TimeoutBo::getLeftTime).orElse(null);
-        orderListInfo.setLeftTime(leftTime);
-        orderListInfo.setTimeLimit(timeoutBo.getTimelimit());
+        orderListInfo.setLeftTime(timeoutBo.map(TimeoutBo::getLeftTime).orElse(null));
+        orderListInfo.setTimeLimit(timeoutBo.map(TimeoutBo::getTimelimit).orElse(null));
 
 
         BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMap.get(buyerOrder.getOrderCode());
         BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMap.get(buyerOrder.getOrderCode());
         if (buyerOrderGoods == null){
         if (buyerOrderGoods == null){