From 974cc83476b04cf2ab92cba76d9ea9b2c4338508 Mon Sep 17 00:00:00 2001 From: fm453 <393213759@qq.com> Date: Wed, 16 Jul 2025 03:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=A5api/gm=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E5=87=A0=E5=A4=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons-ctms/config/params.php | 1 + ctms-api/controllers/gm/v1/CityController.php | 2 +- .../controllers/gm/v1/JiaocheController.php | 1 + ctms-api/controllers/gm/v1/NewsController.php | 7 +++- ...atController.php => NewscatController.php} | 9 ++-- .../controllers/gm/v1/NoticeController.php | 42 ++++++++++++++----- .../controllers/gm/v1/OrderController.php | 34 ++++++++++----- .../controllers/gm/v1/StoreController.php | 7 +++- .../controllers/gm/v1/WeituorenController.php | 6 ++- 9 files changed, 80 insertions(+), 29 deletions(-) rename ctms-api/controllers/gm/v1/{NewsCatController.php => NewscatController.php} (98%) diff --git a/addons-ctms/config/params.php b/addons-ctms/config/params.php index 8fe1871..c266dc7 100755 --- a/addons-ctms/config/params.php +++ b/addons-ctms/config/params.php @@ -155,4 +155,5 @@ return [ 99=>[0,-1], ], //费用单支付状态在财审时的前置状态要求 'H5Links'=>'//h5.ctms.hiluker.com/', //前端H5链接 + 'mainDomain'=>'//dacms.hiluker.cn', //主域名 ]; diff --git a/ctms-api/controllers/gm/v1/CityController.php b/ctms-api/controllers/gm/v1/CityController.php index 92937c2..9d22c17 100755 --- a/ctms-api/controllers/gm/v1/CityController.php +++ b/ctms-api/controllers/gm/v1/CityController.php @@ -21,7 +21,7 @@ $apis = [ 'list'=>'城市列表', ]; - $this->result('您正使用CMTS-GM系统车主管理接口！', $apis, 200); + $this->result('您正使用CMTS-GM系统城市管理接口！', $apis, 200); } public function actionList() diff --git a/ctms-api/controllers/gm/v1/JiaocheController.php b/ctms-api/controllers/gm/v1/JiaocheController.php index 9d2dddd..bfa6fbd 100755 --- a/ctms-api/controllers/gm/v1/JiaocheController.php +++ b/ctms-api/controllers/gm/v1/JiaocheController.php @@ -31,6 +31,7 @@ class JiaocheController extends Common { + private $addtionWhere; public function beforeAction($action) { if (!$this->pid) { diff --git a/ctms-api/controllers/gm/v1/NewsController.php b/ctms-api/controllers/gm/v1/NewsController.php index 8ff0d16..bf0a9ee 100644 --- a/ctms-api/controllers/gm/v1/NewsController.php +++ b/ctms-api/controllers/gm/v1/NewsController.php @@ -36,10 +36,13 @@ class NewsController extends Common if (!$res) { $this->result('没有查询到相应的数据！', [], 0); } - + $news = []; + foreach ($res as $v) { + $news[] = $v->toArray(); + } $data= [ 'total'=>intval($s['query']->count()), - 'news' => $res, + 'news' => $news, 'page'=>$this->page ]; $this->result('文章查询成功！', $data, 200); diff --git a/ctms-api/controllers/gm/v1/NewsCatController.php b/ctms-api/controllers/gm/v1/NewscatController.php similarity index 98% rename from ctms-api/controllers/gm/v1/NewsCatController.php rename to ctms-api/controllers/gm/v1/NewscatController.php index d3f3b21..617faa2 100644 --- a/ctms-api/controllers/gm/v1/NewsCatController.php +++ b/ctms-api/controllers/gm/v1/NewscatController.php @@ -5,7 +5,7 @@ use addons\models\AcNewsCat; use Yii; use yii\data\Pagination; -class NewsCatController extends Common +class NewscatController extends Common { public function beforeAction($action) { @@ -37,10 +37,13 @@ class NewsCatController extends Common if (!$res) { $this->result('没有查询到相应的数据！', [], 0); } - + $cats = []; + foreach ($res as $v) { + $cats[$v->id] = $v->toArray(); + } $data= [ 'total'=>intval($s['query']->count()), - 'cats' => $res, + 'cats' => $cats, 'page'=>$this->page ]; $this->result('文章分类查询成功！', $data, 200); diff --git a/ctms-api/controllers/gm/v1/NoticeController.php b/ctms-api/controllers/gm/v1/NoticeController.php index 8503241..380d1a3 100644 --- a/ctms-api/controllers/gm/v1/NoticeController.php +++ b/ctms-api/controllers/gm/v1/NoticeController.php @@ -36,10 +36,10 @@ class NoticeController extends Common if (!$res) { $this->result('没有查询到相应的数据！', [], 0); } - + $notices = $this->formatList($res); $data= [ 'total'=>intval($s['query']->count()), - 'news' => $res, + 'notices' => $notices, 'page'=>$this->page ]; $this->result('通知查询成功！', $data, 200); @@ -58,7 +58,7 @@ class NoticeController extends Common if($sn) $res->sn = $sn; $res->save(); } - $this->result('文章信息查询完成', $res->toArray(), 200); + $this->result('通知信息查询完成', $res->toArray(), 200); } public function actionAdd() @@ -133,20 +133,20 @@ class NoticeController extends Common $detail->is_show = 0; $res = $detail->save(); if ($res) { - $msg = '文章隐藏标记成功'; + $msg = '通知隐藏标记成功'; $errorCode = 200; } else { - $msg = '文章隐藏标记失败'; + $msg = '通知隐藏标记失败'; } break; case 'show': $detail->is_show = 1; $res = $detail->save(); if ($res) { - $msg = '文章显示标记成功'; + $msg = '通知显示标记成功'; $errorCode = 200; } else { - $msg = '文章显示标记失败'; + $msg = '通知显示标记失败'; } break; default: @@ -176,9 +176,11 @@ class NoticeController extends Common $data = $data->andwhere($where2); } $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => $this->pageSize]); - $res = $data->offset($pages->offset)->limit($pages->limit)->orderBy('order_by DESC')->all(); - - return ['res'=>$res,'query'=>$data]; + $query = $data->offset($pages->offset)->limit($pages->limit); + //->orderBy('order_by DESC') + $res = $query->all(); + $arr = $query->asArray()->all(); + return ['res'=>$res,'query'=>$data,'arr'=>$arr]; } /* @@ -266,4 +268,24 @@ class NoticeController extends Common return $data; } + + private function formatList($res) + { + $unsets = ['pid','create_at','deleted']; + $list = []; + foreach ($res as $s) { + $s = $s->toArray(); + foreach ($unsets as $us) { + unset($s[$us]); + } + + $weekdays = [0=>'日',1=>'一',2=>'二',3=>'三',4=>'四',5=>'五',6=>'六']; + $wk = date('w', $s['update_at']); + $s['updateTime'] = date('Y-m-d ', $s['update_at']) . '星期'.$weekdays[$wk]; + $list[] = $s; + } + unset($s); + + return $list; + } } \ No newline at end of file diff --git a/ctms-api/controllers/gm/v1/OrderController.php b/ctms-api/controllers/gm/v1/OrderController.php index d682744..2fcd561 100755 --- a/ctms-api/controllers/gm/v1/OrderController.php +++ b/ctms-api/controllers/gm/v1/OrderController.php @@ -690,6 +690,15 @@ $search['is_commission'] = (int)$search['is_commission']; $where[] = ['=', 'is_commission', $search['is_commission']]; } + //是否验车 TD：查询结果异常，待 + if (isset($search['is_check'])) { + $search['is_check'] = (int)$search['is_check']; + if($search['is_check']){ + $where[] = ['<>', 'checker', '']; + }else{ + $where[] = ['=', 'checker', '']; + } + } //运单是否通过了财务确认 $search['is_cwqr'] = $search['is_cwqr'] ?? ($get['is_cwqr'] ?? ''); if ($search['is_cwqr'] != '') { @@ -1113,16 +1122,18 @@ { $detail = $order->toArray(); - $model = new Fans(); - $fans = $model->findOne($detail['from_mid']); - $user = $fans->toArray(); - $model = new AcFansExt(); - $_exts = $model->find()->where(['mid' => $detail['from_mid'],'mobile'=>$fans->mobile, 'pid' => $this->pid, 'deleted' => 0])->indexBy('id')->all(); - foreach ($_exts as $ext) { - $ext = $ext->toArray(); - $user[$ext['key']] = $ext['value']; + if($detail['from_mid']){ + $model = new Fans(); + $fans = $model->findOne($detail['from_mid']); + $user = $fans->toArray(); + $model = new AcFansExt(); + $_exts = $model->find()->where(['mid' => $detail['from_mid'],'mobile'=>$fans->mobile, 'pid' => $this->pid, 'deleted' => 0])->indexBy('id')->all(); + foreach ($_exts as $ext) { + $ext = $ext->toArray(); + $user[$ext['key']] = $ext['value']; + } + $detail['_user'] = $user; } - $detail['_user'] = $user; if ($detail['store_id']) { $model = new AcStore(); @@ -1180,7 +1191,7 @@ $detail['sn'] = $detail['sn'] ? $detail['sn'] : $sn; $weekdays = [0 => '日', 1 => '一', 2 => '二', 3 => '三', 4 => '四', 5 => '五', 6 => '六']; - $wk = date('w', $detail['date']); + $wk = date('w', $detail['sign_date']); $detail['signdate'] = date('Y-m-d 星期' . $weekdays[$wk], $detail['sign_date']); $detail['from_province'] = isset($detail['start_province']) ? Yii::$app->params['regionAreas'][$detail['start_province']] : ''; $detail['to_province'] = isset($detail['aim_province']) ? Yii::$app->params['regionAreas'][$detail['aim_province']] : ''; @@ -1193,7 +1204,8 @@ $detail[$k] = $detail[$k] ? $detail[$k] : '/pics/nopic.jpg'; $url_pre = substr($detail[$k], 0, 4); if ($url_pre == '/pic') { - $detail[$k . '_url'] = Url::to('@upload' . $detail[$k], $this->imgHttp); +// $detail[$k . '_url'] = Url::to('@upload' . $detail[$k], $this->imgHttp); + $detail[$k . '_url'] = Yii::$app->params['mainDomain'] .'/'.$imgDir. $detail[$k]; } else if ($url_pre == 'http') { $detail[$k . '_url'] = $detail[$k]; } diff --git a/ctms-api/controllers/gm/v1/StoreController.php b/ctms-api/controllers/gm/v1/StoreController.php index c0c457c..eb00fd1 100755 --- a/ctms-api/controllers/gm/v1/StoreController.php +++ b/ctms-api/controllers/gm/v1/StoreController.php @@ -38,9 +38,13 @@ if (!$res) { $this->result('没有查询到相应的数据！', [], 0); } + $stores = []; + foreach ($res as $v) { + $stores[] = $v->toArray(); + } $data= [ 'total'=>$s['query']->count(), - 'stores' => $res, + 'stores' => $stores, 'page'=>$this->page ]; $this->result('网点列表查询成功！', $data, 200); @@ -180,6 +184,7 @@ $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => $this->pageSize]); $_orderby = 'order_by DESC'; $res = $data->offset($pages->offset)->limit($pages->limit)->orderBy($_orderby)->all(); + return ['res'=>$res,'query'=>$data]; } diff --git a/ctms-api/controllers/gm/v1/WeituorenController.php b/ctms-api/controllers/gm/v1/WeituorenController.php index 8c090c7..ae7b95d 100755 --- a/ctms-api/controllers/gm/v1/WeituorenController.php +++ b/ctms-api/controllers/gm/v1/WeituorenController.php @@ -42,10 +42,14 @@ if (!$res) { $this->result('没有查询到相应的数据！', [], 0); } + $weituoren = []; + foreach ($res as $key=>$val) { + $weituoren[$key] = $val->toArray(); + } $data= [ 'total'=>$s['query']->count(), - 'weituoren' => $res, + 'weituoren' => $weituoren, 'page'=>$this->page ]; $this->result('合作单位查询成功！', $data, 200);