Merge branch 'master' into jielong

interface.ini

@@ -84,6 +84,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.int.yidian-inc.com/lifea
 merchant.recruitinner.update_enterprise = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.int.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.int.yidian-inc.com/authority/authority/add_role"
@@ -163,11 +164,15 @@ goods.marketing.distributor_list = "http://goods.int.yidian-inc.com/marketing/di
 goods.marketing.distributor_code_url = "http://goods.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.int.yidian-inc.com/marketing/takeplace/add"
 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.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
@@ -201,6 +206,10 @@ goods.public.goods_spu_list = "http://goods.int.yidian-inc.com/goods/goods/goods
 goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_goods_sku"
 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.user.wechat_login = "http://goods.int.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.int.yidian-inc.com/user/user/bind_phone"
@@ -217,6 +226,12 @@ goods.tcc.cancel_order_confirm = "http://goods.int.yidian-inc.com/tcc/tcc/cancel
 goods.tcc.cancel_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.take_place_list = "http://goods.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
+
+
 ;======================= 5000000-prod order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.int.yidian-inc.com/order/order/user_order_list"
@@ -240,9 +255,6 @@ order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/or
 
 ;新订单后台
 order.order.order_list = "http://order.int.yidian-inc.com/order/order/order_list"
-order.order.marketing_list = "http://order.int.yidian-inc.com/order/order/marketing_list"
-order.order.goods_list = "http://order.int.yidian-inc.com/order/order/goods_list"
-order.order.sub_shop_list = "http://order.int.yidian-inc.com/order/order/sub_shop_list"
 order.order.order_item_list = "http://order.int.yidian-inc.com/order/order/order_item_list"
 order.order.order_refund = "http://order.int.yidian-inc.com/order/order/order_refund"
 order.order.order_refund_reject = "http://order.int.yidian-inc.com/order/order/order_refund_reject"
@@ -260,8 +272,7 @@ order.order.old_order_refund = "http://order.int.yidian-inc.com/order/order/old_
 order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/order/old_order_refund_reject"
 order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list"
-;新订单后台
-order.order.op_order_list = "http://order.int.yidian-inc.com/order/order/op_order_list"
+ 
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
@@ -313,6 +324,8 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.int.yidian-inc.com/wallet/background/apply_detail"
 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" ;领取优惠券
@@ -419,6 +432,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.test.yidian-inc.com/life
 merchant.recruitinner.update_enterprise = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.test.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.test.yidian-inc.com/authority/authority/add_role"
@@ -458,7 +472,7 @@ interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/ind
 interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/index/syn_account"
-interaction.index.wechat = "http://interaction.test.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.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"
@@ -492,11 +506,14 @@ goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketi
 goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.test.int.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.test.int.yidian-inc.com/marketing/takeplace/add"
 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.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
@@ -532,6 +549,8 @@ goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/d
 goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/user_wechat_bind"
 
+goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
@@ -547,7 +566,10 @@ goods.tcc.cancel_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/cance
 goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.take_place_list = "http://goods.test.int.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
@@ -572,9 +594,6 @@ order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/o
 
 ;新订单后台
 order.order.order_list = "http://order.test.yidian-inc.com/order/order/order_list"
-order.order.marketing_list = "http://order.test.yidian-inc.com/order/order/marketing_list"
-order.order.goods_list = "http://order.test.yidian-inc.com/order/order/goods_list"
-order.order.sub_shop_list = "http://order.test.yidian-inc.com/order/order/sub_shop_list"
 order.order.order_item_list = "http://order.test.yidian-inc.com/order/order/order_item_list"
 order.order.order_refund = "http://order.test.yidian-inc.com/order/order/order_refund"
 order.order.order_refund_reject = "http://order.test.yidian-inc.com/order/order/order_refund_reject"
@@ -593,8 +612,7 @@ order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old
 order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
 
 
-;新订单后台
-order.order.op_order_list = "http://order.test.yidian-inc.com/order/order/op_order_list"
+
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.test.yidian-inc.com/order/order/old_user_order_list"
@@ -646,6 +664,8 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.co
 wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wallet/background/apply_detail"
 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" ;领取优惠券
@@ -713,6 +733,7 @@ merchant.recruitinner.add_enterprise = "http://merchant.dev.yidian-inc.com/lifea
 merchant.recruitinner.update_enterprise = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_enterprise"
 merchant.recruitinner.get_enterprise = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise"
 merchant.recruitinner.get_enterprise_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_enterprise_info"
+merchant.recruitinner.batch_get_enterprise_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/batch_get_enterprise_info"
 merchant.recruitinner.get_life_enter_info = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_life_enter_info"
 merchant.authority.get_role_list = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role = "http://merchant.dev.yidian-inc.com/authority/authority/add_role"
@@ -752,10 +773,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"
 
 
@@ -788,11 +809,16 @@ goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/di
 goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/is_distributor"
 
+goods.marketing.update_marketing_online_status = "http://goods.dev.yidian-inc.com/marketing/marketing/update_marketing_online_status"
+
 ;自提点
 goods.marketing.add_take_place = "http://goods.dev.yidian-inc.com/marketing/takeplace/add"
 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.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
@@ -828,6 +854,7 @@ goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distri
 goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.dev.yidian-inc.com/user/user/user_wechat_bind"
 
+goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
@@ -842,7 +869,10 @@ goods.tcc.cancel_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_ord
 goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-
+;给订单后台用
+goods.marketingfororder.marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/marketing_list"
+goods.marketingfororder.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/goods_list"
+goods.marketingfororder.take_place_list = "http://goods.dev.yidian-inc.com/marketing/marketingfororder/take_place_list"
 
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
@@ -867,9 +897,6 @@ order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/or
 
 ;新订单后台
 order.order.order_list = "http://order.dev.yidian-inc.com/order/order/order_list"
-order.order.marketing_list = "http://order.dev.yidian-inc.com/order/order/marketing_list"
-order.order.goods_list = "http://order.dev.yidian-inc.com/order/order/goods_list"
-order.order.sub_shop_list = "http://order.dev.yidian-inc.com/order/order/sub_shop_list"
 order.order.order_item_list = "http://order.dev.yidian-inc.com/order/order/order_item_list"
 order.order.order_refund = "http://order.dev.yidian-inc.com/order/order/order_refund"
 order.order.order_refund_reject = "http://order.dev.yidian-inc.com/order/order/order_refund_reject"
@@ -888,9 +915,6 @@ order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_
 order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
 
 
-;新订单后台
-order.order.op_order_list = "http://order.dev.yidian-inc.com/order/order/op_order_list"
-
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.dev.yidian-inc.com/order/order/old_user_order_list"
@@ -942,6 +966,8 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.dev.yidian-inc.com/wallet/background/apply_detail"
 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 微服务接口 ==============================
 

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]

redis.ini

@@ -168,3 +168,30 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-coupon : test-coupon : coupon : common]
 
+
+;钱包redis
+[wallet : common]
+
+[prod-wallet : wallet : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18138/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+
+
+[perf-wallet : wallet : common]
+[test-wallet : wallet : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+[dev-wallet : test-wallet : wallet : common]
\ No newline at end of file

request.ini

@@ -4,10 +4,12 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [merchant : common]
 [interaction : common]
 [gateway : common]
+[wallet : common]
 ; 生产环境
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
 [prod-gateway: gateway : common]
+[prod-wallet: wallet : common]
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
@@ -16,7 +18,9 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [test-merchant : prod-merchant : merchant : common]
 [test-interaction : prod-interaction : interaction : common]
 [test-gateway : prod-gateway : gateway : common]
+[test-wallet : prod-wallet : wallet : common]
 ;开发联调测试
 [dev-merchant : prod-merchant : merchant : common]
 [dev-interaction : prod-interaction : interaction : common]
 [dev-gateway : prod-gateway : gateway : common]
+[dev-wallet : prod-wallet : wallet : common]