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

interface.ini

@@ -28,7 +28,7 @@ service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLif
 service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend.jwshq.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/getUserWXBindingInfo"
-
+service.jw_user.is_subscribe = "https://api.jwshq.cn/api/wx/hulk/hulk/getUserSubscribedShq"
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
@@ -127,6 +127,7 @@ interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_
 interaction.index.ding = "http://interact.int.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interact.int.yidian-inc.com/msg/index/mini"
 interaction.index.is_send = "http://interact.int.yidian-inc.com/msg/index/is_send"
+interaction.index.is_subscribe = "http://interact.int.yidian-inc.com/msg/index/is_subscribe"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -173,6 +174,7 @@ goods.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.int.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.int.yidian-inc.com/goods/ota/delete"
 goods.background.update_ota = "http://goods.int.yidian-inc.com/goods/ota/update"
+goods.background.ota_list_by_ids = "http://goods.int.yidian-inc.com/goods/ota/ota_list_by_ids"
 
 ;分享
 goods.wx.appgc = "https://wx.appgc.cn"
@@ -261,6 +263,8 @@ order.order.old_order_refund = "http://order.int.yidian-inc.com/order/order/old_
 order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/order/old_order_refund_reject"
 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.op_order_list = "http://order.int.yidian-inc.com/order/order/op_order_list"
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
@@ -358,6 +362,7 @@ service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/y
 service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserWXBindingInfo"
+service.jw_user.is_subscribe = "http://test.zhiyueapp.cn/api/wx/hulk/hulk/getUserSubscribedShq"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
 
 
@@ -460,6 +465,7 @@ interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wec
 interaction.index.ding = "http://interaction.test.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.test.yidian-inc.com/msg/index/mini"
 interaction.index.is_send = "http://interaction.test.yidian-inc.com/msg/index/is_send"
+interaction.index.is_subscribe = "http://interaction.test.yidian-inc.com/msg/index/is_subscribe"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -500,6 +506,7 @@ goods.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.test.int.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.test.int.yidian-inc.com/goods/ota/delete"
 goods.background.update_ota = "http://goods.test.int.yidian-inc.com/goods/ota/update"
+goods.background.ota_list_by_ids = "http://goods.test.int.yidian-inc.com/goods/ota/ota_list_by_ids"
 
 ;分享
 goods.wx.appgc = "https://testwx.appgc.cn"
@@ -588,6 +595,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.op_order_list = "http://order.test.yidian-inc.com/order/order/op_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"
@@ -639,7 +650,7 @@ wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wall
 wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 
-;======================== 9000000-dev coupon 微服务接口 ==============================
+;======================== 9000000-prod 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" ;上传用户邀请关系
@@ -748,6 +759,7 @@ interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wech
 interaction.index.ding = "http://interaction.dev.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.dev.yidian-inc.com/msg/index/mini"
 interaction.index.is_send = "http://interaction.dev.yidian-inc.com/msg/index/is_send"
+interaction.index.is_subscribe = "http://interaction.dev.yidian-inc.com/msg/index/is_subscribe"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -790,6 +802,7 @@ goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.dev.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.dev.yidian-inc.com/goods/ota/delete"
 goods.background.update_ota = "http://goods.dev.yidian-inc.com/goods/ota/update"
+goods.background.ota_list_by_ids = "http://goods.dev.yidian-inc.com/goods/ota/ota_list_by_ids"
 
 ;分享
 goods.wx.appgc = "https://testwx.appgc.cn"
@@ -877,10 +890,16 @@ 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.op_order_list = "http://order.dev.yidian-inc.com/order/order/op_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"
@@ -1003,3 +1022,10 @@ coupon.tcc.use_coupon_cancel = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_cou
 [perf-interaction : perf]
 [test-interaction : test]
 [dev-interaction : dev]
+
+; =======================  coupon ==================================================================================
+
+[prod-coupon : prod]
+[perf-coupon : perf]
+[test-coupon : test]
+[dev-coupon : dev]