Merge branch 'gray' into test6.9.20

@@ -22,7 +22,6 @@ public class FailTradeBillsScanner implements Runnable {
     private final Integer fromCreateTime;
     private Integer fromTradeBillsId = 0;
 
-    private int currentResetTimes;
     private int resetTimes;
 
     private long waitingUtil;
@@ -71,15 +70,11 @@ public class FailTradeBillsScanner implements Runnable {
     }
 
     private void resetRecoverFailTradeBills() {
-        resetTimes++;
         fromTradeBillsId = 0;
-        // 等待
-        if (currentResetTimes++ > 1) {
-            currentResetTimes = 0;
+        resetTimes++;
         waitingUtil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);
         log.info("Waiting recover fail trade bills till {}, total reset {} times.", waitingUtil, resetTimes);
     }
-    }
 
     private boolean isWaitingRecoverFailTradeBills() {
         return System.currentTimeMillis() < waitingUtil;