ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit defad138e46d37d902307b6d001652d0bd26251b 2 parents fd0737bf 133de129

Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3

Inline Side-by-side
Showing 1 changed file with 1 additions and 8 deletions
@@ -97,14 +97,7 @@ public abstract class AbsOrderViewService { @@ -97,14 +97,7 @@ public abstract class AbsOrderViewService {
97 boolean isBuyer = actor.equals(TabType.BUY); 97 boolean isBuyer = actor.equals(TabType.BUY);
98 boolean isSeller = actor.equals(TabType.SELL); 98 boolean isSeller = actor.equals(TabType.SELL);
99 Integer leftTime = null; 99 Integer leftTime = null;
100 - int timeout = 0;  
101 - if (isBuyer){  
102 - timeout = OrderInfo.PAY_TIME_SECOND;  
103 - }  
104 - if (isSeller){  
105 - timeout = OrderInfo.SELLER_PAY_TIMEOUT;  
106 - }  
107 - 100 + int timeout = OrderInfo.PAY_TIME_SECOND;
108 boolean isFiredCal = (isBuyer && orderStatus == OrderStatus.WAITING_PAY.getCode()) 101 boolean isFiredCal = (isBuyer && orderStatus == OrderStatus.WAITING_PAY.getCode())
109 || (isSeller && orderStatus == SkupStatus.CAN_NOT_SELL.getCode()); 102 || (isSeller && orderStatus == SkupStatus.CAN_NOT_SELL.getCode());
110 if(isFiredCal){ 103 if(isFiredCal){