Merge branch 'master' into 0807_wangdong_apply_amount

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"
@@ -84,6 +84,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.int.yidian-inc.com/lifea
 merchant.recruitinner.update_enterprise = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.int.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.int.yidian-inc.com/authority/authority/add_role"
@@ -127,6 +128,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 +175,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"
@@ -215,6 +218,12 @@ goods.tcc.cancel_order_confirm = "http://goods.int.yidian-inc.com/tcc/tcc/cancel
 goods.tcc.cancel_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.sub_shop_list = "http://goods.int.yidian-inc.com/order/marketing/marketingfororder/take_place_list"
+
+
 ;======================= 5000000-prod order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.int.yidian-inc.com/order/order/user_order_list"
@@ -236,7 +245,13 @@ order.order.wx_share_code = "http://order.int.yidian-inc.com/order/order/wx_shar
 order.marketing.marketing_order_list = "http://order.int.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/order_confirm_page"
 
-
+;新订单后台
+order.order.order_list = "http://order.int.yidian-inc.com/order/order/order_list"
+order.order.order_item_list = "http://order.int.yidian-inc.com/order/order/order_item_list"
+order.order.order_refund = "http://order.int.yidian-inc.com/order/order/order_refund"
+order.order.order_refund_reject = "http://order.int.yidian-inc.com/order/order/order_refund_reject"
+order.order.order_export = "http://order.int.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.int.yidian-inc.com/order/order/print_order_list"
 
 
 ;订单后台
@@ -249,6 +264,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"
@@ -346,6 +363,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"
 
 
@@ -405,6 +423,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.test.yidian-inc.com/life
 merchant.recruitinner.update_enterprise = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.test.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.test.yidian-inc.com/authority/authority/add_role"
@@ -448,6 +467,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微服务接口 ======================= 
@@ -478,16 +498,17 @@ goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/mar
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
 
 ;自提点
-goods.marketing.add_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/add"
-goods.marketing.take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/list"
-goods.marketing.delete_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/delete"
-goods.marketing.get_bind_take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/get_bind_list"
+goods.marketing.add_take_place = "http://goods.test.int.yidian-inc.com/marketing/takeplace/add"
+goods.marketing.take_place_list = "http://goods.test.int.yidian-inc.com/marketing/takeplace/list"
+goods.marketing.delete_take_place = "http://goods.test.int.yidian-inc.com/marketing/takeplace/delete"
+goods.marketing.get_bind_take_place_list = "http://goods.test.int.yidian-inc.com/marketing/takeplace/get_bind_list"
 
 ;供应商
-goods.background.add_ota = "http://goods.test.yidian-inc.com/goods/ota/add"
-goods.background.ota_list = "http://goods.test.yidian-inc.com/goods/ota/list"
-goods.background.delete_ota = "http://goods.test.yidian-inc.com/goods/ota/delete"
-goods.background.update_ota = "http://goods.test.yidian-inc.com/goods/ota/update"
+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"
@@ -531,7 +552,10 @@ goods.tcc.cancel_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/cance
 goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.sub_shop_list = "http://goods.test.int.yidian-inc.com/order/marketing/marketingfororder/take_place_list"
 
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
@@ -554,7 +578,13 @@ order.order.wx_share_code = "http://order.test.yidian-inc.com/order/order/wx_sha
 order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
 
-
+;新订单后台
+order.order.order_list = "http://order.test.yidian-inc.com/order/order/order_list"
+order.order.order_item_list = "http://order.test.yidian-inc.com/order/order/order_item_list"
+order.order.order_refund = "http://order.test.yidian-inc.com/order/order/order_refund"
+order.order.order_refund_reject = "http://order.test.yidian-inc.com/order/order/order_refund_reject"
+order.order.order_export = "http://order.test.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.test.yidian-inc.com/order/order/print_order_list"
 
 ;订单后台
 order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
@@ -567,6 +597,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"
@@ -618,7 +652,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" ;上传用户邀请关系
@@ -684,6 +718,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.dev.yidian-inc.com/lifea
 merchant.recruitinner.update_enterprise = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.dev.yidian-inc.com/authority/authority/add_role"
@@ -727,6 +762,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微服务接口 ======================= 
@@ -769,6 +805,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"
@@ -811,7 +848,10 @@ goods.tcc.cancel_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_ord
 goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.sub_shop_list = "http://goods.dev.yidian-inc.com/order/marketing/marketingfororder/take_place_list"
 
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
@@ -834,6 +874,13 @@ order.order.wx_share_code = "http://order.dev.yidian-inc.com/order/order/wx_shar
 order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
 
+;新订单后台
+order.order.order_list = "http://order.dev.yidian-inc.com/order/order/order_list"
+order.order.order_item_list = "http://order.dev.yidian-inc.com/order/order/order_item_list"
+order.order.order_refund = "http://order.dev.yidian-inc.com/order/order/order_refund"
+order.order.order_refund_reject = "http://order.dev.yidian-inc.com/order/order/order_refund_reject"
+order.order.order_export = "http://order.dev.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.dev.yidian-inc.com/order/order/print_order_list"
 
 ;订单后台
 order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"
@@ -846,10 +893,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"
@@ -972,3 +1025,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]