From 18eab33091a93738c1a8bf7196ed48491ad17ce5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 20 Jan 2020 10:17:44 +0800
Subject: [PATCH] 1

---
 .../rankserver/__pycache__/app.cpython-36.pyc | Bin 8028 -> 8033 bytes
 webapp/controller/RoleController.class.php    |  36 +++++++++---------
 webapp/controller/ShareController.class.php   |  16 ++++++--
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/tools/rankserver/__pycache__/app.cpython-36.pyc b/tools/rankserver/__pycache__/app.cpython-36.pyc
index d3ad398784bbeb76eb52743c3242754246fa3c71..6ae2a253f2d9a515b7929b62ae0c28d15d152592 100644
GIT binary patch
delta 125
zcmca(_t1{hn3tE!$6qlnWh3VbMqkTRy%bX$hE$d;{Vc;&<}9gH?kw(Rh7_}ACXkFI
zgE&Kqd5TdBLo*X2NR@h)5m4MhlA)Oq$~SIiU}Q*P3}(=@+We1klN5WV4kH6YQTk*9
TS>4G`WXze0Og2l%x-bC%*TNr4

delta 114
zcmaE8cgK#?n3tEU$yYHhX(Q(fMqi6my%ZB0hE$d;{Vc;&<}9gH?kw(Rh7{9gCXkFI
zgE&KqS&C5$Lo*X2NR@h)5m4M*lA)Oq$~SIiU}Q*P3}(=@-29JmlN5823B%;gG8vl{
HWF46RrsN#>

diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php
index 7bc881c..c47c1e8 100644
--- a/webapp/controller/RoleController.class.php
+++ b/webapp/controller/RoleController.class.php
@@ -168,23 +168,25 @@ class RoleController{
                 die();
                 return;
             }
-            if ($user_name != $row['user_name']) {
-                $ret = $conn->execScript('UPDATE user SET user_name=:user_name, modify_time=:modify_time ' .
-                                         ' WHERE accountid=:accountid;',
-                                         array(
-                                             ':accountid' => $account_id,
-                                             ':user_name' => $user_name,
-                                             ':modify_time' => time()
-                                         ));
-            }
-            if ($avatar_url != $row['avatar_url']) {
-                $ret = $conn->execScript('UPDATE user SET avatar_url=:avatar_url, modify_time=:modify_time ' .
-                                         ' WHERE accountid=:accountid;',
-                                         array(
-                                             ':accountid' => $account_id,
-                                             ':avatar_url' => $avatar_url,
-                                             ':modify_time' => time()
-                                         ));
+            if ($avatar_url != '') {
+                if ($user_name != $row['user_name']) {
+                    $ret = $conn->execScript('UPDATE user SET user_name=:user_name, modify_time=:modify_time ' .
+                                             ' WHERE accountid=:accountid;',
+                                             array(
+                                                 ':accountid' => $account_id,
+                                                 ':user_name' => $user_name,
+                                                 ':modify_time' => time()
+                                             ));
+                }
+                if ($avatar_url != $row['avatar_url']) {
+                    $ret = $conn->execScript('UPDATE user SET avatar_url=:avatar_url, modify_time=:modify_time ' .
+                                             ' WHERE accountid=:accountid;',
+                                             array(
+                                                 ':accountid' => $account_id,
+                                                 ':avatar_url' => $avatar_url,
+                                                 ':modify_time' => time()
+                                             ));
+                }
             }
             $nowTime = phpcommon\getdayseconds(time());
             $daily_first_login = $row['daily_first_login'];
diff --git a/webapp/controller/ShareController.class.php b/webapp/controller/ShareController.class.php
index 70b418e..610cf2c 100644
--- a/webapp/controller/ShareController.class.php
+++ b/webapp/controller/ShareController.class.php
@@ -385,14 +385,20 @@ class ShareController{
             return;
         }
         $item_list = array();
+        $addreward = new classes\AddReward();
         if ($ach_id != 6) {
             $array = $this->getExplode($sh['rewards']);
             array_push($item_list, array(
                 'item_id' => $array[0][0],
                 'item_num' => $array[0][1],
             ));
-            $addreward = new classes\AddReward();
             $addreward->addReward($array[0][0], $array[0][1], $account_id);
+        } else if ($ach_id == 6) {
+            array_push($item_list, array(
+                'item_id' => 10003,
+                'item_num' => 50,
+            ));
+            $addreward->addReward(10003, 50, $account_id);
         }
         //更新状态
         $ret = $conn->execScript('UPDATE share_achievement SET status=1, modify_time=:modify_time ' .
@@ -454,11 +460,15 @@ class ShareController{
             phpcommon\sendError(ERR_USER_BASE + 4, '未达到人数要求');
             return;
         }
-        $array = $this->getExplode($sh['rewards']);
         $p = $this->getParameter(REWARD_TIMES);
         $times = $p['param_value'] - 1;
         $addreward = new classes\AddReward();
-        $addreward->addReward($array[0][0], $array[0][1] * $times, $account_id);
+        if ($ach_id != 6) {
+            $array = $this->getExplode($sh['rewards']);
+            $addreward->addReward($array[0][0], $array[0][1] * $times, $account_id);
+        } else if ($ach_id == 6) {
+            $addreward->addReward(10003, 50 * $times, $account_id);
+        }
         echo json_encode(array(
             'errcode' => 0,
             'errmsg' => '',