xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
HESU\HESU
2025-03-17 18:01:53 +08:00
parent e3e9d990bb
commit 43897af989
13 changed files with 210 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webman/app/controller/AreaController.php
+13 -7
View File
@@ -14,12 +14,11 @@ class AreaController
$parentId = Util::getParam($request,'parent_id');
$level = Util::getParam($request,'level')?:1;
$list = $this->getRegions($parentId, $level);
return json($list);
return Util::success($list);
}
function getRegions($parentId = null, $level = 1) {
//递归查询
function getRegions($parentId = null, $level = 1, $child = true) {
$regions = [];
$where= array();
@@ -30,13 +29,20 @@ class AreaController
$results = Area::where($where)->get();
foreach ($results as $row) {
// $row['level'] = $level; // 添加层级信息
// $regions = array_merge($regions, $this->getRegions($row['id'], $level + 1)); // 递归调用
$row['children'] = $this->getRegions($row['id'], $row['level'] + 1);
if($child){
$row['children'] = $this->getRegions($row['id'], $row['level'] + 1);
}
$regions[] = $row;
}
return $regions;
}
public function getCountry (Request $request)
{
$level = Util::getParam($request,'level')?:1;
$list = $this->getRegions(null, $level,false);
return Util::success($list);
}
}
webman/app/controller/CarTypeController.php
+2 -1
View File
@@ -4,6 +4,7 @@ namespace app\controller;
use app\model\CarType;
use app\model\Customer;
use app\util\Util;
use PDO;
use support\Db;
use support\Redis;
@@ -15,7 +16,7 @@ class CarTypeController
public function getAll(Request $request)
{
$list = CarType::getAll();
return json($list);
return Util::success($list);
}
}
webman/app/controller/CustomerController.php
+24 -12
View File
@@ -2,6 +2,7 @@
namespace app\controller;
use app\model\Channel;
use app\model\Customer;
use app\util\Util;
use config\constants\Constants;
@@ -10,7 +11,6 @@ use support\Request;
class CustomerController
{
/**
* 客户分级
* @param Request $request
@@ -21,28 +21,40 @@ class CustomerController
$grade = [];
foreach (Constants::GRADE as $key => $value) {
$grade[] = [
'status' => $key,
'text' => $value,
'id' => $key,
'name' => $value,
];
}
return json($grade);
return Util::success($grade);
}
/**
* 客户偏好
* 商机
* @param Request $request
* @return \support\Response
*/
public function getCarType(Request $request)
public function getMagnitude(Request $request)
{
$grade = [];
foreach (Constants::GRADE as $key => $value) {
foreach (Constants::MAGNITUDE as $key => $value) {
$grade[] = [
'status' => $key,
'text' => $value,
'id' => $key,
'name' => $value,
];
}
return json($grade);
return Util::success($grade);
}
/**
* 客户渠道
* @param Request $request
* @return \support\Response
*/
public function getChannel(Request $request)
{
$list = Channel::getAll();
return Util::success($list);
}
/**
@@ -158,9 +170,9 @@ class CustomerController
}
if ($res) {
return Util::success($res);
return Util::success($res,trans('save_success'));
} else {
return Util::fail($res);
return Util::fail($res,trans('save_fail'));
}
}
webman/app/controller/FollowController.php
+12 -8
View File
@@ -70,8 +70,11 @@ class FollowController
->orderBy('id', 'desc')
->paginate($perPage, ['*'], 'page', $page);
// $host = $request->host();
$url = 'http:'.$request->url();
foreach ($data->items() as &$value){
$value = Follow::getFollow($value);
$value = Follow::getFollow($value,$url);
}
return Util::page($data);
@@ -112,6 +115,7 @@ class FollowController
public function save(Request $request)
{
$customer_id = Util::getParam($request,'customer_id');
if(Util::isEmpty($customer_id)){
return Util::fail([],'customer_id'.trans('not_null'));
}
@@ -132,9 +136,9 @@ class FollowController
'remark'=>Util::getParam($request,'remark',''),
'audio'=>Util::getParam($request,'audio',''),
'audio_text'=>Util::getParam($request,'audio',''),
'lat'=>Util::getParam($request,'lat'),
'lng'=>Util::getParam($request,'lng'),
'address'=>Util::getParam($request,'address'),
'lat'=>Util::getParam($request,'lat',0),
'lng'=>Util::getParam($request,'lng',0),
'address1'=>Util::getParam($request,'address'),
];
$res = Follow::create($data);
@@ -143,10 +147,10 @@ class FollowController
$customer->follow_last = $res->created_at;
$customer->save();
if($res){
return Util::success($res);
}else{
return Util::fail($res);
if ($res) {
return Util::success($res,trans('save_success'));
} else {
return Util::fail($res,trans('save_fail'));
}
}
webman/app/controller/UploadController.php
+1 -1
View File
@@ -78,7 +78,7 @@ class UploadController
'size' => $fileSize
]);
$result[] = [
$result = [
'original_name' => $file->getUploadName(),
'saved_name' => $filename,
'path' => 'uploads/' . date('Ym') . '/' . $filename,
webman/app/controller/UserController.php
+84 -24
View File
@@ -14,26 +14,24 @@ class UserController
/**
* 不需要登录的方法
*/
protected $noNeedLogin = ['login','sendCode'];
protected $noNeedLogin = ['login', 'sendCode', 'register'];
public function login(Request $request)
{
// Util::isEmpty($request->post('email'));
$email = Util::getParam($request,'email');
if(Util::isEmpty($email)){
return Util::fail([],'email'.trans('not_null'));
$email = Util::getParam($request, 'email');
if (Util::isEmpty($email)) {
return Util::fail([], 'email' . trans('not_null'));
}
// Util::isEmpty($request->post('password'));
$password = Util::getParam($request,'password');
if(Util::isEmpty($password)){
return Util::fail([],'password'.trans('not_null'));
$password = Util::getParam($request, 'password');
if (Util::isEmpty($password)) {
return Util::fail([], 'password' . trans('not_null'));
}
$user = User::select(['id','name','sex','role','avatar','email','password'])
->where('status',0)
->where('email',$request->post('email'))
$user = User::select(['id', 'name', 'sex', 'role', 'avatar', 'email', 'password'])
->where('status', 0)
->where('email', $request->post('email'))
->first();
if(!$user){
return Util::fail(['user'=>$user],trans('user_none'));
if (!$user) {
return Util::fail(['user' => $user], trans('user_none'));
}
$user = $user->toArray();
@@ -44,12 +42,12 @@ class UserController
//验证密码
if (!password_verify($userPassword, $hashedPassword)) {
return Util::fail([],trans('password_error'));
return Util::fail([], trans('password_error'));
}
$userId = $user['id']; // 实际从数据库获取
Redis::set('user_'.$userId, $user);
Redis::set('user_' . $userId, $user);
//密码验证成功后加密生成 Token
$token = JwtUtil::generateToken($userId);
@@ -57,7 +55,7 @@ class UserController
unset($result['password']);
$result['token'] = $token;
return Util::success($result,trans('login_success'));
return Util::success($result, trans('login_success'));
}
/**
@@ -68,10 +66,9 @@ class UserController
*/
public function sendCode(Request $request)
{
// $email = $request->input('email');
$email = '1696136552@qq.com';
$email = Util::getParam($request,'email');
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
return json(['code' => 400, 'msg' => '邮箱格式错误']);
return Util::fail([], 'email' . trans('not_null'));
}
// 生成验证码
@@ -82,13 +79,76 @@ class UserController
if ($mailService->sendVerificationCode($email, $code)) {
// 存储验证码到 Redis
Redis::set("verification_code:{$email}", $code, 300);
return Util::success([],'验证码已发送');
return Util::success([], '验证码已发送');
}
return Util::fail([],'邮件发送失败');
return Util::fail([], '邮件发送失败');
}
/**
* 注册
* @param Request $request
* @return \support\Response
* @throws \Random\RandomException
*/
public function register(Request $request)
{
$email = Util::getParam($request,'email','asdf');
$code = Util::getParam($request,'code');
$sex = Util::getParam($request,'sex',0);
$name = Util::getParam($request,'name',0);
$password = Util::getParam($request,'password');
$mobile = Util::getParam($request,'mobile');
$id = Util::getParam($request,'id');
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
return Util::fail([], 'email'.$email . trans('not_null'));
}
$res = User::select('id', 'email')
->where('email', $email)
->first();
// if (!Util::isEmpty($res)) {
// return Util::fail([], trans('email_repeat'));
// }
if (Util::isEmpty($name)) {
return Util::fail([], 'name' . trans('not_null'));
}
$verification_code = Redis::get("verification_code:{$email}");
if ($code != $verification_code) {
return Util::fail([], trans('code_error'));
}
//加密
$hashedPassword = password_hash($password, PASSWORD_DEFAULT);
$data = [
'mobile' => $mobile,
'email' => $email,
'name' => $name,
'sex' => $sex,
'role' => 1,
'password' => $hashedPassword,
];
if (Util::isEmpty($id)) {
$res = User::create($data);
} else {
$res = User::where('id', $id)
->update($data);
// Log::info('update', ['res' => $res]);
(!$res)?: $res=User::find($id)->toArray();
}
if ($res) {
return Util::success($res);
} else {
return Util::fail($res);
}
}
}