From 2ddf86ece52c2296226ae1a8c3d90f16d552cab2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 20 Mar 2020 15:06:47 +0800
Subject: [PATCH] 1

---
 webapp/controller/EmojiController.class.php | 2 +-
 webapp/controller/EquipController.class.php | 2 +-
 webapp/controller/RoleController.class.php  | 1 -
 webapp/controller/ShareController.class.php | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/webapp/controller/EmojiController.class.php b/webapp/controller/EmojiController.class.php
index 5621b2c..0bc68a2 100644
--- a/webapp/controller/EmojiController.class.php
+++ b/webapp/controller/EmojiController.class.php
@@ -145,7 +145,7 @@ class EmojiController{
                                                ':modify_time' => time()
                                            ));
             array_push($emoji_list, array(
-                'emoji_id' => $usingemoji_id,
+                'emoji_id' => $id,
                 'emoji_status' => 1
             ));
         }
diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php
index 30d6ca2..65fadc1 100644
--- a/webapp/controller/EquipController.class.php
+++ b/webapp/controller/EquipController.class.php
@@ -233,7 +233,7 @@ class EquipController{
         }
         $conn = $this->getMysql($account_id);
         $equip_id = $_REQUEST['equip_id'];
-        $equip_level = $_REQUEST['equip_level'];
+        //$equip_level = $_REQUEST['equip_level'];
         if (!$conn) {
             phpcommon\sendError(ERR_USER_BASE + 1, '没有这个角色');
             return;
diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php
index 907e4d5..cca9a1e 100644
--- a/webapp/controller/RoleController.class.php
+++ b/webapp/controller/RoleController.class.php
@@ -109,7 +109,6 @@ class RoleController{
             phpcommon\sendError(ERR_USER_BASE + 1, 'session无效');
             return;
         }
-
         $this->updateSwitch($account_id, $switch_id);
 
         $row = $conn->execQueryOne('SELECT * FROM user WHERE accountid=:accountid;',
diff --git a/webapp/controller/ShareController.class.php b/webapp/controller/ShareController.class.php
index e7126cd..953122c 100644
--- a/webapp/controller/ShareController.class.php
+++ b/webapp/controller/ShareController.class.php
@@ -554,7 +554,7 @@ class ShareController{
                 $item_num = $kefu['itemnum'];
             }
             $addreward = new classes\AddReward();
-            $addreward->addReward($item_id, $item_num, $account_id);
+            $addreward->addReward($item_id, $item_num, $account_id, 0);
             array_push($item_list, array(
                 'item_id' => $item_id,
                 'item_num' => $item_num,
@@ -641,7 +641,7 @@ class ShareController{
         foreach ($user_db['kefureward_list'] as $kefureward) {
             //增加奖励
             $addreward = new classes\AddReward();
-            $addreward->addReward($kefureward['item_id'], $kefureward['item_num'] * $times, $account_id);
+            $addreward->addReward($kefureward['item_id'], $kefureward['item_num'] * $times, $account_id, 0);
         }
         $r->del($kefureward_uuid, json_encode($user_db));
         $addreward = new classes\AddReward();