Ver código fonte

Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

zxhxx 2 anos atrás
pai
commit
e5176d94e6
1 arquivos alterados com 7 adições e 1 exclusões
  1. 7 1
      app/admin/controller/user/User.php

+ 7 - 1
app/admin/controller/user/User.php

@@ -442,6 +442,7 @@ class User extends AuthController
         $f[] = Form::input('card_id', '身份证号', $user->getData('card_id'));
         $f[] = Form::textarea('mark', '用户备注', $user->getData('mark'));
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
+        $f[] = Form::select('spread_uid', '推荐人', (string)$user->getData('spread_uid'))->options(array_merge(['value' => 0, 'label' => '无'], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));
@@ -462,6 +463,7 @@ class User extends AuthController
             ['integration_status', 0],
             ['integration', 0],
             ['status', 0],
+            ['spread_uid', 0],
         ]);
         if (!$uid) return $this->failed('数据不存在');
         $user = UserModel::where('uid', $uid)->find();
@@ -523,6 +525,10 @@ class User extends AuthController
         } else {
             $res2 = true;
         }
+        $res_sp = true;
+        if ($data['spread_uid'] != $user['spread_uid']) {
+            $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid);
+        }
         $edit['status'] = $data['status'];
         $edit['real_name'] = $data['real_name'];
         $edit['phone'] = $data['phone'];
@@ -532,7 +538,7 @@ class User extends AuthController
         $edit['is_promoter'] = $data['is_promoter'];
         if ($edit) $res3 = UserModel::edit($edit, $uid);
         else $res3 = true;
-        if ($res1 && $res2 && $res3) $res = true;
+        if ($res1 && $res2 && $res3 && $res_sp) $res = true;
         else $res = false;
         BaseModel::checkTrans($res);
         if ($res) return Json::successful('修改成功!');