Merge branch 'colonel' into 'master'

update:优惠券怎敢资金池相关的接口

See merge request bp/yaconf!31

interface.ini

@@ -346,7 +346,7 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-i
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
 
-;======================== 9000000-dev coupon 微服务接口 ==============================
+;======================== 9000000 coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 coupon.wxapp.save_share_invite_relation = "http://coupon.int.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
@@ -358,7 +358,12 @@ coupon.callback.pay = "http://coupon.int.yidian-inc.com/coupon/callback/pay" ;
 coupon.callback.refund = "http://coupon.int.yidian-inc.com/coupon/callback/refund" ;退款成功回调
 coupon.background.cancel = "http://coupon.int.yidian-inc.com/coupon/background/cancel" ;订单取消
 coupon.wxapp.invite_statistics = "http://coupon.int.yidian-inc.com/coupon/wxapp/invite_statistics"
-
+;资金池
+coupon.capitalpool.detail = "http://coupon.int.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
+coupon.capitalpool.fetch_map_capitalpool = "http://coupon.int.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表
+coupon.capitalpool.add_amount = "http://coupon.int.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+;优惠券
+coupon.coupon.grant = "http://coupon.int.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 ;tcc 调用
 coupon.tcc.use_coupon_try = "http://coupon.int.yidian-inc.com/tcc/tcc/use_coupon_try"
 coupon.tcc.use_coupon_confirm = "http://coupon.int.yidian-inc.com/tcc/tcc/use_coupon_confirm"
@@ -706,7 +711,7 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
 
-;======================== 9000000-prod coupon 微服务接口 ==============================
+;======================== 9000000-test coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
@@ -718,7 +723,12 @@ coupon.callback.pay = "http://coupon.test.yidian-inc.com/coupon/callback/pay" ;
 coupon.callback.refund = "http://coupon.test.yidian-inc.com/coupon/callback/refund" ;退款成功回调
 coupon.background.cancel = "http://coupon.test.yidian-inc.com/coupon/background/cancel" ;订单取消
 coupon.wxapp.invite_statistics = "http://coupon.test.yidian-inc.com/coupon/wxapp/invite_statistics"
-
+;资金池
+coupon.capitalpool.detail = "http://coupon.test.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
+coupon.capitalpool.fetch_map_capitalpool = "http://coupon.test.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表
+coupon.capitalpool.add_amount = "http://coupon.test.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+;优惠券
+coupon.coupon.grant = "http://coupon.test.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 
 ;tcc 调用
 coupon.tcc.use_coupon_try = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_try"
@@ -1040,7 +1050,12 @@ coupon.callback.pay = "http://coupon.dev.yidian-inc.com/coupon/callback/pay" ;
 coupon.callback.refund = "http://coupon.dev.yidian-inc.com/coupon/callback/refund" ;退款成功回调
 coupon.background.cancel = "http://coupon.dev.yidian-inc.com/coupon/background/cancel" ;订单取消
 coupon.wxapp.invite_statistics = "http://coupon.dev.yidian-inc.com/coupon/wxapp/invite_statistics"
-
+;资金池
+coupon.capitalpool.detail = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
+coupon.capitalpool.fetch_map_capitalpool = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表
+coupon.capitalpool.add_amount = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+;优惠券
+coupon.coupon.grant = "http://coupon.dev.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 ;tcc 调用
 coupon.tcc.use_coupon_try = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_coupon_try"
 coupon.tcc.use_coupon_confirm = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_coupon_confirm"