From 171be7b4f2ddb8f627eb37b7a5459e463522f52f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 30 Mar 2019 13:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/payserver/handlermgr.cc | 64 ----------------------------------
 1 file changed, 64 deletions(-)

diff --git a/server/payserver/handlermgr.cc b/server/payserver/handlermgr.cc
index 12ff6dd..d625068 100644
--- a/server/payserver/handlermgr.cc
+++ b/server/payserver/handlermgr.cc
@@ -18,43 +18,6 @@ static void _GMPayGetOrderId(f8::JsonHttpRequest* request)
 {
     int errcode = 0;
     std::string errmsg = "";
-    #if 0
-    int seqid = OrderMgr::Instance()->AddOrder(
-                                               "",
-                                               request->request.Get("accountid").GetString(),
-                                               request->request.Get("roleid").GetString(),
-                                               request->request.Get("rolename").GetString(),
-                                               "",
-                                               "",
-                                               0,
-                                               request->request.Get("itemid").GetInt(),
-                                               request->request.Get("price").GetInt(),
-                                               request->request.Get("sp_orderid").GetString()
-                                               );
-    AddOrderResult addresult;
-    if (OrderMgr::Instance()->WaitForAddOrderFinished(seqid, addresult, 20)) {
-        if (addresult.isok) {
-            request->resp_xobj->SetVal("orderid", addresult.orderinfo.orderid);
-            request->resp_xobj->SetVal("itemid", addresult.orderinfo.itemid);
-            request->resp_xobj->SetVal("price", addresult.orderinfo.price);
-            request->resp_xobj->SetVal("roleid", addresult.orderinfo.roleid);
-            request->resp_xobj->SetVal("channel", addresult.orderinfo.channel);
-            #if 0
-            request->resp_xobj->SetVal("PartnerUserID", addresult.orderinfo.sp_accountid);
-            request->resp_xobj->SetVal("PrivateInfo", "");
-            request->resp_xobj->SetVal("ProductName", addresult.orderinfo.itemname);
-            request->resp_xobj->SetVal("ProductMemo", addresult.orderinfo.itemmemo);
-            request->resp_xobj->SetVal("Channel", addresult.orderinfo.channel);
-            #endif
-        } else {
-            errcode = 1;
-            errmsg = "道具id不存在";
-        }
-    } else {
-        errcode = 2;
-        errmsg = "Fail";
-    }
-    #endif
     OrderInfo orderinfo;
     if (OrderMgr::Instance()->AddNewOrder(
                                           request->request.Get("accountid").GetString(),
@@ -84,33 +47,6 @@ static void _GMPayNotify(f8::JsonHttpRequest* request)
 {
     int errcode = 0;
     std::string errmsg = "";
-    #if 0
-    int seqid = OrderMgr::Instance()->AddPayNotify(
-                                         request->request.Get("pay_type").GetInt(),
-                                         request->request.Get("accountid").GetString(),
-                                         request->request.Get("roleid").GetString(),
-                                         request->request.Get("rolename").GetString(),
-                                         0,
-                                         request->request.Get("itemid").GetInt(),
-                                         "",
-                                         request->request.Get("orderid").GetString(),
-                                         request->request.Get("sp_orderid").GetString(),
-                                         request->request.Get("fee").GetDouble(),
-                                         request->request.Get("payresult").GetInt()
-                                         );
-    int result = 1;
-    if (OrderMgr::Instance()->WaitForPayNotifyFinished(seqid, result, 20)) {
-        if (result == 0) {
-
-        } else {
-            errcode = 1;
-            errmsg = "failed";
-        }
-    } else {
-        errcode = 2;
-        errmsg = "failed";
-    }
-    #endif
     int result = 1;
     OrderMgr::Instance()->AddNewPayNotify(
                                           request->request.Get("pay_type").GetInt(),