Authored by wujiexiang

解决Null

@@ -142,11 +142,11 @@ public abstract class AbsOrderViewService { @@ -142,11 +142,11 @@ public abstract class AbsOrderViewService {
142 .actor(actor).uid(uid).orderCode(orderCode) 142 .actor(actor).uid(uid).orderCode(orderCode)
143 .orderStatus(orderStatus).createTime(createTime).oa(oa).build(); 143 .orderStatus(orderStatus).createTime(createTime).oa(oa).build();
144 TimeoutWrapper tw = orderTimeoutFactory.create(otctx); 144 TimeoutWrapper tw = orderTimeoutFactory.create(otctx);
145 - if (Objects.nonNull(tw)){ 145 + Integer leftTime = null;
  146 + if (Objects.nonNull(tw)) {
146 timeoutBo = tw.calculateLeftTime(); 147 timeoutBo = tw.calculateLeftTime();
  148 + leftTime = timeoutBo.getLeftTime();
147 } 149 }
148 -  
149 - Integer leftTime = timeoutBo.getLeftTime();  
150 if (leftTime != null && leftTime<0){ 150 if (leftTime != null && leftTime<0){
151 timeoutBo.setLeftTime(0); 151 timeoutBo.setLeftTime(0);
152 } 152 }