Merge branch 'master' into jielong

interface.ini

@@ -250,6 +250,10 @@ order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/ord
 order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list"
 
+;用户老订单
+order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
+order.order.old_order_info = "http://order.int.yidian-inc.com/order/order/old_order_info"
+
 
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.int.yidian-inc.com/tcc/tcc/create_order_try"
@@ -308,6 +312,14 @@ coupon.callback.deliver_goods = "http://coupon.int.yidian-inc.com/coupon/callbac
 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" ;订单取消
+
+;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"
+coupon.tcc.use_coupon_cancel = "http://coupon.int.yidian-inc.com/tcc/tcc/use_coupon_cancel"
+
+
+
 [perf : prod : common]
 
 
@@ -555,6 +567,10 @@ order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/or
 order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
 
+;用户老订单
+order.order.old_user_order_list = "http://order.test.yidian-inc.com/order/order/old_user_order_list"
+order.order.old_order_info = "http://order.test.yidian-inc.com/order/order/old_order_info"
+
 
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.test.yidian-inc.com/tcc/tcc/create_order_try"
@@ -613,14 +629,23 @@ coupon.callback.deliver_goods = "http://coupon.test.yidian-inc.com/coupon/callba
 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" ;订单取消
+
+
+;tcc 调用
+coupon.tcc.use_coupon_try = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_try"
+coupon.tcc.use_coupon_confirm = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_confirm"
+coupon.tcc.use_coupon_cancel = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_cancel"
+
+
+
 [dev : test : common]
 
 
 ;TCC事务协调器
-service.tcc.try = "http://tcc.dev.yidian-inc.com/tcc/try"
-service.tcc.confirm = "http://tcc.dev.yidian-inc.com/tcc/confirm"
-service.tcc.cancel = "http://tcc.dev.yidian-inc.com/tcc/cancel"
-service.tcc.sync = "http://tcc.dev.yidian-inc.com/tcc/sync"
+service.tcc.try = "http://tcc.test.yidian-inc.com/tcc/try"
+service.tcc.confirm = "http://tcc.test.yidian-inc.com/tcc/confirm"
+service.tcc.cancel = "http://tcc.test.yidian-inc.com/tcc/cancel"
+service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 
 
 ;======================= 1000000-dev gateway微服务接口 ======================= 
@@ -821,6 +846,10 @@ order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/ord
 order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
 
+;用户老订单
+order.order.old_user_order_list = "http://order.dev.yidian-inc.com/order/order/old_user_order_list"
+order.order.old_order_info = "http://order.dev.yidian-inc.com/order/order/old_order_info"
+
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"
 order.tcc.create_order_confirm = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_confirm"
@@ -879,6 +908,14 @@ coupon.callback.deliver_goods = "http://coupon.dev.yidian-inc.com/coupon/callbac
 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" ;订单取消
+
+
+;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"
+coupon.tcc.use_coupon_cancel = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_coupon_cancel"
+
+
 ; =======================  gateway ==================================================================================
 
 [prod-gateway : prod]