fm453/ctms-yii
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化ctms-api语法、修复已知BUG；

Browse Source 
主要修复ctms-api、dacms对PHP新版本的支持问题
This commit is contained in:
fm453
2025-07-13 19:37:42 +08:00
parent 65bbd06981
commit 037f274ec5
413 changed files with 107271 additions and 72326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctms-api/controllers/client/v1/OrderController.php
+105 -98
View File
@@ -4,15 +4,14 @@
# @Date: 2022-04-24T20:28:47+08:00
# @Email: fm453@lukegzs.com
# @Last modified by: fm453
# @Last modified time: 2024-07-13T14:23:16+08:00
# @Last modified time: 2024-08-09T09:00:15+08:00
# @Copyright: www.hiluker.cn
namespace backend\controllers\client\v1;
namespace api\controllers\client\v1;
use Yii;
use yii\data\Pagination;
use yii\helpers\Url;
use backend\controllers\client\v1\Common;
use addons\models\AcCar;
use addons\models\AcCarOwner;
use addons\models\AcCarBrand;
@@ -37,7 +36,7 @@ class OrderController extends Common
public function beforeAction($action)
{
if (!$this->pid) {
// $this->result('您正使用本系统内部接口，禁止非法链接使用！');
$this->result('您正使用本系统内部接口，禁止非法链接使用！');
}
return parent::beforeAction($action);
}
@@ -57,8 +56,8 @@ class OrderController extends Common
{
$s = $this->search();
$res = $s['res'];
if(!$res){
$this->result('没有查询到相应的数据！',[],0);
if (!$res) {
$this->result('没有查询到相应的数据！', [], 0);
}
$data = $s['data'];
$this->showOrder($res, $data);
@@ -69,8 +68,8 @@ class OrderController extends Common
$pid = $this->pid;
$status = Yii::$app->params['OrderStatus'];
$post = $this->postdata;
$id = isset($post['oid']) ? $post['oid'] : 0;
$id = $post['oid'] ?? 0;
if ($id<=0) {
$this->result('查询参数错误！');
}
@@ -101,11 +100,11 @@ class OrderController extends Common
$detail['car_number'] = $car->num_p.$car->num_area.$car->num_left;
$detail['car_number'] = $detail['car_number'] ? $detail['car_number'] : $car->num_frame;
}
$model = new User();
$model = new Fans();
$user = $model->findOne($detail['from_mid']);
$model = new AcUserExt();
$model = new AcFansExt();
$exts = [];
$_exts = $model->find()->where(['mid'=>$detail['from_mid'],'pid'=>$pid,'deleted'=>0])->indexBy('id')->all();
foreach ($_exts as $ext) {
@@ -184,8 +183,8 @@ class OrderController extends Common
$this->result('订单查询成功！', $detail, 200);
}
public function actionCreate()
public function actionCreate($contactModel2)
{
$get = Yii::$app->request->get();
$post = $this->postdata;
@@ -218,16 +217,22 @@ class OrderController extends Common
$data[$col] = htmlspecialchars($post[$key]);
}
}
$data['remark'] = isset($data['remark']) ? isset($data['remark']) : '';
$data['remark'] = $data['remark'] ?? '';
/*@sign_date: 1649952000000*/
$sign_date = isset($post['sign_date']) ? $post['sign_date']/1000 : '';
$data['sign_date'] = $sign_date ? $sign_date : time();
$data['sign_date'] = $sign_date ? $sign_date : TIMESTAMP;
$mid = isset($post['mid']) ? (int)$post['mid'] : 11 ; //11是方孟
// 指派运单的创建人（平台管理员ID）
$mid = isset($post['mid']) ? (int)$post['mid'] : 0; //11是方孟
$data['create_by'] = $mid;
$data['is_cwqr'] = 0; //修改财务确认状态为待确认
$data['is_cwqr'] = 0; //修改财务确认状态为待确认
$data['status_code'] = 1; //订单处于创建待审核状态
//关联运单前台用户；fans表
$fid = $this->user_id;
$data['from_mid'] = $fid;
//部分规则校验
$hasError = 0;
@@ -289,7 +294,7 @@ class OrderController extends Common
$where['num_area'] = $post['carno_area'];
$where['num_left'] = $post['carno_left'];
}
$post['carno_frame'] = isset($post['carno_frame']) ? $post['carno_frame'] : '';
$post['carno_frame'] = $post['carno_frame'] ?? '';
if (!empty($post['carno_frame'])) {
$where['num_frame'] = $post['carno_frame'];
}
@@ -301,10 +306,9 @@ class OrderController extends Common
$carModel->num_area = $post['carno_area'];
$carModel->num_left = $post['carno_left'];
$carModel->title = $post['carno_title'];
$carModel->title = $post['carno_title'];
$carModel->status_code = 1;
$carModel->create_at = time();
$carModel->update_at = time();
$carModel->create_at = TIMESTAMP;
$carModel->update_at = TIMESTAMP;
$carModel->save();
$car_id = $carModel->attributes['id'];
} else {
@@ -313,79 +317,83 @@ class OrderController extends Common
$data['car_id'] = $car_id;
//查询联系人信息是否在库
$sender_mobiles = isset($data['sender_mobiles']) ? $data['sender_mobiles'] : null;
$receiver_mobiles = isset($data['receiver_mobiles']) ? $data['receiver_mobiles'] : null;
if ($sender_mobiles) {
//项目分支自有数据表
$contactModel = new AcContact();
$contactor = $contactModel->find()->where(['mobile'=>$data['sender_mobiles'],'pid'=>$pid])->one();
//框架核心数据表Fans
$userModel = new Fans();
//项目分支自有数据表
$contactModel = new AcContact();
$sender_mobiles = $data['sender_mobiles'] ?? NULL;
$receiver_mobiles = $data['receiver_mobiles'] ?? NULL;
if ($sender_mobiles) {
//项目分支自有数据表
$_model = clone $contactModel;
$contactor = $_model->find()->where(['mobile' => $data['sender_mobiles'], 'pid' => $pid])->one();
if (empty($contactor)) {
$contactModel->name = isset($data['sender_name']) ? $data['sender_name'] : '客户';
$contactModel->mobile = $data['sender_mobiles'];
$contactModel->pid = $pid;
$contactModel->idcard = isset($data['sender_idcard']) ? $data['sender_idcard'] : '';
$contactModel->create_at = time();
$contactModel->status_code = 1;
$contactModel->save();
$_model->name = $data['sender_name'] ?? '客户';
$_model->mobile = $data['sender_mobiles'];
$_model->pid = $pid;
$_model->idcard = $data['sender_idcard'] ?? '';
$_model->create_at = TIMESTAMP;
$_model->status_code = 1;
$_model->save();
} else {
$_contactDatas = [];
$_contactDatas['name'] = isset($data['sender_name']) ? $data['sender_name'] : $contactModel->name;
$_contactDatas['idcard'] = isset($data['idcard']) ? $data['idcard'] : $contactModel->idcard;
if ($_contactDatas['name']==$contactModel->name && $_contactDatas['idcard'] ==$contactModel->idcard) {
$_contactDatas['name'] = $data['sender_name'] ?? $contactor->name;
$_contactDatas['idcard'] = $data['idcard'] ?? $contactor->idcard;
if ($_contactDatas['name'] == $contactor->name && $_contactDatas['idcard'] == $contactor->idcard) {
//无须做任何变化
} else {
$_contactDatas['update_at'] = time();
$contactModel->updateAll($_contactDatas, ['id'=>$contactModel->id]);
$contactModel->updateAll($_contactDatas, ['id' => $contactor->id]);
}
}
//框架核心数据表Fans
$userModel = new Fans();
$user = $userModel->findByUsername($sender_mobiles);
$_model = clone $userModel;
$user = $_model->findByUsername($sender_mobiles);
if (empty($user)) {
$userModel->mobile = $sender_mobiles;
$userModel->email = $sender_mobiles.'@hiluker.com';
$userModel->setPassword(Yii::$app->params['defaultFansPassword']);
$userModel->generateAuthKey();
$userModel->created_at = time();
$userModel->from = 'ctms';
$userModel->save();
$_model->mobile = $sender_mobiles;
$_model->email = $sender_mobiles . '@hiluker.com';
$_model->setPassword(Yii::$app->params['defaultFansPassword']);
$_model->generateAuthKey();
$_model->created_at = TIMESTAMP;
$_model->from = Yii::$app->params['fansFrom'];;
$_model->save();
}
}
if ($receiver_mobiles && $receiver_mobiles != $sender_mobiles) {
//项目分支自有数据表
$contactModel2 = new AcContact();
$contactor2 = $contactModel2->find()->where(['mobile'=>$data['receiver_mobiles'],'pid'=>$pid])->one();
$_model = clone $contactModel;
$contactor2 = $_model->find()->where(['mobile' => $data['receiver_mobiles'], 'pid' => $pid])->one();
if (empty($contactor2)) {
$contactModel2->name = isset($data['receiver_name']) ? $data['receiver_name'] : '客户';
$contactModel2->mobile = $data['receiver_mobiles'];
$contactModel2->pid = $pid;
$contactModel2->idcard = isset($data['receiver_idcard']) ? $data['receiver_idcard'] : '';
$contactModel2->create_at = time();
$contactModel2->status_code = 1;
$contactModel2->save();
$_model->name = $data['receiver_name'] ?? '客户';
$_model->mobile = $data['receiver_mobiles'];
$_model->pid = $pid;
$_model->idcard = $data['receiver_idcard'] ?? '';
$_model->create_at = TIMESTAMP;
$_model->status_code = 1;
$_model->save();
} else {
$_contactDatas = [];
$_contactDatas['name'] = isset($data['receiver_name']) ? $data['receiver_name'] : $contactModel2->name;
$_contactDatas['idcard'] = isset($data['idcard']) ? $data['idcard'] : $contactModel2->idcard;
if ($_contactDatas['name']==$contactModel2->name && $_contactDatas['idcard'] ==$contactModel2->idcard) {
$_contactDatas['name'] = $data['receiver_name'] ?? $contactor2->name;
$_contactDatas['idcard'] = $data['idcard'] ?? $contactor2->idcard;
if ($_contactDatas['name'] == $contactor2->name && $_contactDatas['idcard'] == $contactor2->idcard) {
//无须做任何变化
} else {
$_contactDatas['update_at'] = time();
$contactModel2->updateAll($_contactDatas, ['id'=>$contactModel2->id]);
$contactor2->updateAll($_contactDatas, ['id' => $contactor2->id]);
}
}
//框架核心数据表Fans
$userModel = new Fans();
$user = $userModel->findByUsername($receiver_mobiles);
$_model = clone $userModel;
$user = $_model->findByUsername($receiver_mobiles);
if (empty($user)) {
$userModel->mobile = $receiver_mobiles;
$userModel->email = $receiver_mobiles.'@hiluker.com';
$userModel->setPassword(Yii::$app->params['defaultFansPassword']);
$userModel->generateAuthKey();
$userModel->created_at = time();
$userModel->from = 'ctms';
$userModel->save();
$_model->mobile = $receiver_mobiles;
$_model->email = $receiver_mobiles . '@hiluker.com';
$_model->setPassword(Yii::$app->params['defaultFansPassword']);
$_model->generateAuthKey();
$_model->created_at = TIMESTAMP;
$_model->from = Yii::$app->params['fansFrom'];;
$_model->save();
}
}
@@ -403,14 +411,13 @@ class OrderController extends Common
$return['code'] = 200;
$return['msg'] = '订单保存成功！'.$msg;
$return['data']= ['id'=>$id];
exit(json_encode($return, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT));
} else {
$return = [];
$return['code'] = 100;
$return['msg'] = '订单保存失败！';
$return['data']= [];
exit(json_encode($return, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT));
}
$this->result($return['msg'], $return['data'], $return['code']);
}
//订单列表
@@ -422,19 +429,19 @@ class OrderController extends Common
$where = [];
$where[]='and';
$where[] = ['=','pid',$pid];
$post = $this->postdata;
$search = isset($post['search']) ? $post['search'] : [];
$search = $post['search'] ?? [];
//预置搜索条件,只允许查询与自己完全相关的订单
$search['phone'] = $this->user_info->mobile;
$orwhere = ['or',['LIKE','sender_mobiles',$search['phone']],['LIKE','receiver_mobiles',$search['phone']]];
$orwhere = ['or', ['LIKE', 'sender_mobiles', $search['phone']], ['LIKE', 'receiver_mobiles', $search['phone']]];
//车牌号使用完整精准搜索（皖A88888）
$CarModel = new AcCar();
if (isset($search['carno']) && !empty($search['carno'])) {
$search['carno'] = trim($search['carno']);
$sql = 'CONCAT(num_p,num_area,num_left) = :carno or num_frame LIKE :carno';
$cars = $CarModel->find()->where($sql,[':carno'=>$search['carno']])->limit(5)->offset(0)->all();
$cars = $CarModel->find()->where($sql, [':carno' => $search['carno']])->limit(5)->offset(0)->all();
//最多仅显示可匹配车牌号的前5个
if (empty($cars)) {
@@ -449,12 +456,12 @@ class OrderController extends Common
$where[] = ['IN','car_id',$car_ids];
}
}
if (isset($search['city']) && !empty($search['city'])) {
if (!empty($search['city'])) {
$search['city'] = trim($search['city']);
$where[] = ['LIKE','aim_city',$search['city']];
}
$search['employee'] = isset($search['employee']) ? (int)$search['employee'] : '';
$EmployeeModel = new AcEmployee();
if (!empty($search['employee'])) {
@@ -463,7 +470,7 @@ class OrderController extends Common
$search['employee_title'] = isset($employee->name) ? $employee->name : '';
}
$search['store_id'] = isset($search['store_id']) ? (int)$search['store_id'] : '';
if (empty($search['sotre_id'])) {
if (empty($search['store_id'])) {
$search['store_id'] = isset($get['store_id']) ? (int)$get['store_id'] : 0;
}
$StoreModel = new AcStore();
@@ -472,7 +479,7 @@ class OrderController extends Common
$store = $StoreModel->findOne($search['store_id']);
$search['store_title'] = isset($store->title) ? $store->title : '';
}
$search['start_province'] = isset($search['start_province']) ? trim($search['start_province']) : '';
if (!empty($search['start_province'])) {
$where[] = ['=','start_province',$search['start_province']];
@@ -531,12 +538,10 @@ class OrderController extends Common
$search['is_commission'] = (int)$search['is_commission'];
$where[] = ['=','is_commission',$search['is_commission']];
}
$search['is_cwqr'] = isset($search['is_cwqr']) ? $search['is_cwqr'] : '';
if ($search['is_cwqr']=='') {
$search['is_cwqr'] = isset($get['is_cwqr']) ? $get['is_cwqr'] : '';
}
//运单是否通过了财务确认
$search['is_cwqr'] = $search['is_cwqr'] ?? ($get['is_cwqr'] ?? '');
if ($search['is_cwqr'] !='') {
$search['is_cwqr'] = (int)$get['is_cwqr'];
$search['is_cwqr'] = (int)$search['is_cwqr'];
$where[] = ['=','is_cwqr',$search['is_cwqr']];
}
@@ -567,9 +572,9 @@ class OrderController extends Common
$end = strtotime($search['sign_before']);
$where[] = ['<=','sign_date',$end];
}
//带序列号搜索（TBD：后期考虑改为精准唯一搜索）
if(isset($search['sn']) && $search['sn'] != 'undefined' && $search['sn']){
if (isset($search['sn']) && $search['sn'] != 'undefined' && $search['sn']) {
$where[] = ['LIKE','sn',$search['sn']];
}
@@ -607,7 +612,7 @@ class OrderController extends Common
$model = new AcStore();
$where = [];
$where['pid'] = Yii::$app->session->get('pid');
$where['pid'] = $this->pid;
$_stores = $model->find()->where(['in','id',$sids])->all();
$stores = [];
foreach ($_stores as $s) {
@@ -620,8 +625,8 @@ class OrderController extends Common
foreach ($_employees as $s) {
$employees[$s->id] = $s->toArray();
}
$model = new User();
$model = new Fans();
$users = [];
$_users = $model->find()->where(['in','id',$mids])->all();
foreach ($_users as $s) {
@@ -673,7 +678,9 @@ class OrderController extends Common
foreach ($orderRes as $s) {
$car = [];
if($s->car_id) $car = $cars[$s->car_id];
if ($s->car_id) {
$car = $cars[$s->car_id];
}
$s = $s->toArray();
foreach ($unsets as $us) {
unset($s[$us]);
@@ -683,9 +690,9 @@ class OrderController extends Common
$s['signdate'] = date('Y-m-d ', $s['sign_date']) . '星期'.$weekdays[$wk];
$s['from_province'] = $s['start_province'] ? Yii::$app->params['regionAreas'][$s['start_province']] : '';
$s['to_province'] = $s['aim_province'] ? Yii::$app->params['regionAreas'][$s['aim_province']] : '';
$s['car_number']= isset($car['number2']) ? $car['number2'] : '';
$s['car_title'] = isset($car['title']) ? $car['title'] : '';
$s['car_title'] = $s['car_title'] ? $s['car_title'] : (isset($car['title2']) ? $car['title2'] : '');
$s['car_number'] = $car['number2'] ?? '';
$s['car_title'] = $car['title'] ?? '';
$s['car_title'] = $s['car_title'] ? $s['car_title'] : ($car['title2'] ?? '');
$s['status'] = $status[$s['status_code']];
$orders[] = $s;
}
@@ -702,6 +709,6 @@ class OrderController extends Common
'users'=>$users,
'page'=>$this->page
];
exit(json_encode($return, JSON_UNESCAPED_UNICODE));
$this->result($return['msg'], $return['data'], $return['code']);
}
}