update:Set

interface.ini

@@ -28,7 +28,7 @@ service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLif
 service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend.jwshq.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/getUserWXBindingInfo"
-
+service.jw_user.is_subscribe = "https://api.jwshq.cn/api/wx/hulk/hulk/getUserSubscribedShq"
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
@@ -127,6 +127,7 @@ interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_
 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"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -236,7 +237,16 @@ order.order.wx_share_code = "http://order.int.yidian-inc.com/order/order/wx_shar
 order.marketing.marketing_order_list = "http://order.int.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/order_confirm_page"
 
-
+;新订单后台
+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"
+order.order.order_export = "http://order.int.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.int.yidian-inc.com/order/order/print_order_list"
 
 
 ;订单后台
@@ -252,6 +262,10 @@ order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_p
 ;新订单后台
 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"
+order.order.old_order_info = "http://order.int.yidian-inc.com/order/order/old_order_info"
+
 
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.int.yidian-inc.com/tcc/tcc/create_order_try"
@@ -344,6 +358,7 @@ service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/y
 service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserWXBindingInfo"
+service.jw_user.is_subscribe = "http://test.zhiyueapp.cn/api/wx/hulk/hulk/getUserSubscribedShq"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
 
 
@@ -446,6 +461,7 @@ interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wec
 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_subscribe = "http://interaction.test.yidian-inc.com/msg/index/is_subscribe"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -476,16 +492,16 @@ goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/mar
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
 
 ;自提点
-goods.marketing.add_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/add"
-goods.marketing.take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/list"
-goods.marketing.delete_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/delete"
-goods.marketing.get_bind_take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/get_bind_list"
+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.background.add_ota = "http://goods.test.yidian-inc.com/goods/ota/add"
-goods.background.ota_list = "http://goods.test.yidian-inc.com/goods/ota/list"
-goods.background.delete_ota = "http://goods.test.yidian-inc.com/goods/ota/delete"
-goods.background.update_ota = "http://goods.test.yidian-inc.com/goods/ota/update"
+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"
+goods.background.delete_ota = "http://goods.test.int.yidian-inc.com/goods/ota/delete"
+goods.background.update_ota = "http://goods.test.int.yidian-inc.com/goods/ota/update"
 
 ;分享
 goods.wx.appgc = "https://testwx.appgc.cn"
@@ -552,7 +568,16 @@ order.order.wx_share_code = "http://order.test.yidian-inc.com/order/order/wx_sha
 order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
 
-
+;新订单后台
+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"
+order.order.order_export = "http://order.test.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.test.yidian-inc.com/order/order/print_order_list"
 
 ;订单后台
 order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
@@ -565,8 +590,14 @@ order.order.old_order_refund_reject = "http://order.test.yidian-inc.com/order/or
 order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
 
+<<<<<<< HEAD
 ;新订单后台
 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"
+order.order.old_order_info = "http://order.test.yidian-inc.com/order/order/old_order_info"
+>>>>>>> 3b52a28a6486d14cd28a479e2028afacbc8ffcd5
 
 
 ;tcc调order用子项目
@@ -615,7 +646,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"
 
-;======================== 9000000-dev coupon 微服务接口 ==============================
+;======================== 9000000-prod coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
 coupon.wxapp.list_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/list" ;优惠券列表
 coupon.wxapp.save_share_invite_relation = "http://coupon.test.yidian-inc.com/coupon/wxapp/save_share_invite_relation" ;上传用户邀请关系
@@ -724,6 +755,7 @@ interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wech
 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_subscribe = "http://interaction.dev.yidian-inc.com/msg/index/is_subscribe"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -831,6 +863,16 @@ order.order.wx_share_code = "http://order.dev.yidian-inc.com/order/order/wx_shar
 order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/marketing/marketing_order_list"
 order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
 
+;新订单后台
+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"
+order.order.order_export = "http://order.dev.yidian-inc.com/order/order/order_export"
+order.order.order_print = "http://order.dev.yidian-inc.com/order/order/print_order_list"
 
 ;订单后台
 order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"
@@ -843,9 +885,15 @@ order.order.old_order_refund_reject = "http://order.dev.yidian-inc.com/order/ord
 order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
 
+<<<<<<< HEAD
 ;新订单后台
 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"
+order.order.old_order_info = "http://order.dev.yidian-inc.com/order/order/old_order_info"
+>>>>>>> 3b52a28a6486d14cd28a479e2028afacbc8ffcd5
 
 ;tcc调order用子项目
 order.tcc.create_order_try = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_try"
@@ -969,3 +1017,10 @@ coupon.tcc.use_coupon_cancel = "http://coupon.dev.yidian-inc.com/tcc/tcc/use_cou
 [perf-interaction : perf]
 [test-interaction : test]
 [dev-interaction : dev]
+
+; =======================  coupon ==================================================================================
+
+[prod-coupon : prod]
+[perf-coupon : perf]
+[test-coupon : test]
+[dev-coupon : dev]

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