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

interface.ini

@@ -129,7 +129,8 @@ 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"
-
+interaction.index.subscribe = "http://interact.int.yidian-inc.com/follow/index/subscribe"
+interaction.index.is_subscribe_account = "http://interact.int.yidian-inc.com/follow/index/is_subscribe_account"
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
 ;门店
@@ -153,6 +154,13 @@ goods.public.get_distributor = "http://goods.int.yidian-inc.com/marketing/distri
 goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_goods"
 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.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"
+
+
 
 
 ;团长
@@ -182,6 +190,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"
@@ -223,6 +233,7 @@ goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_go
 goods.public.goods_spu_shop_list = "http://goods.int.yidian-inc.com/goods/goods/goods_spu_shop_list"
 
 goods.goods.refund = "http://goods.int.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.int.yidian-inc.com/goods/goods/online_site"
 
 
 
@@ -271,6 +282,9 @@ order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/or
 order.order.have_buy_order_statistics = "http://order.int.yidian-inc.com/order/orderitem/have_buy_order_statistics"
 order.order.have_buy_goods_user_count = "http://order.int.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.int.yidian-inc.com/order/Marketing/marketing_sale_count"
+order.order.order_share_coupon = "http://order.int.yidian-inc.com/order/orderitem/order_share_coupon"
+order.marketing.marketing_user = "http://order.int.yidian-inc.com/order/marketing/marketing_user"
+
 
 
 ;新订单后台
@@ -351,6 +365,7 @@ wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/
 wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.int.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000 coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -364,10 +379,13 @@ 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" ;资金池列表
 coupon.capitalpool.add_amount = "http://coupon.int.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+coupon.capitalpool.grant_user_amount = "http://coupon.int.yidian-inc.com/coupon/capitalpool/grant_user_amount" ;资金池授予用户奖励
 ;优惠券
 coupon.coupon.grant = "http://coupon.int.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 ;tcc 调用
@@ -509,7 +527,8 @@ 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://interact.int.yidian-inc.com/msg/index/is_send"
 interaction.index.is_subscribe = "http://interaction.test.yidian-inc.com/msg/index/is_subscribe"
-
+interaction.index.subscribe = "http://interaction.test.yidian-inc.com/follow/index/subscribe"
+interaction.index.is_subscribe_account = "http://interaction.test.yidian-inc.com/follow/index/is_subscribe_account"
 
 ;======================= 4000000-test goods微服务接口 ======================= 
 ;门店
@@ -528,6 +547,7 @@ goods.marketing.generate_share_goods = "http://goods.test.int.yidian-inc.com/mar
 goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_list"
 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.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"
@@ -555,6 +575,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"
@@ -563,6 +585,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"
@@ -599,6 +625,7 @@ goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/
 goods.public.take_place_by_goods_sku_ids = "http://goods.test.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
 goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.test.int.yidian-inc.com/goods/goods/online_site"
 
 
 ;用户绑定
@@ -643,6 +670,11 @@ order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/o
 order.order.have_buy_order_statistics = "http://order.test.yidian-inc.com/order/orderitem/have_buy_order_statistics"
 order.order.have_buy_goods_user_count = "http://order.test.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.test.yidian-inc.com/order/Marketing/marketing_sale_count"
+order.order.order_share_coupon = "http://order.test.yidian-inc.com/order/orderitem/order_share_coupon"
+order.marketing.marketing_user = "http://order.test.yidian-inc.com/order/marketing/marketing_user"
+
+
+
 
 ;新订单后台
 order.order.order_list = "http://order.test.yidian-inc.com/order/order/order_list"
@@ -723,6 +755,7 @@ wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet
 wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.test.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000-test coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -736,10 +769,13 @@ 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" ;资金池列表
 coupon.capitalpool.add_amount = "http://coupon.test.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+coupon.capitalpool.grant_user_amount = "http://coupon.test.yidian-inc.com/coupon/capitalpool/grant_user_amount" ;资金池授予用户奖励
 ;优惠券
 coupon.coupon.grant = "http://coupon.test.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 
@@ -842,7 +878,8 @@ 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://interact.int.yidian-inc.com/msg/index/is_send"
 interaction.index.is_subscribe = "http://interaction.dev.yidian-inc.com/msg/index/is_subscribe"
-
+interaction.index.subscribe = "http://interaction.dev.yidian-inc.com/follow/index/subscribe"
+interaction.index.is_subscribe_account = "http://interaction.dev.yidian-inc.com/follow/index/is_subscribe_account"
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
 ;门店
@@ -862,6 +899,7 @@ goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketin
 goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
 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.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
@@ -890,6 +928,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"
@@ -898,6 +938,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"
@@ -935,6 +979,8 @@ goods.public.take_place_by_goods_sku_ids = "http://goods.dev.yidian-inc.com/good
 
 
 goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.dev.yidian-inc.com/goods/goods/online_site"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
@@ -977,6 +1023,8 @@ order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/or
 order.order.have_buy_order_statistics = "http://order.dev.yidian-inc.com/order/orderitem/have_buy_order_statistics"
 order.order.have_buy_goods_user_count = "http://order.dev.yidian-inc.com/order/orderitem/have_buy_goods_user_count"
 order.order.pindan_data_statistics = "http://order.dev.yidian-inc.com/order/Marketing/marketing_sale_count"
+order.order.order_share_coupon = "http://order.dev.yidian-inc.com/order/orderitem/order_share_coupon"
+order.marketing.marketing_user = "http://order.dev.yidian-inc.com/order/marketing/marketing_user"
 
 ;新订单后台
 order.order.order_list = "http://order.dev.yidian-inc.com/order/order/order_list"
@@ -1056,6 +1104,7 @@ wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/
 wallet.accountbackground.get_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 
@@ -1070,10 +1119,13 @@ 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" ;资金池列表
 coupon.capitalpool.add_amount = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/add_amount" ;资金池添加资金
+coupon.capitalpool.grant_user_amount = "http://coupon.dev.yidian-inc.com/coupon/capitalpool/grant_user_amount" ;资金池授予用户奖励
 ;优惠券
 coupon.coupon.grant = "http://coupon.dev.yidian-inc.com/coupon/coupon/grant" ;优惠券授予用户
 ;tcc 调用

mysql.ini

@@ -83,7 +83,7 @@ fu.write.host='10.136.150.2:3307'
 fu.read.host='10.136.150.2:3307'
 
 ; 预发环境
-[perf-merchant : prod-merchant : merchant : common]
+[perf-interaction : prod-interaction : interaction : common]
 
 ; 测试环境
 [test-interaction : interaction : common]

redis.ini

@@ -67,6 +67,15 @@ cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
 
@@ -84,7 +93,16 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pref-interaction : prod-interaction : interaction : common]
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
+[perf-interaction : prod-interaction : interaction : common]
 
 [test-interaction : interaction : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
@@ -94,9 +112,18 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='igbinary'
+cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-interaction : test-interaction : interaction : common]
 
 

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;
 ;白名单用户