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

interface.ini

@@ -175,6 +175,14 @@ goods.marketing.get_bind_take_place_list = "http://goods.int.yidian-inc.com/mark
 goods.marketing.get_bind_take_place_detail = "http://goods.int.yidian-inc.com/marketing/takeplace/detail"
 goods.marketing.get_take_place_detail_by_ids = "http://goods.int.yidian-inc.com/marketing/takeplace/get_detail_by_ids"
 
+;团长分销
+goods.marketing.colonel.add_config = "http://goods.int.yidian-inc.com/marketing/colonel/add_config"
+goods.marketing.colonel.colonel_config = "http://goods.int.yidian-inc.com/marketing/colonel/colonel_config"
+goods.marketing.colonel.place_order_process_logic = "http://goods.int.yidian-inc.com/marketing/colonel/place_order_process_logic"
+goods.marketing.colonel.refund_order_process_logic = "http://goods.int.yidian-inc.com/marketing/colonel/refund_order_process_logic"
+goods.marketing.colonel.task_control = "http://goods.int.yidian-inc.com/marketing/colonel/task_control"
+goods.marketing.colonel.colonel_index = "http://goods.int.yidian-inc.com/marketing/colonel/colonel_index"
+
 
 ;供应商
 goods.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
@@ -349,6 +357,7 @@ 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" ;订单取消
+coupon.wxapp.invite_statistics = "http://coupon.int.yidian-inc.com/coupon/wxapp/invite_statistics"
 
 ;tcc 调用
 coupon.tcc.use_coupon_try = "http://coupon.int.yidian-inc.com/tcc/tcc/use_coupon_try"
@@ -528,6 +537,14 @@ goods.marketing.get_bind_take_place_list = "http://goods.test.int.yidian-inc.com
 goods.marketing.get_bind_take_place_detail = "http://goods.test.int.yidian-inc.com/marketing/takeplace/detail"
 goods.marketing.get_take_place_detail_by_ids = "http://goods.test.int.yidian-inc.com/marketing/takeplace/get_detail_by_ids"
 
+;团长分销
+goods.marketing.colonel.add_config = "http://goods.test.int.yidian-inc.com/marketing/colonel/add_config"
+goods.marketing.colonel.colonel_config = "http://goods.test.int.yidian-inc.com/marketing/colonel/colonel_config"
+goods.marketing.colonel.place_order_process_logic = "http://goods.test.int.yidian-inc.com/marketing/colonel/place_order_process_logic"
+goods.marketing.colonel.refund_order_process_logic = "http://goods.test.int.yidian-inc.com/marketing/colonel/refund_order_process_logic"
+goods.marketing.colonel.task_control = "http://goods.test.int.yidian-inc.com/marketing/colonel/task_control"
+goods.marketing.colonel.colonel_index = "http://goods.test.int.yidian-inc.com/marketing/colonel/colonel_index"
+
 ;供应商
 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"
@@ -700,6 +717,7 @@ 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" ;订单取消
+coupon.wxapp.invite_statistics = "http://coupon.test.yidian-inc.com/coupon/wxapp/invite_statistics"
 
 
 ;tcc 调用
@@ -842,7 +860,13 @@ goods.marketing.get_bind_take_place_list = "http://goods.dev.yidian-inc.com/mark
 goods.marketing.get_bind_take_place_detail = "http://goods.dev.yidian-inc.com/marketing/takeplace/detail"
 goods.marketing.get_take_place_detail_by_ids = "http://goods.dev.yidian-inc.com/marketing/takeplace/get_detail_by_ids"
 
-
+;团长分销
+goods.marketing.colonel.add_config = "http://goods.dev.yidian-inc.com/marketing/colonel/add_config"
+goods.marketing.colonel.colonel_config = "http://goods.dev.yidian-inc.com/marketing/colonel/colonel_config"
+goods.marketing.colonel.place_order_process_logic = "http://goods.dev.yidian-inc.com/marketing/colonel/place_order_process_logic"
+goods.marketing.colonel.refund_order_process_logic = "http://goods.dev.yidian-inc.com/marketing/colonel/refund_order_process_logic"
+goods.marketing.colonel.task_control = "http://goods.dev.yidian-inc.com/marketing/colonel/task_control"
+goods.marketing.colonel.colonel_index = "http://goods.dev.yidian-inc.com/marketing/colonel/colonel_index"
 
 ;供应商
 goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
@@ -1015,7 +1039,7 @@ 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" ;订单取消
-
+coupon.wxapp.invite_statistics = "http://coupon.dev.yidian-inc.com/coupon/wxapp/invite_statistics"
 
 ;tcc 调用
 coupon.tcc.use_coupon_try = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_coupon_try"

request.ini

@@ -9,7 +9,8 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
 [prod-gateway: gateway : common]
-exclude.url[] = '/merchant/recruitinner/get_enterprise_info'
+exclude.url[] = 'merchant/recruitinner/get_enterprise_info'
+exclude.url[] = 'lifeaccount/recruit/get_enterprise_info'
 
 [prod-wallet: wallet : common]
 

wallet.ini

@@ -8,7 +8,7 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 10;
+withdraw.withdraw_apply_amount = 500;
 ;关闭提现 0 打开 1 关闭
 withdraw.is_closed = 0;
 ;白名单用户