Merge branch 'dev-pay' into test6.9.13

@@ -47,13 +47,12 @@ public abstract class AbsOrderAutoCancelDelayMsgConsumer implements YhConsumer {
 				return;
 			}
 			mqConsumerLog.warn("handle {} message fail, message is {} ",topic, message, serviceEx);
-			//TODO find where is ORDER_CANCEL_FAILED_NOT_FIT_TIME used
         	if(serviceEx.getServiceError() == ServiceError.ORDER_CANCEL_FAILED_NOT_FIT_TIME) {
         		autoCancelOrderRetry(orderCancelEvent);
         	}
         } catch ( Exception e ) {
-
 	    	mqConsumerLog.warn("handle {} message fail, message is {} ",topic, message, e);
+			autoCancelOrderRetry(orderCancelEvent);
 	    }
 	}