|
|
@@ -6,6 +6,7 @@ use backend\helpers\ValidatorHelper;
|
|
|
use backend\models\Member;
|
|
|
use backend\models\Mt4Users;
|
|
|
use backend\models\Open;
|
|
|
+use backend\models\UserMember;
|
|
|
use Yii;
|
|
|
|
|
|
class MemberController extends BaseController
|
|
|
@@ -25,10 +26,12 @@ class MemberController extends BaseController
|
|
|
$fields = preg_split('/\s*,\s*/', $fields, -1, PREG_SPLIT_NO_EMPTY);
|
|
|
}
|
|
|
$model = Member::find()->select($fields)->where(['id' => $id])->limit(1)->one();
|
|
|
+ $data = $model->getAttributes();
|
|
|
+ $data['member_id'] = UserMember::find()->select('member_id')->where(['login' => $data['logins']])->limit(1)->one()->member_id;
|
|
|
if ($model == null) {
|
|
|
return $this->outJson(0, [], '用户不存在');
|
|
|
}
|
|
|
- return $this->outJson(1, $model->getAttributes(), 'OK');
|
|
|
+ return $this->outJson(1, $data, 'OK');
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -164,6 +167,13 @@ class MemberController extends BaseController
|
|
|
return $this->outJson(0, [], '用户不存在');
|
|
|
}
|
|
|
$data = Yii::$app->getRequest()->post();
|
|
|
+ if(empty($data['member_id'])){
|
|
|
+ return $this->outJson(0, [], '代理商不存在');
|
|
|
+ }
|
|
|
+ $type = Member::find()->select('type')->where(['id' => $data['member_id']])->one()['type']?:0;
|
|
|
+ if($type < 2){
|
|
|
+ return $this->outJson(0, [], '代理商不存在');
|
|
|
+ }
|
|
|
if(isset($data['password']) && trim($data['password']) != '') {
|
|
|
$data['password'] = $member->hash($data['password']);
|
|
|
} else {
|
|
|
@@ -173,6 +183,12 @@ class MemberController extends BaseController
|
|
|
$transaction = Member::getDb()->beginTransaction();
|
|
|
|
|
|
try {
|
|
|
+ //修改客户上级直属代理
|
|
|
+ if(!empty($data['member_id'])){
|
|
|
+ $userModel = UserMember::find()->where(['login' => $data['logins']])->limit(1)->one();
|
|
|
+ $userModel->member_id = $data['member_id'];
|
|
|
+ $userModel->save();
|
|
|
+ }
|
|
|
// 修改了ref_id的话,同时也修改ref_path,同时修改他下级代理的ref_path
|
|
|
if (!empty($data['ref_id'])) {
|
|
|
$ref = Member::find()->where(['id' => intval($data['ref_id'])])->limit(1)->asArray()->one();
|