|
|
@@ -3,20 +3,12 @@ namespace common\models\forms;
|
|
|
|
|
|
use common\components\Model;
|
|
|
use common\helpers\Date;
|
|
|
-use common\helpers\Form;
|
|
|
-use common\helpers\snowflake\SnowFake;
|
|
|
-use common\helpers\user\Balance;
|
|
|
use common\helpers\user\Info;
|
|
|
use common\libs\logging\operate\UserOperate;
|
|
|
use common\models\BaUser;
|
|
|
use common\models\BaUserInfo;
|
|
|
-use common\models\Period;
|
|
|
-use common\models\DeclarationLevel;
|
|
|
-use common\models\EmployLevel;
|
|
|
use common\models\User;
|
|
|
use common\models\UserInfo;
|
|
|
-use common\models\UserNetwork;
|
|
|
-use common\models\UserRelation;
|
|
|
use yii\db\Exception;
|
|
|
|
|
|
/**
|
|
|
@@ -55,10 +47,7 @@ class BaUserForm extends Model
|
|
|
private $_recUid;
|
|
|
private $_limit = 1000;
|
|
|
|
|
|
-// private $_conTopUid;
|
|
|
private $_conTopDeep;
|
|
|
-// private $_recTopUid;
|
|
|
-// private $_recTopDeep;
|
|
|
|
|
|
public function init() {
|
|
|
parent::init();
|
|
|
@@ -75,7 +64,7 @@ class BaUserForm extends Model
|
|
|
return [
|
|
|
[['userId', 'userName', 'zcPv', 'zcAmount', 'conUserName', 'recUserName','conUid', 'recUid', 'location',/* 'nation', */'realName', /* 'mobile','openBank','bankAddress','bankNo', */ 'email'], 'trim'],
|
|
|
[['userId', 'userName',/* 'zcPv', 'zcAmount',*/ 'conUid', 'recUid', 'location'], 'required', 'on'=>'addWithUid'],
|
|
|
- [['userId', 'userName',/* 'zcPv', 'zcAmount', 'conUserName', 'recUserName', 'location'*/], 'required', 'on'=>['addWithUserName', 'addByAdmin']],
|
|
|
+ [['userId', 'userName',/* 'zcPv', 'zcAmount', 'conUserName',*/ 'recUserName', /*'location'*/], 'required', 'on'=>['addWithUserName', 'addByAdmin']],
|
|
|
[['idCard', 'allData'], 'required', 'on'=>['addWithUserName']],
|
|
|
[['userName'], 'required', 'on'=>['validateUser', 'noLoginModifyPassword']],
|
|
|
[['conUid'], 'required', 'on'=>['validateCon', 'validateAddWithUid']],
|
|
|
@@ -84,7 +73,6 @@ class BaUserForm extends Model
|
|
|
[['recUserName'], 'required', 'on'=>['validateRecName', 'validateAddWithName']],
|
|
|
[['conUid', 'location'], 'required', 'on'=>['validateLocation', 'validateAddWithUid']],
|
|
|
[['conUserName', 'location'], 'required', 'on'=>['validateLocationConName', 'validateAddWithName']],
|
|
|
-
|
|
|
[[/* 'nation' ,*/'realName'/*, 'mobile', */ /*'idCard',*/ /* 'openBank', 'bankAddress', 'bankNo' *//*, 'email'*/], 'required', 'on'=>'modifyProfile'],
|
|
|
[['oldPassword','verifyPassword'], 'required','on' => ['modifyPassword', 'modifyPasswordPay', 'noLoginModifyPassword']],
|
|
|
[['password'], 'required','on' => ['modifyPassword', 'noLoginModifyPassword']],
|
|
|
@@ -93,18 +81,12 @@ class BaUserForm extends Model
|
|
|
['verifyPassword', 'compare', 'compareAttribute' => 'payPassword' ,'message'=>'The two payment passwords are inconsistent' ,'on' => ['modifyPasswordPay']],//两次支付密码输入不一致
|
|
|
[['userId'], 'unique', 'targetClass'=>BaUserInfo::class, 'targetAttribute'=>'USER_ID', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
[['userName'], 'unique', 'targetClass'=>BaUserInfo::class, 'targetAttribute'=>'USER_NAME' , 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['conUid'], 'exist', 'targetClass'=>UserInfo::class, 'targetAttribute'=>'USER_ID', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
[['recUid'], 'exist', 'targetClass'=>UserInfo::class, 'targetAttribute'=>'USER_ID', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['conUid'], 'isConUid', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['recUid'], 'isRecUid', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['conUserName'], 'exist', 'targetClass'=>UserInfo::class, 'targetAttribute'=>'USER_NAME', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
+ [['recUid'], 'isRecUid', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
+ [['conUserName'], 'exist', 'targetClass'=>UserInfo::class, 'targetAttribute'=>'USER_NAME', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
[['recUserName'], 'exist', 'targetClass'=>UserInfo::class, 'targetAttribute'=>'USER_NAME', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['conUserName'], 'isCon', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
[['recUserName'], 'isRec', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['location'], 'isLocation', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
- //[['idCard'], 'isSameNetwork'],
|
|
|
[[/*'zcPv',*/ 'zcAmount'], 'price', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
-// [['zcPv'], 'isMinDecLevel', 'on' => ['addWithUserName', 'addWithUid', 'addByAdmin']],
|
|
|
];
|
|
|
}
|
|
|
|
|
|
@@ -112,16 +94,7 @@ class BaUserForm extends Model
|
|
|
{
|
|
|
return [
|
|
|
'userId' => '会员ID',
|
|
|
- 'conUserName' => '接点人账号',
|
|
|
- 'recUserName' => '开拓人帐号1',
|
|
|
-// 'location' => '区位',
|
|
|
-// 'nation' => '民族',
|
|
|
- //'realName' => '真实姓名',
|
|
|
-// 'idCard' => '身份证号',
|
|
|
- //'mobile' => '手机号',
|
|
|
- // 'openBank' => '银行名称',
|
|
|
- // 'bankAddress' => '开户支行',
|
|
|
- // 'bankNo' => '银行账号',
|
|
|
+ 'recUserName' => '开拓人帐号',
|
|
|
'verifyPassword' => 'Confirm password',//确认密码
|
|
|
'oldPassword' => 'Original password',//原密码
|
|
|
'password' => 'Login password',//登录密码
|
|
|
@@ -130,6 +103,15 @@ class BaUserForm extends Model
|
|
|
];
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 推荐人是否可用
|
|
|
+ * @param $attribute
|
|
|
+ * @param $params
|
|
|
+ */
|
|
|
+ public function isRecUid($attribute, $params) {
|
|
|
+ $this->_recUid = $this->recUid;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 推荐人是否可用
|
|
|
* @param $attribute
|
|
|
@@ -145,70 +127,36 @@ class BaUserForm extends Model
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 添加会员
|
|
|
- * @return UserInfo|null
|
|
|
- * @throws Exception
|
|
|
*/
|
|
|
- public function add(){
|
|
|
+ public function add()
|
|
|
+ {
|
|
|
if(!$this->validate()){
|
|
|
return null;
|
|
|
}
|
|
|
+
|
|
|
$insertUid = $this->userId;
|
|
|
$insertUserName = $this->userName;
|
|
|
-// $zcPv = $this->zcPv;
|
|
|
-// $conUid = $this->_conUid;
|
|
|
$recUid = $this->_recUid;
|
|
|
-// $location = $this->location;
|
|
|
|
|
|
-// $db = \Yii::$app->db;
|
|
|
-// $transaction = $db->beginTransaction();
|
|
|
- try{
|
|
|
-// $periodObj = Period::instance();
|
|
|
-// $nowPeriodNum = $periodObj->getNowPeriodNum();
|
|
|
- // 查找接点人的体系信息
|
|
|
-// $conUserInfo = UserInfo::find()->where('USER_ID=:USER_ID', [':USER_ID'=>$conUid])->asArray()->one();
|
|
|
+ try {
|
|
|
// 加入会员信息
|
|
|
$userInfoModel = new BaUserInfo();
|
|
|
$userInfoModel->USER_ID = $insertUid;
|
|
|
$userInfoModel->USER_NAME = $insertUserName;
|
|
|
-// $userInfoModel->ZC_PV = $zcPv;
|
|
|
$userInfoModel->ZC_AMOUNT = $this->zcAmount;
|
|
|
$userInfoModel->CON_UID = '';
|
|
|
- $userInfoModel->REC_UID = '';
|
|
|
-// $userInfoModel->SYSTEM_ID = $conUserInfo['SYSTEM_ID'];
|
|
|
- //$userInfoModel->PERIOD_NUM = $nowPeriodNum;
|
|
|
+ $userInfoModel->REC_UID = $recUid;
|
|
|
$userInfoModel->CREATED_AT = Date::nowTime();
|
|
|
-// $userInfoModel->HIGHEST_EMP_LV = EmployLevel::getDefaultLevelId();
|
|
|
$userInfoModel->ALLOW_TRANSFER = 1;
|
|
|
-// $userInfoModel->HIGHEST_EMP_LV_PERIOD = $nowPeriodNum;
|
|
|
$userInfoModel->TRANSFER_PROP = 100.00;
|
|
|
$userInfoModel->IS_GROUP_LEADER = 0;
|
|
|
$userInfoModel->GROUP_LEADER_AT = 0;
|
|
|
+ $userInfoModel->save();
|
|
|
|
|
|
- try {
|
|
|
- $q = $userInfoModel->save();
|
|
|
- }catch (Exception $e) {
|
|
|
- throw new Exception($e->getMessage());
|
|
|
- }
|
|
|
-// print_r($userInfoModel);exit;
|
|
|
-// if(!$userInfoModel->save()){
|
|
|
-// throw new Exception('会员信息更新失败');
|
|
|
-// }
|
|
|
-// exit;
|
|
|
-
|
|
|
- // 清空安置网络和开拓网络的顶点和顶点深度的数值
|
|
|
-// $this->_conTopUid = null;
|
|
|
-// $this->_conTopDeep = null;
|
|
|
-// $this->_recTopUid = null;
|
|
|
-// $this->_recTopDeep = null;
|
|
|
-
|
|
|
-// $transaction->commit();
|
|
|
return $userInfoModel;
|
|
|
- } catch (Exception $e){
|
|
|
- throw new Exception($e->getMessage());
|
|
|
-// $transaction->rollBack();
|
|
|
+ } catch (Exception $e) {
|
|
|
$this->addError('userId', $e->getMessage());
|
|
|
return null;
|
|
|
}
|
|
|
@@ -216,7 +164,6 @@ class BaUserForm extends Model
|
|
|
|
|
|
/**
|
|
|
* 修改个人资料
|
|
|
- * @return User|null
|
|
|
*/
|
|
|
public function modifyProfile(){
|
|
|
if(!$this->validate()){
|
|
|
@@ -226,10 +173,6 @@ class BaUserForm extends Model
|
|
|
|
|
|
$uid = \Yii::$app->user->id;
|
|
|
$model = BaUser::findOne(['ID'=>$uid]);
|
|
|
- // $model->NATION = $this->nation;
|
|
|
- // $model->OPEN_BANK = $this->openBank;
|
|
|
- // $model->BANK_NO = $this->bankNo;
|
|
|
- // $model->BANK_ADDRESS = $this->bankAddress;
|
|
|
$model->EMAIL = $this->email;
|
|
|
if(!$model->save()){
|
|
|
$this->addErrors($model->getErrors());
|
|
|
@@ -246,6 +189,7 @@ class BaUserForm extends Model
|
|
|
|
|
|
return $model;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 修改密码
|
|
|
*/
|
|
|
@@ -266,6 +210,7 @@ class BaUserForm extends Model
|
|
|
}
|
|
|
return true;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 修改支付密码
|
|
|
*/
|
kevin_zhangl