Merge branch 'hotfix_1224_paycancel' into test6.8.4

# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml

@@ -141,7 +141,12 @@ public abstract class AbsOrderViewService {
     }
 
     protected int calLeftTime(int timeout, int creatTime){
-        return timeout - (DateUtil.getCurrentTimeSecond() - creatTime);
+        int payExpire = timeout - (DateUtil.getCurrentTimeSecond() - creatTime);
+        if (payExpire < 0){
+            payExpire = 0;
+        }
+
+        return payExpire;
     }
 
     protected void setPayment(OrderDetailInfo orderDetailInfo, Integer paymentCode){