Merge branch 'master' of https://gitlab.yidian-inc.com/bp/yaconf

dictionary

-[trade_type]

interface.ini

@@ -325,8 +325,14 @@ pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
+wallet.account.withdraw = "http://wallet.test.yidian-inc.com/wallet/account/withdraw"
 wallet.account.list = "http://wallet.test.yidian-inc.com/wallet/account/list"
 wallet.account.account_info = "http://wallet.test.yidian-inc.com/wallet/account/account_info"
+wallet.account.third_account_bind = "http://wallet.test.yidian-inc.com/wallet/account/third_account_bind"
+wallet.account.third_account = "http://wallet.test.yidian-inc.com/wallet/account/third_account"
+wallet.account.withdraw_validate = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_validate"
+wallet.account.withdraw_detail = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_detail"
+wallet.account.pingpp_callback = "http://wallet.test.yidian-inc.com/wallet/account/pingpp_callback"
 
 
 ;tcc调goods用子项目
@@ -518,8 +524,14 @@ pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"
+wallet.account.withdraw = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw"
 wallet.account.list = "http://wallet.dev.yidian-inc.com/wallet/account/list"
 wallet.account.account_info = "http://wallet.dev.yidian-inc.com/wallet/account/account_info"
+wallet.account.third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/account/third_account_bind"
+wallet.account.third_account = "http://wallet.dev.yidian-inc.com/wallet/account/third_account"
+wallet.account.withdraw_validate = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_validate"
+wallet.account.withdraw_detail = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_detail"
+wallet.account.pingpp_callback = "http://wallet.dev.yidian-inc.com/wallet/account/pingpp_callback"
 
 ;tcc调goods用子项目
 goods.tcc.place_an_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/place_an_order_try";

pay.ini

+[common]
+;支付订单有效时长
+pay.expire_time         = 1800;
+pay.wechat_rate         = 60;
+pay.wechat_account_id   = 10010;