Merge remote-tracking branch 'origin/master'

# Conflicts:
#	UPGRADE_2.x.md

src/Bargain/Enum/BargainEnum.php

@@ -21,6 +21,6 @@ class BargainEnum
     const PAY_EXCEPTION = 3;
     const PAY_EXCEPTION = 3;
     const PAY_REFUND = 4;   // 退款
     const PAY_REFUND = 4;   // 退款
     const PAY_CLOSE = 5;   // 订单关闭
     const PAY_CLOSE = 5;   // 订单关闭
-    
+    const ORDER_DELELTED = 6; //订单删除
 
 
 }
 }
\ No newline at end of file