From 3c28297fdd028e24db6f7ebde3d8fce1f5b4cd85 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 30 Mar 2019 13:41:13 +0800 Subject: [PATCH] 1 --- server/payserver/app.cc | 2 +- server/payserver/ordermgr.cc | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/payserver/app.cc b/server/payserver/app.cc index 8aae76d..f773dc9 100644 --- a/server/payserver/app.cc +++ b/server/payserver/app.cc @@ -265,7 +265,7 @@ bool App::HasTask() return true; } } - return false; + return OrderMgr::Instance()->HasTask(); } void App::DispatchMsg() diff --git a/server/payserver/ordermgr.cc b/server/payserver/ordermgr.cc index 48ed9c4..3fcaa34 100644 --- a/server/payserver/ordermgr.cc +++ b/server/payserver/ordermgr.cc @@ -8,9 +8,6 @@ #include "framework/cpp/utils.h" #include "framework/cpp/httpclientpool.h" #include -#if 0 -#include "DBSListener.h" -#endif struct AddOrderNode { @@ -279,6 +276,7 @@ int OrderMgr::AddReissue(const std::string& orderid) bool OrderMgr::WaitForReissueFinished(int seqid, int& result, int seconds) { + return false; } bool OrderMgr::WaitForPayNotifyFinished(int seqid, int& result, int seconds) @@ -411,7 +409,9 @@ int OrderMgr::ProcOrderNotify(PayNotifyNode* node) return 4; } - #if 0 + #if 1 + return 0; + #else int ret = query_->ExecQuery("SELECT orderid, itemid, roleid, rolename, price, sp_pay_result, serverid " "FROM orderinfo WHERE orderid='%s' and sp_confirm_time=0;", { node->orderid}); @@ -476,7 +476,9 @@ int OrderMgr::ContinueSubscriptions(PayNotifyNode* node) int OrderMgr::ProcIosPayOrderNotify(PayNotifyNode* node) { - #if 0 + #if 1 + return 0; + #else Template::RechargeCard *cardtpl = g_configtable->GetRechargeCard(node->itemid); if (!cardtpl) { return 4;