update: 处理冲突

interface.ini

@@ -171,6 +171,9 @@ goods.marketing.add_take_place = "http://goods.int.yidian-inc.com/marketing/take
 goods.marketing.take_place_list = "http://goods.int.yidian-inc.com/marketing/takeplace/list"
 goods.marketing.delete_take_place = "http://goods.int.yidian-inc.com/marketing/takeplace/delete"
 goods.marketing.get_bind_take_place_list = "http://goods.int.yidian-inc.com/marketing/takeplace/get_bind_list"
+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.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
@@ -252,6 +255,8 @@ order.marketing.marketing_order_list = "http://order.int.yidian-inc.com/order/ma
 order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/order_confirm_page"
 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_list = "http://order.int.yidian-inc.com/order/order/order_list"
@@ -325,6 +330,7 @@ wallet.withdrawbackground.apply_detail = "http://wallet.int.yidian-inc.com/walle
 wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
 wallet.withdrawbackground.account_list = "http://wallet.int.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -474,7 +480,7 @@ interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/i
 interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wechat_msg"
 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_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"
 
 
@@ -512,6 +518,8 @@ goods.marketing.add_take_place = "http://goods.test.int.yidian-inc.com/marketing
 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.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.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
@@ -591,6 +599,7 @@ order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/m
 order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
 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_list = "http://order.test.yidian-inc.com/order/order/order_list"
@@ -665,6 +674,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"
 wallet.withdrawbackground.account_list = "http://wallet.test.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-prod coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -772,10 +782,10 @@ interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/inde
 interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interaction.dev.yidian-inc.com/follow/index/syn_account"
-interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wechat_msg"
+interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_msg"
 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_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"
 
 
@@ -815,6 +825,10 @@ goods.marketing.add_take_place = "http://goods.dev.yidian-inc.com/marketing/take
 goods.marketing.take_place_list = "http://goods.dev.yidian-inc.com/marketing/takeplace/list"
 goods.marketing.delete_take_place = "http://goods.dev.yidian-inc.com/marketing/takeplace/delete"
 goods.marketing.get_bind_take_place_list = "http://goods.dev.yidian-inc.com/marketing/takeplace/get_bind_list"
+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.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
@@ -892,6 +906,7 @@ order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/ma
 order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
 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_list = "http://order.dev.yidian-inc.com/order/order/order_list"
@@ -965,6 +980,7 @@ wallet.withdrawbackground.apply_detail = "http://wallet.dev.yidian-inc.com/walle
 wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
 wallet.withdrawbackground.account_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_list"
+wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_record_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

lifeaccount.ini

+[common]
+
+
+; 生产环境
+[prod : common ]
+
+life_account_id  =  "19019625839230981"
+
+; 预发环境
+[perf : common]
+
+life_account_id  =  "17963416161910792"
+
+
+;测试环境
+[test : common]
+
+life_account_id  =  "15559498695737346"
+
+;开发环境
+[dev : common]
+
+life_account_id  =  "13076446786650120"
+
+;order 调用 生活号
+[prod-order : prod : common]
+[perf-order : perf : common]
+[test-order : test : common]
+[dev-order : dev : common]
+
+
+;goods 调用 生活号
+[prod-goods : prod : common]
+[perf-goods : perf : common]
+[test-goods : test : common]
+[dev-goods : dev : common]
+
+
+
+

mysql.ini

@@ -472,14 +472,14 @@ wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.
 
 ; 生产环境
 [prod-coupon : coupon : common]
-wallet.database_type='mysql'
-wallet.database_name='coupon'
-wallet.connect_timeout=2
-wallet.username=''
-wallet.password=''
-wallet.charset='utf8mb4'
-wallet.write.host=''
-wallet.read.host=''
+coupon.database_type='mysql'
+coupon.database_name='coupon'
+coupon.connect_timeout=2
+coupon.username='bp_coupon_rw'
+coupon.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+coupon.charset='utf8mb4'
+coupon.write.host='w.bp_coupon.int.yidian-inc.com:3306'
+coupon.read.host='r.bp_coupon_1.int.yidian-inc.com:3306,r.bp_coupon_2.int.yidian-inc.com:3306'
 
 ; 预发环境
 [perf-coupon : prod-coupon : wallet : common]