From b3ec14b825c7b41effd412595f9bfeff2e2bba54 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 26 Aug 2019 17:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=95=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 third_party/phpcommon                         |  2 +-
 webapp/controller/PayController.class.php     | 25 +++++++++++++++++
 .../controller/PayNotifyController.class.php  | 28 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/third_party/phpcommon b/third_party/phpcommon
index 1e3bb4d..e04c7c8 160000
--- a/third_party/phpcommon
+++ b/third_party/phpcommon
@@ -1 +1 @@
-Subproject commit 1e3bb4df855f6d11df75545d10b0c2aacea34a06
+Subproject commit e04c7c832abfe671ac35ba2ea43f24071ff06582
diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php
index 00eeb94..13400e9 100644
--- a/webapp/controller/PayController.class.php
+++ b/webapp/controller/PayController.class.php
@@ -1,5 +1,7 @@
 <?php
 
+require 'phpcommon/tglog.php';
+
 class PayController {
 
     const SCAN_PAY_API_URL = 'https://gwapi.yemadai.com/pay/aggregatePay';
@@ -160,6 +162,29 @@ class PayController {
                                          ':minigame_appid' => $minigame_appid,
                                          ':minigame_accountid' => $minigame_accountid,
                                          ));
+            {
+                $log_params = array(
+                    '#account_id' => $game_account_id,
+                    '#distinct_id' => '',
+                    '#type' => 'track',
+                    '#time' => date("Y-m-d H:i:s"),
+                    '#ip' => phpcommon\getIPv4(),
+                    '#event_name' => 'event_' . 11 . '_' . 40,
+
+                    'properties' => array(
+                        'channel' => $game_channel,
+                        'gameid' => $gameid,
+                        'orderid' => $orderid,
+                        'itemid' => $itemid,
+                        'itemnum' => 1,
+                        'amount' => $real_amount,
+                        'sp_orderid' => (string)$xmlobj->OrderNo,
+                        'minigame_appid' => $minigame_appid,
+                        'minigame_account_id' => $minigame_accountid,
+                    )
+                );
+                phpcommon\TGLog::writeToLog('gamepay', $gameid, $log_params);
+            }
             if (!$ret) {
                 echo json_encode(array(
                     'errcode' => 2,
diff --git a/webapp/controller/PayNotifyController.class.php b/webapp/controller/PayNotifyController.class.php
index b022323..f98c10b 100644
--- a/webapp/controller/PayNotifyController.class.php
+++ b/webapp/controller/PayNotifyController.class.php
@@ -1,5 +1,7 @@
 <?php
 
+require 'phpcommon/tglog.php';
+
 class PayNotifyController {
 
     const PUB_KEY = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2g2T98rLysZAS1pVv2gE/2DOf9+LkHI9oEFVeKvVZKLHMNzEpZkXK+IXJMHpxlMNLStiwuLxLpnvCQQptGbFohqDsHACademc6/t+YVF2FX4F6GIgBuaPDdJwSGAljtU5P3vsCbJpGPXh6QNyKveBAJKILbXem6pPl+J01CMXyQIDAQAB';
@@ -47,13 +49,37 @@ class PayNotifyController {
                               ':createtime' => time()
                           ));
         if ($_REQUEST['Succeed'] == '88') {
-            $row = $conn->execQueryOne('SELECT orderid, accountid, sp_pay_result, status FROM orderinfo ' .
+            $row = $conn->execQueryOne('SELECT orderid, accountid, sp_pay_result, status, channel, '.
+                                       '       gameid, itemid, price '.
+                                       'FROM orderinfo ' .
                                        'WHERE orderid=:orderid;',
                                        array(
                                            'orderid' => $_REQUEST['BillNo']
                                        )
             );
             if ($row) {
+                {
+                    $log_params = array(
+                        '#account_id' => $row['accountid'],
+                        '#distinct_id' => '',
+                        '#type' => 'track',
+                        '#time' => date("Y-m-d H:i:s"),
+                        '#ip' => phpcommon\getIPv4(),
+                        '#event_name' => 'event_' . 11 . '_' . 41,
+
+                        'properties' => array(
+                            'channel' => $row['channel'],
+                            'gameid' => $row['gameid'],
+                            'orderid' => $row['orderid'],
+                            'itemid' => $row['itemid'],
+                            'itemnum' => 1,
+                            'amount' => $row['price'],
+                            'sp_orderid' => $_REQUEST['OrderNo'],
+                            'sp_amount' => $_REQUEST['Amount'],
+                        )
+                    );
+                    phpcommon\TGLog::writeToLog('gamepay', $row['gameid'], $log_params);
+                }
                 if ($row['status'] == 0 && $row['sp_pay_result'] == 0) {
                     $ret = $conn->execScript('INSERT INTO confirmed_order(orderid, status, createtime)' .
                                              'VALUES(:orderid, :status, :createtime);',