Commit 0a72f6fc authored by 卢洪光's avatar 卢洪光

Merge branch 'feature_coupon' into 'master'

update:增加微信账号下的优惠券转移到账号下

See merge request bp/yaconf!16
parents e554c408 f2f89041
...@@ -290,6 +290,7 @@ coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply ...@@ -290,6 +290,7 @@ 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.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" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.int.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.int.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.int.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.transfer_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
coupon.wxapp.list_newuser_order_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.int.yidian-inc.com/coupon/callback/pay" ;支付成功回调 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.callback.refund = "http://coupon.int.yidian-inc.com/coupon/callback/refund" ;退款成功回调
...@@ -582,6 +583,7 @@ coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/appl ...@@ -582,6 +583,7 @@ coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/appl
coupon.wxapp.list_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表 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" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.test.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.test.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.transfer_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
coupon.wxapp.list_newuser_order_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.test.yidian-inc.com/coupon/callback/pay" ;支付成功回调 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.callback.refund = "http://coupon.test.yidian-inc.com/coupon/callback/refund" ;退款成功回调
...@@ -838,6 +840,7 @@ coupon.wxapp.apply_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply ...@@ -838,6 +840,7 @@ coupon.wxapp.apply_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/apply
coupon.wxapp.list_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表 coupon.wxapp.list_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
coupon.wxapp.save_share_invite_relation = "http://coupon.dev.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系 coupon.wxapp.save_share_invite_relation = "http://coupon.dev.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
coupon.wxapp.get_capital_pool_amount = "http://coupon.dev.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额 coupon.wxapp.get_capital_pool_amount = "http://coupon.dev.yidian-inc.com/coupon/wxapp/get_capital_pool_amount" ;资金池剩余金额
coupon.wxapp.transfer_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/transfer_coupon" ;微信openid领取的优惠券转移到账号下
coupon.wxapp.list_newuser_order_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表 coupon.wxapp.list_newuser_order_coupon = "http://coupon.dev.yidian-inc.com/coupon/wxapp/list_newuser_order_coupon" ;获取新用户下单给老用户带来的优惠券列表
coupon.callback.pay = "http://coupon.dev.yidian-inc.com/coupon/callback/pay" ;支付成功回调 coupon.callback.pay = "http://coupon.dev.yidian-inc.com/coupon/callback/pay" ;支付成功回调
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment