Authored by chenchao

Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3

... ... @@ -97,14 +97,7 @@ public abstract class AbsOrderViewService {
boolean isBuyer = actor.equals(TabType.BUY);
boolean isSeller = actor.equals(TabType.SELL);
Integer leftTime = null;
int timeout = 0;
if (isBuyer){
timeout = OrderInfo.PAY_TIME_SECOND;
}
if (isSeller){
timeout = OrderInfo.SELLER_PAY_TIMEOUT;
}
int timeout = OrderInfo.PAY_TIME_SECOND;
boolean isFiredCal = (isBuyer && orderStatus == OrderStatus.WAITING_PAY.getCode())
|| (isSeller && orderStatus == SkupStatus.CAN_NOT_SELL.getCode());
if(isFiredCal){
... ...