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

dictionary

+[trade_type]

dictionary.ini

+[trade_type]
+101="平台抽成"
+102="商品交易"
+103="商户营销补贴"
+104="平台营销补贴"
+105="团长佣金收入"
+106="平台活动补贴"
+201="余额提现"
+301="平台营销补贴"
+302="商品交易"
+303="商品营销补贴"
+304="第三方渠道手续费"
+305="团长佣金收入"
+401="平台营销补贴"
+402="平台活动补贴"
+403="商户营销补贴"
+404="团长佣金收入"
+405="平台抽成"
+406="第三方渠道手续费"
+407="商品交易"
+501="平台营销充值"
+502="商户营销充值"

interface.ini

@@ -263,6 +263,8 @@ goods.marketing.distributor = "http://goods.test.yidian-inc.com/marketing/distri
 goods.marketing.distributor_list = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_list"
 goods.marketing.distributor_code_url = "http://goods.test.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
+goods.wx.appgc = "https://wx.appgc.cn"
+goods.api.jwshq = "http://api.jwshq.cn"
  
 ;商品
 goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -283,6 +285,7 @@ goods.consumer.init_shop = "http://goods.test.int.yidian-inc.com/goods/goods/ini
 
 goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
 goods.public.goods_spu_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_list"
+goods.public.get_goods_sku = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_sku"
 
 
 ;订单
@@ -295,10 +298,16 @@ order.order.pay_order = "http://order.test.yidian-inc.com/order/order/pay_order"
 order.order.pay_order_item = "http://order.test.yidian-inc.com/order/order/pay_order_item"
 order.order.pay_order_info = "http://order.test.yidian-inc.com/order/order/pay_order_info"
 order.order.scanpurchase_userverify = "http://order.test.yidian-inc.com/order/order/scanpurchase_userverify"
+order.order.order_pay_callback = "http://order.test.yidian-inc.com/order/order/order_pay_callback"
+order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/order/order_refund_callback"
+
 
 ;支付
+pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
 pay.order.write_off = "http://pay.test.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.test.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
@@ -440,7 +449,9 @@ goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distrib
 goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
 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.wx.appgc = "https://wx.appgc.cn"
+goods.api.jwshq = "http://api.jwshq.cn"
+ 
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -461,7 +472,7 @@ goods.consumer.init_shop = "http://goods.dev.yidian-inc.com/goods/goods/init_sho
 
 goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
 goods.public.goods_spu_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_list"
-
+goods.public.get_goods_sku = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_sku"
 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -473,11 +484,18 @@ order.order.pay_order = "http://order.dev.yidian-inc.com/order/order/pay_order"
 order.order.pay_order_item = "http://order.dev.yidian-inc.com/order/order/pay_order_item"
 order.order.pay_order_info = "http://order.dev.yidian-inc.com/order/order/pay_order_info"
 order.order.scanpurchase_userverify = "http://order.dev.yidian-inc.com/order/order/scanpurchase_userverify"
+order.order.order_pay_callback = "http://order.dev.yidian-inc.com/order/order/order_pay_callback"
+order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order/order_refund_callback"
+
+
 
 
 ;支付
+pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"
 pay.order.write_off = "http://pay.dev.yidian-inc.com/pay/order/write_off"
+pay.callback.pay = "http://pay.dev.yidian-inc.com/pay/callback/pay"
+pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 
 ;钱包
 wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"

mongo.ini

@@ -7,7 +7,7 @@
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-gateway : gateway : common]
-gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 gateway.uriOptions.username='rs_merchant_rw'
 gateway.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 gateway.uriOptions.replicaSet='rs_bp'
@@ -20,7 +20,7 @@ gateway.driverOptions.typeMap.root='array'
 gateway.driverOptions.typeMap.document='array'
  
 
-xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27017,rs_bp_merchant_02.int.yidian-inc.com:27017,rs_bp_merchant_03.int.yidian-inc.com:27017"
 xhprof.uriOptions.username='rs_merchant_rw'
 xhprof.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
 xhprof.uriOptions.replicaSet='rs_bp'

mysql.ini

@@ -42,8 +42,6 @@ merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
 
-
-
 [interaction : common]
 ; 生产环境
 [prod-interaction : interaction : common]