Merge branch 'master' into test

UPGRADE_2.x.md

+# 2.0.31
+- 打款服务添加枚举
+
+# 2.0.30
+- 添加卡券功能
+
 # 2.0.29
 # 2.0.29
 - 添加分销代理者角色
 - 添加分销代理者角色
 
 

src/Order/Enum/PayOriginEnum.php

@@ -9,5 +9,5 @@ class PayOriginEnum
     const CARD = 4;//储值卡支付
     const CARD = 4;//储值卡支付
     const TIMESCARD = 5;//次卡支付
     const TIMESCARD = 5;//次卡支付
     const BUYER_MP = 6;//买家公众号
     const BUYER_MP = 6;//买家公众号
-
+    const QUICKPAY_H5 = 7;// h5页面快速支付
 }
 }
\ No newline at end of file

src/Transfer/Enum/TransferEnum.php

@@ -18,4 +18,6 @@ class TransferEnum
     const ORIGIN_FRONTEND = 1; //前台打款
     const ORIGIN_FRONTEND = 1; //前台打款
 
 
     const ORIGIN_BACKEND = 2; //前台打款
     const ORIGIN_BACKEND = 2; //前台打款
+
+    const ORIGIN_WRWD = 3; //万人万店打款
 }
 }
\ No newline at end of file

src/Transfer/Enum/WxTransferEnum.php

@@ -12,4 +12,6 @@ class WxTransferEnum
     const FRONTEND = 1;
     const FRONTEND = 1;
 
 
     const BACKEND  = 2;
     const BACKEND  = 2;
+
+    const WRWD  = 3;
 }
 }
\ No newline at end of file