add:merge master

bizcode.ini

@@ -7,3 +7,5 @@ order=5000000
 pay=6000000
 account=7000000
 wallet=8000000
+coupon=9000000
+shqc=10000000
\ No newline at end of file

interface.ini

@@ -155,6 +155,9 @@ goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_
 goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_wechat_bind"
 goods.public.take_place_by_goods_sku_ids = "http://goods.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 goods.marketing.tuancan_list = "http://goods.int.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -345,6 +348,23 @@ order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliv
 order.deliverer.plan_down = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down"
 order.deliverer.build_plan = "http://order.int.yidian-inc.com/deliverer/deliverer/build_plan"
 order.deliverer.plan_down_log = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down_log"
+
+
+order.deliverer.activate_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
+order.deliverer.list_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
+order.deliverer.forbidden_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
+
+order.deliverer.jobs.give_app = "http://order.int.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
+order.deliverer.jobs.give_detail_app = "http://order.int.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
+order.deliverer.jobs.take_app = "http://order.int.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
+order.deliverer.jobs.take_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
+order.deliverer.jobs.give_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
+order.deliverer.jobs.activity_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
+order.deliverer.jobs.activity_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
+order.deliverer.jobs.activity_user_change_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
+order.deliverer.jobs.activity_publish_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
+order.deliverer.jobs.activity_build_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
+
 ;======================= 6000000-prod pay微服务接口 ======================= 
 pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
@@ -411,6 +431,14 @@ coupon.tcc.use_coupon_try = "http://coupon.int.yidian-inc.com/tcc/tcc/use_coupon
 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"
 
+;======================== 10000000 shqc 微服务接口 ==============================
+
+;生活圈c端  小鸡游戏  task模块
+shqc.chicken.task.sign_in_list = "http://shqc.int.yidian-inc.com/chicken/task/sign_in_list"
+shqc.chicken.task.do_sign_in = "http://shqc.int.yidian-inc.com/chicken/task/do_sign_in"
+shqc.chicken.task.hour_check_list = "http://shqc.int.yidian-inc.com/chicken/task/hour_check_list"
+shqc.chicken.task.do_hour_check = "http://shqc.int.yidian-inc.com/chicken/task/do_hour_check"
+
 
 ;======================= 7000000-prod account微服务接口 =======================
 account.account.create = "http://account.int.yidian-inc.com/account/account/create"
@@ -567,6 +595,10 @@ goods.public.get_distributor = "http://goods.pre.int.yidian-inc.com/marketing/di
 goods.public.pindan_goods = "http://goods.pre.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.pre.int.yidian-inc.com/user/user/user_wechat_bind"
 goods.public.take_place_by_goods_sku_ids = "http://goods.pre.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
+goods.marketing.tuancan_list = "http://goods.pre.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.pre.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -756,6 +788,21 @@ order.deliverer.plan_down = "http://order.pre.int.yidian-inc.com/deliverer/deliv
 order.deliverer.build_plan = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/build_plan"
 order.deliverer.plan_down_log = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/plan_down_log"
 
+order.deliverer.activate_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
+order.deliverer.list_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
+order.deliverer.forbidden_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
+
+order.deliverer.jobs.give_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
+order.deliverer.jobs.give_detail_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
+order.deliverer.jobs.take_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
+order.deliverer.jobs.take_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
+order.deliverer.jobs.give_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
+order.deliverer.jobs.activity_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
+order.deliverer.jobs.activity_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
+order.deliverer.jobs.activity_user_change_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
+order.deliverer.jobs.activity_publish_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
+order.deliverer.jobs.activity_build_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
+
 ;======================= 6000000-pre pay微服务接口 =======================
 pay.order.pay = "http://pay.pre.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.pre.int.yidian-inc.com/pay/order/refund"
@@ -825,6 +872,14 @@ coupon.tcc.use_coupon_cancel = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use
 account.account.create = "http://account.pre.int.yidian-inc.com/account/account/create"
 account.account.get_account = "http://account.pre.int.yidian-inc.com/account/account/get_account"
 
+;======================== 10000000-pre shqc 微服务接口 ==============================
+;生活圈c端  小鸡游戏  task模块
+shqc.chicken.task.sign_in_list = "http://shqc.pre.int.yidian-inc.com/chicken/task/sign_in_list"
+shqc.chicken.task.do_sign_in = "http://shqc.pre.int.yidian-inc.com/chicken/task/do_sign_in"
+shqc.chicken.task.hour_check_list = "http://shqc.pre.int.yidian-inc.com/chicken/task/hour_check_list"
+shqc.chicken.task.do_hour_check = "http://shqc.pre.int.yidian-inc.com/chicken/task/do_hour_check"
+
+
 [test : common]
 ;======================= 基础服务接口 ======================= 
 ;短信 
@@ -975,6 +1030,9 @@ goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/mar
 goods.marketing.marketing_goods_rate = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_rate"
 goods.marketing.get_marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 goods.marketing.tuancan_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 ;团长
 goods.marketing.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
@@ -1164,6 +1222,22 @@ order.deliverer.list_day_deliverer_conf = "http://order.test.yidian-inc.com/deli
 order.deliverer.plan_down = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down"
 order.deliverer.build_plan = "http://order.test.yidian-inc.com/deliverer/deliverer/build_plan"
 order.deliverer.plan_down_log = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down_log"
+
+order.deliverer.activate_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
+order.deliverer.list_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
+order.deliverer.forbidden_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
+
+order.deliverer.jobs.give_app = "http://order.test.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
+order.deliverer.jobs.give_detail_app = "http://order.test.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
+order.deliverer.jobs.take_app = "http://order.test.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
+order.deliverer.jobs.take_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
+order.deliverer.jobs.give_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
+order.deliverer.jobs.activity_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
+order.deliverer.jobs.activity_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
+order.deliverer.jobs.activity_user_change_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
+order.deliverer.jobs.activity_publish_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
+order.deliverer.jobs.activity_build_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
+
 ;======================= 6000000-test pay微服务接口 ======================= 
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
@@ -1229,11 +1303,18 @@ coupon.tcc.use_coupon_try = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupo
 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"
 
-
 ;======================= 7000000-test account微服务接口 =======================
 account.account.create = "http://account.test.yidian-inc.com/account/account/create"
 account.account.get_account = "http://account.test.yidian-inc.com/account/account/get_account"
 
+;======================== 10000000-test shqc 微服务接口 ==============================
+;生活圈c端  小鸡游戏  task模块
+shqc.chicken.task.sign_in_list = "http://shqc.test.yidian-inc.com/chicken/task/sign_in_list"
+shqc.chicken.task.do_sign_in = "http://shqc.test.yidian-inc.com/chicken/task/do_sign_in"
+shqc.chicken.task.hour_check_list = "http://shqc.test.yidian-inc.com/chicken/task/hour_check_list"
+shqc.chicken.task.do_hour_check = "http://shqc.test.yidian-inc.com/chicken/task/do_hour_check"
+>>>>>>> master
+
 [dev : test : common]
 
 
@@ -1348,6 +1429,9 @@ goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketin
 goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
 goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 goods.marketing.tuancan_list = "http://goods.dev.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;团长
 goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
@@ -1534,6 +1618,22 @@ order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliv
 order.deliverer.plan_down = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down"
 order.deliverer.build_plan = "http://order.dev.yidian-inc.com/deliverer/deliverer/build_plan"
 order.deliverer.plan_down_log = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down_log"
+
+order.deliverer.activate_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
+order.deliverer.list_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
+order.deliverer.forbidden_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
+
+order.deliverer.jobs.give_app = "http://order.dev.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
+order.deliverer.jobs.give_detail_app = "http://order.dev.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
+order.deliverer.jobs.take_app = "http://order.dev.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
+order.deliverer.jobs.take_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
+order.deliverer.jobs.give_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
+order.deliverer.jobs.activity_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
+order.deliverer.jobs.activity_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
+order.deliverer.jobs.activity_user_change_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
+order.deliverer.jobs.activity_publish_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
+order.deliverer.jobs.activity_build_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
+
 ;======================= 6000000-dev pay微服务接口 ======================= 
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
@@ -1599,6 +1699,14 @@ coupon.tcc.use_coupon_try = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_coupon
 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"
 
+;======================== 10000000-dev shqc 微服务接口 ==============================
+
+;生活圈c端  小鸡游戏  task模块
+shqc.chicken.task.sign_in_list = "http://shqc.dev.yidian-inc.com/chicken/task/sign_in_list"
+shqc.chicken.task.do_sign_in = "http://shqc.dev.yidian-inc.com/chicken/task/do_sign_in"
+shqc.chicken.task.hour_check_list = "http://shqc.dev.yidian-inc.com/chicken/task/hour_check_list"
+shqc.chicken.task.do_hour_check = "http://shqc.dev.yidian-inc.com/chicken/task/do_hour_check"
+
 
 ;======================= 7000000-dev account微服务接口 =======================
 account.account.create = "http://account.dev.yidian-inc.com/account/account/create"
@@ -1667,3 +1775,10 @@ account.account.get_account = "http://account.dev.yidian-inc.com/account/account
 [perf-coupon : perf]
 [test-coupon : test]
 [dev-coupon : dev]
+
+; =======================  shqc ==================================================================================
+
+[prod-shqc : prod]
+[perf-shqc : perf]
+[test-shqc : test]
+[dev-shqc : dev]