用户修改地理位置

application/api/controller/User.php

@@ -501,6 +501,15 @@ class User extends Api
         $provincename   && $data['provincename'] = $provincename;
         $plat_unique_id && $data['plat_unique_id'] = $plat_unique_id;
 
+        //传入了城市，但是没传入省，直接省名改空
+        if(isset($data['cityname']) && !isset($data['provincename'])){
+            $data['provincename'] = '';
+        }
+        //没传入城市，但是传入省，直接城市名改空
+        if(!isset($data['cityname']) && isset($data['provincename'])){
+            $data['cityname'] = '';
+        }
+
         if(!empty($data)){
             Db::name('user')->where('id',$this->auth->id)->update($data);
         }

application/api/controller/Userintro.php

@@ -134,9 +134,9 @@ class Userintro extends Api
         //总邀请人数
         $intro_num_all      = Db::name('user')->where('intro_uid',$this->auth->id)->count();
         //本周奖励
-        $money_sum_thisweek = Db::name('user_gold_log')->where(['user_id'=>$this->auth->id,'log_type'=>63,'createtime'=>['BETWEEN',[$thisweek_start,$thisweek_end]]])->sum('change_value');
+        $money_sum_thisweek = Db::name('user_money_log')->where(['user_id'=>$this->auth->id,'log_type'=>63,'createtime'=>['BETWEEN',[$thisweek_start,$thisweek_end]]])->sum('change_value');
         //上周奖励
-        $money_sum_lastweek = Db::name('user_gold_log')->where(['user_id'=>$this->auth->id,'log_type'=>63,'createtime'=>['BETWEEN',[$lastweek_start,$lastweek_end]]])->sum('change_value');
+        $money_sum_lastweek = Db::name('user_money_log')->where(['user_id'=>$this->auth->id,'log_type'=>63,'createtime'=>['BETWEEN',[$lastweek_start,$lastweek_end]]])->sum('change_value');
         //我邀请的人
         $user_list = Db::name('user')->field('id,username,nickname,mobile,avatar,createtime')->where('intro_uid',$this->auth->id)->limit(3)->select();
 

application/common/library/Sms.php

@@ -36,7 +36,7 @@ class Sms
         where(['mobile' => $mobile, 'event' => $event])
             ->order('id', 'DESC')
             ->find();
-        Hook::listen('sms_get', $sms, null, true);
+        //Hook::listen('sms_get', $sms, null, true);
         return $sms ? $sms : null;
     }
 
@@ -138,8 +138,9 @@ class Sms
                     $sms->save();
                     return false;
                 } else {
-                    $result = Hook::listen('sms_check', $sms, null, true);
-                    return $result;
+                    return true;
+                    /*$result = Hook::listen('sms_check', $sms, null, true);
+                    return $result;*/
                 }
             } else {
                 // 过期则清空该手机验证码
@@ -164,7 +165,7 @@ class Sms
         \app\common\model\Sms::
         where(['mobile' => $mobile, 'event' => $event])
             ->delete();
-        Hook::listen('sms_flush');
+        //Hook::listen('sms_flush');
         return true;
     }
 }