diff --git a/application/admin/controller/user4s/User.php b/application/admin/controller/user4s/User.php index 2d86f3d..b46928b 100644 --- a/application/admin/controller/user4s/User.php +++ b/application/admin/controller/user4s/User.php @@ -124,9 +124,14 @@ class User extends Backend $this->model->validateFailException(true)->validate($validate); } $result = $this->model->allowField(true)->save($params); + var_dump($params['need_visit']); //新加用户期初等级 if($result && $this->model->id){ - $log_res = $this->model->afterlog($this->auth->id,$this->model,$this->model->id); + if($params['need_visit'] == 1){ + $log_res = $this->model->afterlog($this->auth->id,$this->model,$this->model->id,'',true); + }else{ + $log_res = $this->model->afterlog($this->auth->id,$this->model,$this->model->id,'',false); + } if(!$log_res){ $this->model->rollback(); $this->error('新增失败'); @@ -317,69 +322,42 @@ class User extends Backend $this->error(__('You have no permission')); } } - $all_level = $this->level_model->where('status', 1)->column('id,name'); + //$all_level = $this->level_model->where('status', 1)->column('id,name'); if ($this->request->isPost()) { $params = $this->request->post("row/a"); - //var_dump($params); - $user_data = array( - 'id' => $row->id - ); - //记录用户充值、积分、等级记录 - $log_data = array( - 'user4s_id' => $row->id, - 'admin_id'=>$this->auth->id - ); - //余额充值 - if ($params['balance'] > 0) { - $now = round($params['balance'], 2); - $end = round($row->balance + $now, 2); - - $log_data['start'] = $row->balance; - $log_data['end'] = $end; - $log_data['state'] = 0; - $log_data['description'] = $params['description']; - $this->log_model->isUpdate(false)->save($log_data); - $user_data['balance'] = $end; - } - //积分记录 - if ($params['integral'] > 0) { - $now = intval($params['integral']); - $end = intval($row->integral + $now); - - $log_data['start'] = $row->integral; - $log_data['end'] = $end; - $log_data['state'] = 1; - if($now > 0){ - $log_data['description'] = $params['description'].' 赠送积分:'.$now; - }else{ - $log_data['description'] = $params['description'].' 系统后台扣除积分'.$now; - } - $this->log_model = new \app\common\model\user4s\Log(); - $this->log_model->isUpdate(false)->save($log_data); - $user_data['integral'] = $end; - //var_dump($log_data, $user_data); - } - //等级记录 - if ($params['level_id'] != $row->level_id && $params['level_id'] > 0) { - $end = intval($params['level_id']); - $log_data['start'] = $row->level_id; - $log_data['end'] = $end; - - $log_data['description'] = '会员等级变动,由 '.$all_level[$row->level_id].' 更改为:'.$all_level[$end]; - //var_dump($log_data); - $this->levellog_model->isUpdate(false)->save($log_data); - $user_data['level_id'] = $end; - } - if(isset($user_data['balance']) || isset($user_data['integral']) || isset($user_data['level_id'])){ - //var_dump($user_data); - //$this->model->get($row->id); + //记录用户续保记录 + if (!empty($params['inscom']) && !empty($params['insdate'])) { + $log_data = array( + 'user4s_id' => $row->id, + 'admin_id'=>$this->auth->id, + 'inscom'=>$params['inscom'], + 'insdate'=>$params['insdate'], + 'star'=>$params['star'], + 'description'=>$params['description'] + ); + $this->Inslog_model = new \app\common\model\user4s\Inslog(); + $this->Inslog_model->isUpdate(false)->save($log_data); + $user_data = array( + 'inscom'=>$params['inscom'], + 'insdate'=>$params['insdate'], + ); $this->model->save($user_data, ['id' => $row->id]); + }else{ + $this->error('请填写续保信息',url('user4s/user/expireins',['user4s_id'=>$row->id])); } - $this->success(); + $this->success('续保成功!',url('user4s/user/expireins',['user4s_id'=>$row->id])); } //var_dump($col); - $this->view->assign("all_level", $all_level); + $all_star = array( + 1=>'★', + 2=>'★★', + 3=>'★★★', + 4=>'★★★★', + 5=>'★★★★★', + ); + $this->view->assign("now", date('Y-m-d')); + $this->view->assign("all_star", $all_star); $this->view->assign('row', $row); return $this->view->fetch(); } diff --git a/application/admin/controller/user4s/Visit.php b/application/admin/controller/user4s/Visit.php new file mode 100644 index 0000000..f847445 --- /dev/null +++ b/application/admin/controller/user4s/Visit.php @@ -0,0 +1,71 @@ +model = new \app\common\model\user4s\Visit; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage,则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['visittype','user','admin']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + +} diff --git a/application/admin/controller/user4s/Visittype.php b/application/admin/controller/user4s/Visittype.php new file mode 100644 index 0000000..c0c1210 --- /dev/null +++ b/application/admin/controller/user4s/Visittype.php @@ -0,0 +1,37 @@ +model = new \app\common\model\user4s\Visittype; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/lang/zh-cn/user4s/visit.php b/application/admin/lang/zh-cn/user4s/visit.php new file mode 100644 index 0000000..32004a7 --- /dev/null +++ b/application/admin/lang/zh-cn/user4s/visit.php @@ -0,0 +1,58 @@ + 'ID', + 'User4s_id' => '会员', + 'Admin_id' => '操作员', + 'Type_id' => '回访类型', + 'Visittime' => '回访时间', + 'Description' => '备注', + 'Createtime' => '创建时间', + 'Deletetime' => '删除时间', + 'Visittype.id' => 'ID', + 'Visittype.name' => '名称', + 'Visittype.tip_time' => '提醒时间', + 'Visittype.description' => '备注', + 'Visittype.createtime' => '创建时间', + 'Visittype.deletetime' => '删除时间', + 'User.id' => 'ID', + 'User.category_id' => '用户分组', + 'User.level_id' => '用户等级', + 'User.name' => '姓名', + 'User.tel' => '联系方式', + 'User.balance' => '余额', + 'User.integral' => '积分', + 'User.genderdata' => '性别', + 'User.genderdata male' => '男', + 'User.genderdata female' => '女', + 'User.city' => '省市', + 'User.buydate' => '购车日期', + 'User.carno' => '车牌号码', + 'User.model' => '车型', + 'User.color' => '颜色', + 'User.inscom' => '保险类型', + 'User.insdate' => '保险日期', + 'User.tags' => '标签', + 'User.description' => '备注', + 'User.admin_id' => '销售顾问', + 'User.createtime' => '创建时间', + 'User.updatetime' => '更新时间', + 'User.deletetime' => '删除时间', + 'User.status' => '状态值', + 'User.status 0' => '禁用', + 'User.status 1' => '正常', + 'Admin.id' => 'ID', + 'Admin.username' => '用户名', + 'Admin.nickname' => '昵称', + 'Admin.password' => '密码', + 'Admin.salt' => '密码盐', + 'Admin.avatar' => '头像', + 'Admin.email' => '电子邮箱', + 'Admin.loginfailure' => '失败次数', + 'Admin.logintime' => '登录时间', + 'Admin.loginip' => '登录IP', + 'Admin.createtime' => '创建时间', + 'Admin.updatetime' => '更新时间', + 'Admin.token' => 'Session标识', + 'Admin.status' => '状态' +]; diff --git a/application/admin/lang/zh-cn/user4s/visittype.php b/application/admin/lang/zh-cn/user4s/visittype.php new file mode 100644 index 0000000..4ebc16b --- /dev/null +++ b/application/admin/lang/zh-cn/user4s/visittype.php @@ -0,0 +1,10 @@ + 'ID', + 'Name' => '名称', + 'Tip_time' => '提醒时间', + 'Description' => '备注', + 'Createtime' => '创建时间', + 'Deletetime' => '删除时间' +]; diff --git a/application/admin/view/user4s/user/add.html b/application/admin/view/user4s/user/add.html index 06b93d7..9f2767b 100644 --- a/application/admin/view/user4s/user/add.html +++ b/application/admin/view/user4s/user/add.html @@ -92,7 +92,18 @@ +