From c981405d8c86594bf14bdf008716a93365a8e608 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 9 Nov 2020 14:19:23 +0800
Subject: [PATCH] 1

---
 webapp/controller/PayController.class.php | 48 +++++++++++++----------
 webapp/sdkwarpper/BaseSdk.php             | 24 ------------
 2 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php
index 174b6c2..9c9f307 100644
--- a/webapp/controller/PayController.class.php
+++ b/webapp/controller/PayController.class.php
@@ -28,6 +28,27 @@ class PayController {
         }
     }
 
+    public function payNotify()
+    {
+        error_log(json_encode($_REQUEST));
+        $channel = '';
+        if (isset($_REQUEST['_poly_sdk_channel'])) {
+            $channel = $_REQUEST['_poly_sdk_channel'];
+        } else {
+            $channel = $_REQUEST['_channel'];
+        }
+        if (!empty($_REQUEST['_unified_channel'])) {
+            $channel = $_REQUEST['_unified_channel'];
+        }
+        $sdk = sdkwarpper\createSdkByChannel($channel);
+        if (!$sdk) {
+            echo 'is null';
+        } else {
+            $sdk->setChannel($channel);
+            $sdk->payNotify();
+        }
+    }
+
     public function getPendingOrderList()
     {
         if (!phpcommon\isValidSessionId($_REQUEST['account_id'], $_REQUEST['session_id'])) {
@@ -50,29 +71,12 @@ class PayController {
         $order_ctrl->deliver($_REQUEST['account_id'], $_REQUEST['cp_orderid']);
     }
 
-    public function payNotify()
-    {
-        error_log(json_encode($_REQUEST));
-        $channel = '';
-        if (isset($_REQUEST['_poly_sdk_channel'])) {
-            $channel = $_REQUEST['_poly_sdk_channel'];
-        } else {
-            $channel = $_REQUEST['_channel'];
-        }
-        if (!empty($_REQUEST['_unified_channel'])) {
-            $channel = $_REQUEST['_unified_channel'];
-        }
-        $sdk = sdkwarpper\createSdkByChannel($channel);
-        if (!$sdk) {
-            echo 'is null';
-        } else {
-            $sdk->setChannel($channel);
-            $sdk->payNotify();
-        }
-    }
-
     public function queryOrderInfo()
     {
+        if (!phpcommon\isValidSessionId($_REQUEST['account_id'], $_REQUEST['session_id'])) {
+            phpcommon\sendError(1, 'session无效');
+            return;
+        }
         require 'classes/OrderCtrl.php';
         $order_ctrl = new classes\OrderCtrl();
         $order_info = $order_ctrl->getOrder($_REQUEST['cp_orderid']);
@@ -84,7 +88,9 @@ class PayController {
             'errcode' => 0,
             'errmsg' => '',
             'cp_orderid' => $order_info['orderid'],
+            'sp_orderid' => $order_info['sp_orderid'],
             'status' => $order_info['status'],
+            'itemid' => $order_info['itemid'],
         ));
     }
 
diff --git a/webapp/sdkwarpper/BaseSdk.php b/webapp/sdkwarpper/BaseSdk.php
index 19bf55c..cb79662 100644
--- a/webapp/sdkwarpper/BaseSdk.php
+++ b/webapp/sdkwarpper/BaseSdk.php
@@ -21,7 +21,6 @@ class BaseSdk
     function __construct()
     {
         $this->order_ctrl = new classes\OrderCtrl();
-        error_log('basesdk new');
     }
 
     public function setChannel($channel)
@@ -33,31 +32,8 @@ class BaseSdk
     {
     }
 
-    public function getPendingOrderList()
-    {
-    }
-
     public function payNotify()
     {
     }
 
-    public function deliver()
-    {
-    }
-
-    public function queryOrderInfo()
-    {
-        $order_info = $this->order_ctrl->getOrder($_REQUEST['cp_orderid']);
-        if (!$order_info) {
-            phpcommon\sendError(1, '订单不存在');
-            return;
-        }
-        echo json_encode(array(
-            'errcode' => 0,
-            'errmsg' => '',
-            'cp_orderid' => $order_info['cp_orderid'],
-            'status' => $order_info['status'],
-        ));
-    }
-
 }