- refactor

- load pending orders, fixed bug.
2018-07-22 00:19:38 +08:00
parent b9e59e1197
commit 77c1dd07b5
18 changed files with 168 additions and 145 deletions
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -84,10 +84,10 @@ func GetUniversalOrderIDFromOrderStatus(status *model.OrderStatus) string {
 	return ComposeUniversalOrderID(status.VendorOrderID, status.VendorID)
 }

-func GetRealTimeout(beginTime time.Time, timeout time.Duration) time.Duration {
+func GetRealTimeout(beginTime time.Time, timeout time.Duration, minTimeout time.Duration) time.Duration {
 	retVal := beginTime.Add(timeout).Sub(time.Now())
-	if retVal < 0 {
-		retVal = 0
+	if retVal < minTimeout {
+		retVal = minTimeout
 	}
 	return retVal
 }