From b434e12a16f34db04c2b2b4ad41bdc18a8a021b3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 23 Aug 2019 11:59:55 +0800
Subject: [PATCH] 1

---
 third_party/phpcommon                     |  2 +-
 webapp/classes/AddReward.php              | 24 +++++++++++++----------
 webapp/controller/PayController.class.php |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/third_party/phpcommon b/third_party/phpcommon
index 1e3bb4d..7ecf558 160000
--- a/third_party/phpcommon
+++ b/third_party/phpcommon
@@ -1 +1 @@
-Subproject commit 1e3bb4df855f6d11df75545d10b0c2aacea34a06
+Subproject commit 7ecf558df93a2656631782e76c6d35697da72808
diff --git a/webapp/classes/AddReward.php b/webapp/classes/AddReward.php
index cfac515..e2a8bcc 100644
--- a/webapp/classes/AddReward.php
+++ b/webapp/classes/AddReward.php
@@ -84,7 +84,8 @@ class AddReward {
             $item_list = $this->addSkin($it['index'], $item_num, $account_id);
         }
         foreach ($item_list as $item) {
-            switch ($it['type'])
+            $i = $this->getItem($item['itemid']);
+            switch ($i['type'])
             {
             case 1:
                 //添加金币
@@ -92,6 +93,7 @@ class AddReward {
                 break;
             case 2:
                 //添加钻石
+                error_log($item['itemid'], $item['itemnum']);
                 $this->addDiamond($item['itemid'], $item['itemnum'], $account_id);
                 break;
             case 3:
@@ -150,7 +152,7 @@ class AddReward {
         }
         $row = $conn->execQueryOne('SELECT status FROM emoji WHERE accountid=:accountid AND emojiid=:emojiid;',
                                    array(
-                                       ':accountid' => $account_id,
+                                       ':accountid' => $accountid,
                                        ':emojiid' => $itemid,
                                    ));
         if (!$row) {
@@ -158,7 +160,7 @@ class AddReward {
                                      ' VALUES(:account_id, :emojiid, 1, :create_time, :modify_time) ' .
                                      ' ON DUPLICATE KEY UPDATE accountid=:account_id, emojiid=:emojiid, status=1, modify_time=:modify_time;',
                                      array(
-                                         ':account_id' => $account_id,
+                                         ':account_id' => $accountid,
                                          ':emojiid' => $itemid,
                                          ':create_time' => time(),
                                          ':modify_time' => time()
@@ -184,6 +186,8 @@ class AddReward {
     //添加钻石
     protected function addDiamond($item_id, $item_num, $accountid)
     {
+        error_log($item_id);
+        error_log($item_num);
         $conn = $this->getMysql($accountid);
         if (!$conn) {
             phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
@@ -191,12 +195,12 @@ class AddReward {
         }
         $row = $conn->execQueryOne('SELECT diamond_num FROM user WHERE accountid=:accountid;',
                                    array(
-                                       ':accountid' => $account_id
+                                       ':accountid' => $accountid
                                    ));
         $ret = $conn->execScript('UPDATE user SET diamond_num=:diamond_num, modify_time=:modify_time ' .
                                  ' WHERE accountid=:accountid;',
                                  array(
-                                     ':accountid' => $account_id,
+                                     ':accountid' => $accountid,
                                      ':diamond_num' => $item_num + $row['diamond_num'],
                                      ':modify_time' => time()
                                  ));
@@ -214,12 +218,12 @@ class AddReward {
         }
         $row = $conn->execQueryOne('SELECT coin_num FROM user WHERE accountid=:accountid;',
                                     array(
-                                        ':accountid' => $account_id
+                                        ':accountid' => $accountid
                                     ));
         $ret = $conn->execScript('UPDATE user SET coin_num=:coin_num, modify_time=:modify_time ' .
                                  ' WHERE accountid=:accountid;',
                                  array(
-                                     ':accountid' => $account_id,
+                                     ':accountid' => $accountid,
                                      ':coin_num' => $item_num + $row['coin_num'],
                                      ':modify_time' => time()
                                  ));
@@ -237,7 +241,7 @@ class AddReward {
         }
         $rowSkin = $conn->execQueryOne('SELECT fragment_num FROM skin WHERE accountid=:accountid AND fragment_id=:fragment_id;',
                                        array(
-                                           ':accountid' => $account_id,
+                                           ':accountid' => $accountid,
                                            ':fragment_id' => $item_id
                                        ));
         if (!$rowSkin) {
@@ -284,7 +288,7 @@ class AddReward {
         }
         $rowSkin = $conn->execQueryOne('SELECT fragment_num FROM skin WHERE accountid=:accountid AND fragment_id=:fragment_id;',
                                        array(
-                                           ':accountid' => $account_id,
+                                           ':accountid' => $accountid,
                                            ':fragment_id' => $item_id
                                        ));
         if (!$rowSkin) {
@@ -292,7 +296,7 @@ class AddReward {
                                      ' VALUES(:account_id, :skin_id, :skin_status, :fragment_id, 0, 0, 0, :skin_type, 1, 0, 0, :create_time, :modify_time) ' .
                                      ' ON DUPLICATE KEY UPDATE accountid=:account_id, skin_id=:skin_id, skin_status=:skin_status, fragment_id=:fragment_id, fragment_num=0, active_time=0, fragment_status=0, skin_type=:skin_type, skin_level=1, skin_experience_level=0, skin_experience_type=0, modify_time=:modify_time;',
                                      array(
-                                         ':account_id' => $account_id,
+                                         ':account_id' => $accountid,
                                          ':skin_id' => $item_id,
                                          ':skin_status' => 1,
                                          ':fragment_id' => $item_id - 1000,
diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php
index cdb94ed..5250b11 100644
--- a/webapp/controller/PayController.class.php
+++ b/webapp/controller/PayController.class.php
@@ -442,8 +442,8 @@ class PayController{
         }
         $itemid = $_REQUEST['itemid'];
         $itemnum = $_REQUEST['itemnum'];
-        $itemid = 16002;
-        $itemnum = 1;
+        //        $itemid = 16002;
+        //        $itemnum = 1;
 
         $item_meta_table = require('../res/item@item.php');
         $item_meta = getItemConfig($item_meta_table, $itemid);