增加设置线下通知状态

application/api/controller/User.php

@@ -533,12 +533,29 @@ class User extends Api
 
         if ((!$province || !$city || !$district) && $age < 3 && !$income) $this->error('年龄太小了哦！');
 
-        $province && $user->province = $province;
-        $city && $user->city = $city;
-        $district && $user->district = $district;
-        $province && $user->province_name = \app\common\model\Area::getNameFromId($province);
-        $city && $user->city_name = \app\common\model\Area::getNameFromId($city);
-        $district && $user->district_name = \app\common\model\Area::getNameFromId($district);
+        if ($province && $city && $district) {
+            $province = substr($province, 0, 2);
+            $province_info = Db::name('area')->where(['name' => ['like', $province . '%'], 'pid' => 0])->find();
+            $user->province = $province_info['id'];
+            $user->province_name = $province_info['name'];
+
+            $city = substr($city, 0, 2);
+            $city_info = Db::name('area')->where(['name' => ['like', $city . '%'], 'pid' => $province_info['id']])->find();
+            $user->city = $city_info['id'];
+            $user->city_name = $city_info['name'];
+
+            $district = substr($district, 0, 2);
+            $district_info = Db::name('area')->where(['name' => ['like', $district . '%'], 'pid' => $city_info['id']])->find();
+            $user->district = $district_info['id'];
+            $user->district_name = $district_info['name'];
+        }
+
+//        $province && $user->province = $province;
+//        $city && $user->city = $city;
+//        $district && $user->district = $district;
+//        $province && $user->province_name = \app\common\model\Area::getNameFromId($province);
+//        $city && $user->city_name = \app\common\model\Area::getNameFromId($city);
+//        $district && $user->district_name = \app\common\model\Area::getNameFromId($district);
         $age >= 3 && $user->age = $age;
         $constellation && $user->constellation = $constellation;
         $birthday && $user->birthday = $birthday;
@@ -1003,7 +1020,7 @@ class User extends Api
 //
 //        if(!$userInfo){
             // 获取用户信息
-            $field = 'id,avatar,avatar_auth,gender,nickname,nickname_auth,is_goddess,is_auth,vipStatus(vip_duetime) as is_vip,vip_duetime,age,city_name,district_name,constellation,hobby_ids,expect_ids,profession,declaration,declaration_auth,money,wechat,wechat_auth,pre_user_id,copy_mobile,mobile,is_auth_person,diamond';
+            $field = 'id,avatar,avatar_auth,gender,nickname,nickname_auth,is_goddess,is_auth,vipStatus(vip_duetime) as is_vip,vip_duetime,age,city_name,district_name,constellation,hobby_ids,expect_ids,profession,declaration,declaration_auth,money,wechat,wechat_auth,pre_user_id,copy_mobile,mobile,is_auth_person,diamond,offline_notice';
             $userInfo = \app\common\model\User::field($field)->where(['id'=>$user_id])->find();
             $userInfo['vip_duetime'] = $userInfo['vip_duetime']?date('Y-m-d',$userInfo['vip_duetime']):"";
             if($userInfo['pre_user_id']>0) {
@@ -1621,4 +1638,16 @@ class User extends Api
             }
         }
     }
+
+    //设置线下通知状态
+    public function setofflinenotice() {
+        $status = $this->auth->offline_notice == 1 ? 2 : 1;
+
+        $rs = Db::name('user')->where(['id' => $this->auth->id, 'offline_notice' => $this->auth->offline_notice])->setField('offline_notice', $status);
+        if (!$rs) {
+            $this->error('设置失败');
+        }
+
+        $this->success('设置成功', $status);
+    }
 }