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

interface.ini

@@ -154,6 +154,10 @@ 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.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 
 
 
@@ -184,6 +188,8 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.int.yidian-inc
 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.marketing.colonel.bill_info = "http://goods.int.yidian-inc.com/marketing/colonel/bill_info"
+goods.marketing.colonel.invite_order_record = "http://goods.int.yidian-inc.com/marketing/colonel/invite_order_record"
 goods.marketing.colonel_apply_list = "http://goods.int.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
 goods.marketing.colonel_list = "http://goods.int.yidian-inc.com/marketing/colonel/manage_colonel_list"
 goods.marketing.colonel_audit = "http://goods.int.yidian-inc.com/marketing/colonel/manage_audit"
@@ -369,6 +375,8 @@ 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"
+coupon.wxapp.invite_look_record = "http://coupon.int.yidian-inc.com/coupon/wxapp/invite_look_record"
+coupon.background.wx_invite_relation_list_by_user_ids = "http://coupon.int.yidian-inc.com/coupon/background/wx_invite_relation_list_by_user_ids"
 ;资金池
 coupon.capitalpool.detail = "http://coupon.int.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
 coupon.capitalpool.fetch_map_capitalpool = "http://coupon.int.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表
@@ -560,6 +568,8 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.test.int.yidia
 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.marketing.colonel.bill_info = "http://goods.test.int.yidian-inc.com/marketing/colonel/bill_info"
+goods.marketing.colonel.invite_order_record = "http://goods.test.int.yidian-inc.com/marketing/colonel/invite_order_record"
 goods.marketing.colonel_apply_list = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
 goods.marketing.colonel_list = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_colonel_list"
 goods.marketing.colonel_audit = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_audit"
@@ -568,6 +578,10 @@ goods.marketing.colonel_add_apply_point = "http://goods.test.int.yidian-inc.com/
 goods.marketing.colonel_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/apply"
 goods.marketing.colonel_is_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/is_apply"
 
+;营销中心
+goods.marketing.yingxiao_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.test.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 ;供应商
 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"
@@ -745,6 +759,8 @@ 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"
+coupon.wxapp.invite_look_record = "http://coupon.test.yidian-inc.com/coupon/wxapp/invite_look_record"
+coupon.background.wx_invite_relation_list_by_user_ids = "http://coupon.test.yidian-inc.com/coupon/background/wx_invite_relation_list_by_user_ids"
 ;资金池
 coupon.capitalpool.detail = "http://coupon.test.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
 coupon.capitalpool.fetch_map_capitalpool = "http://coupon.test.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表
@@ -899,6 +915,8 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.dev.yidian-inc
 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.marketing.colonel.bill_info = "http://goods.dev.yidian-inc.com/marketing/colonel/bill_info"
+goods.marketing.colonel.invite_order_record = "http://goods.dev.yidian-inc.com/marketing/colonel/invite_order_record"
 goods.marketing.colonel_apply_list = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
 goods.marketing.colonel_list = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_colonel_list"
 goods.marketing.colonel_audit = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_audit"
@@ -907,6 +925,10 @@ goods.marketing.colonel_add_apply_point = "http://goods.dev.yidian-inc.com/marke
 goods.marketing.colonel_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/apply"
 goods.marketing.colonel_is_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/is_apply"
 
+;营销中心
+goods.marketing.yingxiao_list = "http://goods.dev.yidian-inc.com/marketing/marketing/yingxiao_list"
+goods.marketing.toogle_yingxiao_online_status = "http://goods.dev.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
+
 ;供应商
 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"
@@ -1083,6 +1105,8 @@ 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"
+coupon.wxapp.invite_look_record = "http://coupon.dev.yidian-inc.com/coupon/wxapp/invite_look_record"
+coupon.background.wx_invite_relation_list_by_user_ids = "http://coupon.dev.yidian-inc.com/coupon/background/wx_invite_relation_list_by_user_ids"
 ;资金池
 coupon.capitalpool.detail = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/detail" ;资金池详情
 coupon.capitalpool.fetch_map_capitalpool = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/fetch_map_capitalpool" ;资金池列表

wallet.ini

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