From 90082f2a06c1cc685e2c9d927001dc99737ee15f Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 15 Oct 2019 09:59:44 +0800 Subject: [PATCH 01/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=87=E8=8A=B3?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/common/index.php | 2 +- frontend/views/common/login.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/views/common/index.php b/frontend/views/common/index.php index cfc8824..48c4e27 100644 --- a/frontend/views/common/index.php +++ b/frontend/views/common/index.php @@ -4,7 +4,7 @@ - 汇盈车险业务系统 - 主页 + 万芳车险业务系统 - 主页 diff --git a/frontend/views/common/login.php b/frontend/views/common/login.php index b74cc42..eea8960 100644 --- a/frontend/views/common/login.php +++ b/frontend/views/common/login.php @@ -30,7 +30,7 @@
-

汇盈车险业务系统

+

万芳车险业务系统

From 799722fdcc7f826b6d3f022af9c7aa357c13c2a4 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 15 Oct 2019 10:04:46 +0800 Subject: [PATCH 02/63] =?UTF-8?q?=E6=9B=B4=E6=8D=A2ico=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/web/favicon.ico | Bin 318 -> 4286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico index 580ed732e86556ec57f3f3395a210246d679c076..1502235d0d57494c91a763dcae8bfc2b7b31fda8 100644 GIT binary patch literal 4286 zcmc&&iEo?b8Fx-Qr*l%mF?!Gx+R_$UTDtYf(IyQkFlj?j#7fD!mQtFdiQ}Zerg9C5 z3f6U0Xb8qp#@IN-hDN7Rp$?E(5zsQoWhcJ<+0JF>u>ILde)~PIlZpReK~LY$-}n0Y z9nbT;pM}AY#{U*CHpst*KNT4aml+I(>lnOcsA9-{^~Yx=d8tUi)e z>xco4w;n=-`yHP?kD+D*T-~|wbaEf_d5PiWwZxF63?W&qCO8>#PgXzoxaFGp{719U z|L~RY*v?^!IfqB>uswP;wDv4M7u*~K$X#(D7vIqg*dD7ygj`2QdSN?OM(ixOtwxp8 z*O?2A`89GLu$EJ=5e{oEIiz^``P|JIAGtk$;JbmX7CkN-hPQ%fX0dH3x z@$*zZ`JUu)b(t{Ok`1lzV@zcv%)wkv z=2UqtCgPV-qe*d+?<-%py5>0wF9{#_c&+*Hv}VKhUboWay7&%kt?AI{xi;TBqTkuY zedJ|->7LZS*Y1H^=`UbybLeZ%Jf;aYYbm*yh#@|vw96`cQl4<-wQ%!t6@I-(xzBkX zQStUK&2SUT%RZ4FQo6{~+e-XrH!1y&501linEulzza@{pvS;ao-%`Z-mneLxq0~cg zRDGCBG`WR`x}L8|7yFC3ZO_*+cN}B!aSS|t1AOi2)RqU2swHzt4<28Fh#o;;@G}gx z=OI9Eluyj(vlb%IX-2QLh&_|7W#fSg3_?l92v%kdKdb9DIoN{rEW~>4E#x z7vT_pna{!R$_#4l85n$G1xDi$j7Yg zJQ`m2mLU_9KIWIf|PE}!?{Dy-)uy-#~ z`2roq2zC_lnl)-GQ2iHRAFBQ(wwxskvnVx^dP>N1nFHyCLC%+pJ?5nc_IKM?V$GP6m8vX52bzZo>{4@Q^M$l>|F15FrS;GSMO+IX$#q`7YzjIINlOATs zwe+B97kqWba8>65Iruw_=gAwnF1s z;qT;}w&z1@rAN&LoL&0gS*mn7s7-1sA+x`LyMXPK=d6=>qk4d!ee~Hy58UTYs9A_6 z1Dz$TOPb#CrpYcSZHq0Y-dM;3dQKC{ja&aIpa-c}=eU$~t!J%W+RVf6j( zHVjd#4v7PKQ zXA8L>DJ1s1ZfX{M*ZvX=H5J3YuL!-LpTXp890|_P>>QAs1*Ul|@A=TM9gZ*Gz|h&p zF!0nW^tTx~?-upDV&IPl)jKY5tQ3Bphkn8B;My*8&EF-QFVXEiOuR$VYxJD;cKxCR z&ilz@ZzzE$Kw@;4j02i{Gs~_F?0_(?x80?$yIfX&LoI4 ziI2|@qvfXo9Jxcosi#8t$AO=)ocoV@POgnM5$oIlGV9)G*+$wJRv`RLhu4Zb_H8oh^a!Z(lX#>@;&#|$oB z8be)q0NXR8sL6?9bNUpj%%iw>a|rEwhVk;VL418Ngb95L!Z$uQqxj5m@@FxMSkjHK z`yAY7pF!W7R`kDc5WSB#qW9E3^t|;X>>vFBgBL!8-`R^ucov)K?HZo$2%_^oFP^e!c5Vtf`uRlz8FddG07XN1>dXeiXNqflxVM@?p&T;f<~h>}l?{9;(e zsO0BL!!%ZKy_T_*_m*+r^%?BtnK68FehgK)VKkIcr)Xc4!0ts!6?LUC>>`g{z8Z%%F^0w~La540V0$)sWk-1(!?vurx>uc*#MbNtHfHPCq}BvBWRsgo#~P!K z)tNB{-&c_k-g#vNTQkGN)*;&KOXEs+eHk$s4dpS^moSQ01JeX9d^XP7PGJ8|`cEy@ zrWiRy@xu(RX*#y1C$OGzb0#BQ$9mpdn;yq%>RpwkV-?qx+*_HU!x{49{69yr#YFw| zS~%WB%N_r#M*QX`0g8Y`JCvoc6F1S3SXuNV9bw%H+ciA)=$f2%~T=JvXDPh*J znR=UQe3+b@U>{Cle}j)T=bU6FQN^4aGm_LR`gP*#xRD&za22nw=WGl9b%LEXgKN{0 z*mac`k3XQ{jwKP)7DuU{LEXEQ-^3(-ZJv&ujM}_7wy}n{m`3pRS7CaPz`2hC?6n9s z6aSWs8Qh$~I#cUS#8^w*HR*zxV6VlnlK7SB#HDV*77mR+7{*rPG-^wxQ772!vj%!z zZ;oRJXJ4>)oN5DIvJx z^9tUVs3hhxVlSgl%egjOHLQA0`g?aNITX`x(OeKmb$${%h%d9X-AL_OQB-r?V9>E= za{!T~c%b9$H$uc8!AADmI>F7<74B;4m%6W@<^{h6^IAg+dpSM2bKNj%%qh=ni>1d{ z^8(g0FM- From 80d6ccb647ab634f9cc5f7092e647d65ffb3f302 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 15 Oct 2019 10:27:47 +0800 Subject: [PATCH 03/63] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/common/index.php | 2 +- frontend/views/common/login.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/views/common/index.php b/frontend/views/common/index.php index 48c4e27..acf5e10 100644 --- a/frontend/views/common/index.php +++ b/frontend/views/common/index.php @@ -4,7 +4,7 @@ - 万芳车险业务系统 - 主页 + 万方车险业务系统 - 主页 diff --git a/frontend/views/common/login.php b/frontend/views/common/login.php index eea8960..a903eb0 100644 --- a/frontend/views/common/login.php +++ b/frontend/views/common/login.php @@ -5,7 +5,7 @@ - 登录 - 汇盈车险业务系统 + 登录 - 万方车险业务系统 @@ -30,7 +30,7 @@
-

万芳车险业务系统

+

万方车险业务系统

From a08c0ff17042b91571a8431eeb0f4ee526ad5a5b Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 09:50:50 +0800 Subject: [PATCH 04/63] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/models/CarT.php | 2 +- composer.json | 3 +- composer.lock | 103 ++- frontend/controllers/CarController.php | 40 +- frontend/controllers/FinanceController.php | 20 +- frontend/controllers/Gift2Controller.php | 591 ------------------ frontend/controllers/GiftController.php | 120 ++++ frontend/controllers/GiftGroupController.php | 141 ----- frontend/controllers/GiftTypeController.php | 298 --------- .../MarketingStrategyController.php | 15 +- frontend/views/car/edit.php | 35 +- frontend/views/common/index.php | 2 +- frontend/views/finance/car-update-frame.php | 10 - frontend/views/gift-group/edit.php | 84 --- frontend/views/gift-group/index.php | 79 --- frontend/views/gift-type/edit.php | 42 -- frontend/views/gift-type/index.php | 64 -- frontend/views/gift-type/type2-edit.php | 42 -- frontend/views/gift-type/type2-list.php | 64 -- frontend/views/gift-type/type3-edit.php | 65 -- frontend/views/gift-type/type3-list.php | 70 --- frontend/views/gift/gift-use.php | 167 +++++ frontend/views/gift/index.php | 4 +- 23 files changed, 429 insertions(+), 1632 deletions(-) delete mode 100644 frontend/controllers/Gift2Controller.php delete mode 100644 frontend/controllers/GiftGroupController.php delete mode 100644 frontend/controllers/GiftTypeController.php delete mode 100644 frontend/views/gift-group/edit.php delete mode 100644 frontend/views/gift-group/index.php delete mode 100644 frontend/views/gift-type/edit.php delete mode 100644 frontend/views/gift-type/index.php delete mode 100644 frontend/views/gift-type/type2-edit.php delete mode 100644 frontend/views/gift-type/type2-list.php delete mode 100644 frontend/views/gift-type/type3-edit.php delete mode 100644 frontend/views/gift-type/type3-list.php create mode 100644 frontend/views/gift/gift-use.php diff --git a/common/models/CarT.php b/common/models/CarT.php index 78b7ef2..b82eecf 100644 --- a/common/models/CarT.php +++ b/common/models/CarT.php @@ -62,7 +62,7 @@ class CarT extends \common\models\Base public function rules() { return [ - [['user_id', 'car_type_id', 'car_use_id'], 'required'], + [['user_id', 'car_use_id'], 'required'], [['user_id', 'car_type_id', 'car_use_id','seats','brand_id','series_id','displacement_id','location','invalid_id','invalid_flag','is_track','times','biaozhu','hiddenes'], 'integer'], [['register_date', 'insurer1_date', 'insurer2_date','id_man','id_number','print_date','car_man_number', 'created_at', 'updated_at'], 'safe'], [['car_no', 'factory_model', 'car_model', 'engine_no', 'car_frame_no','old_user','id_phone'], 'string', 'max' => 50], diff --git a/composer.json b/composer.json index 1defbc9..4d25cdc 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "yiisoft/yii2-swiftmailer": "*", "phpoffice/phpspreadsheet": "^1.9", "codeception/codeception": "^3.1", - "yiisoft/yii2-imagine": "^2.2" + "yiisoft/yii2-imagine": "^2.2", + "phpoffice/phpexcel": "^1.8" }, "require-dev": { "yiisoft/yii2-debug": "*", diff --git a/composer.lock b/composer.lock index e792221..9652f66 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b5a4d09fa55d0deca37e307ccb669e36", + "content-hash": "4e10a054c08f42ba7431449d509147d7", "packages": [ { "name": "behat/gherkin", @@ -2227,6 +2227,75 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "time": "2019-08-22T18:11:29+00:00" }, + { + "name": "phpoffice/phpexcel", + "version": "1.8.2", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PHPExcel.git", + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870", + "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "php": "^5.2|^7.0" + }, + "require-dev": { + "squizlabs/php_codesniffer": "2.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "PHPExcel": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Maarten Balliauw", + "homepage": "http://blog.maartenballiauw.be" + }, + { + "name": "Erik Tilt" + }, + { + "name": "Franck Lefevre", + "homepage": "http://rootslabs.net" + }, + { + "name": "Mark Baker", + "homepage": "http://markbakeruk.net" + } + ], + "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", + "homepage": "https://github.com/PHPOffice/PHPExcel", + "keywords": [ + "OpenXML", + "excel", + "php", + "spreadsheet", + "xls", + "xlsx" + ], + "abandoned": "phpoffice/phpspreadsheet", + "time": "2018-11-22T23:07:24+00:00" + }, { "name": "phpoffice/phpspreadsheet", "version": "1.9.0", @@ -5235,7 +5304,13 @@ "type": "zip", "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.3.3 || ^7.0" @@ -5285,7 +5360,13 @@ "type": "zip", "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7", "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.4 || ^7.0" @@ -5346,7 +5427,13 @@ "type": "zip", "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a", "reference": "0464787bfa7cd13576c5a1e318709768798bec6a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "type": "library", "extra": { @@ -5448,7 +5535,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/3df62b1dcb272a8413f9c6e532c9d73f325ccde1", "reference": "3df62b1dcb272a8413f9c6e532c9d73f325ccde1", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "fzaninotto/faker": "~1.4", diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 0d63e23..9c6170b 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -454,26 +454,14 @@ class CarController extends BaseController $car_frame_no = $request->post('car_frame_no'); $factory_model = $request->post('factory_model'); $seats = $request->post('seats'); - $car_type_id = $request->post('car_type_id'); $car_use_id = $request->post('car_use_id'); $register_date = $request->post('register_date'); - $car_year = $request->post('car_year'); - $brand_id = $request->post('brand_id',0); - $factory_id = $request->post('factory_id',0); - $series_id = $request->post('series_id',0); - $displacement_id = $request->post('displacement_id',0); - $year_id = $request->post('year_id',0); - $model_id = $request->post('model_id',0); $car_man = $request->post('car_man'); + $car_man_type = $request->post('car_man_type'); $phone = $request->post('phone'); $car_man_number = $request->post('car_man_number'); - $insurer1_date = $request->post('insurer1_date'); - $insurer2_date = $request->post('insurer2_date'); - $company = $request->post('company'); + $purchase_price = $request->post('purchase_price'); $remark = $request->post('remark'); - $op_user1 = $request->post('op_user1'); - $op_user2 = $request->post('op_user2'); - $op_user3 = $request->post('op_user3'); if($car_no == '') { $result['msg'] = '请输入车牌号码!'; @@ -498,30 +486,18 @@ class CarController extends BaseController $row->factory_model = $factory_model; $row->car_model = $factory_model; $row->seats = $seats; - $row->car_type_id = $car_type_id; + $row->purchase_price = $purchase_price; $row->car_use_id = $car_use_id; $row->register_date = $register_date; - $row->car_year = $car_year; - $row->brand_id = $brand_id; - $row->factory_id = $factory_id; - $row->series_id = $series_id; - $row->displacement_id = $displacement_id; - $row->year_id = $year_id; - $row->model_id = $model_id; $row->car_man = $car_man; $row->phone = $phone; $row->car_man_number = $car_man_number; $row->remark = $remark; - if($insurer1_date != '') - $row->insurer1_date = $insurer1_date; - if($insurer2_date != '') - $row->insurer2_date = $insurer2_date; - if($company != '') - $row->company = $company; - $row->op_user1 = $op_user1; - $row->op_user2 = $op_user2; - $row->op_user3 = $op_user3; - $row->save(); + $row->car_man_type = $car_man_type; + if(!$row->save()) { + $result['msg'] = print_r($row->getErrors(), true); + return $result; + } $result['success'] = true; $result['msg'] = '保存成功'; diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 2a588f7..ee9b715 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -6464,17 +6464,11 @@ class FinanceController extends \frontend\controllers\UserBaseController if($car_man_phone != ''){ $car_info->phone = $car_man_phone; } - - - - - - -// $car_info->save(); - if(!$car_info->save(false)) { + if(!$car_info->save(false)) { var_dump($car_info->errors); exit; } + $insert_total++; } @@ -6528,9 +6522,6 @@ class FinanceController extends \frontend\controllers\UserBaseController if($car_man_phone != ''){ $car_info->phone = $car_man_phone; } - - -// $car_info->save(); if(!$car_info->save(false)) { var_dump($car_info->errors); exit; @@ -6539,13 +6530,6 @@ class FinanceController extends \frontend\controllers\UserBaseController } } -// $log = new ImportLogT(); -// $datacount=$rowCount; -// $log->filename = $base_filename; -// $log->total = $datacount; -// $log->success = $insert_total; -// $log->success_rate = ($insert_total/$datacount) * 100; -// $log->save(); $result['success'] = true; $result['msg'] = '操作成功'; diff --git a/frontend/controllers/Gift2Controller.php b/frontend/controllers/Gift2Controller.php deleted file mode 100644 index 35e7632..0000000 --- a/frontend/controllers/Gift2Controller.php +++ /dev/null @@ -1,591 +0,0 @@ -request->cookies; - $user_id = MyLib::encrypt($cookie->get('aid'),'DECODE'); - - if($user_id != 0) - { - $this->my = UserT::findOne(['id'=>$user_id]); - } else { - Yii::$app->response->redirect('/common/login')->send(); - exit; - } - } - - public function actionGift1Index() - { - $request = Yii::$app->request; - $code = $request->get('code'); - $car_no = $request->get('car_no'); - $status = $request->get('status',6); - $type_id = $request->get('type_id',0); - $page = $request->get('page',1); - if($page < 1) $page = 1; - - $query = GiftTicketT::find() - ->orderBy('id DESC'); - if($code != '') { - $query = $query->andWhere('code="'.$code.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_no like "'.$car_no.'"'); - } - if($status != '' && $status != 6) { - $query = $query->andWhere('status='.$status); - } - if($type_id > 0) { - $query = $query->andWhere('type_id='.$type_id); - } -// echo $query->createCommand()->rawSql; - $total = $query->count(); - - $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]); - $pagination->setPage($page-1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); - $items = $query->all(); - - $type_items = GiftType2T::find()->all(); - $page_info = MyLib::getPageInfo($pagination); - - return $this->render('gift1-index',[ - 'items' => $items, - 'code' => $code, - 'car_no' => $car_no, - 'page' => $page, - 'page_info' => $page_info, - 'status' => $status, - 'type_items' => $type_items, - 'type_id' => $type_id, - ]); - } - - public function actionGift2Index() - { - return $this->render('gift2-index'); - } - - public function actionIndex() - { - $request = Yii::$app->request; - $code = $request->get('code'); - $car_no = $request->get('car_no'); - $page = $request->get('page',1); - if($page < 1) $page = 1; - - $query = GiftTicketT::find() - ->orderBy('id DESC'); - if($code != '') { - $query = $query->andWhere('code="'.$code.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_no="'.$car_no.'"'); - } -// echo $query->createCommand()->rawSql; - $total = $query->count(); - - $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]); - $pagination->setPage($page-1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); - $items = $query->all(); - - $page_info = MyLib::getPageInfo($pagination); - - return $this->render('index',[ - 'items' => $items, - 'code' => $code, - 'car_no' => $car_no, - 'page' => $page, - 'page_info' => $page_info - ]); - } - - public function actionAdd() - { - $request = Yii::$app->request; - $type_items = GiftType2T::find()->all(); - - return $this->render('add',[ - 'type_items' => $type_items, - ]); - } - - public function actionAddSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $min_code = $request->post('min_code'); - $max_code = $request->post('max_code'); - $type_id = $request->post('type_id'); - - if($min_code == '') { - $result['msg'] = '请输入开始编号!'; - return $result; - } - if($max_code == '') { - $result['msg'] = '请输入结束编号!'; - return $result; - } - if($type_id == 0) { - $result['msg'] = '请选择类型!'; - return $result; - } - - $row = null; - for($i = $min_code; $i <= $max_code; $i++) { - $row = GiftTicketT::findOne(['code'=>$i,'type_id'=>$type_id]); - if(!$row) { - $row = new GiftTicketT(); - $row->code = $i; - $row->type_id = $type_id; - $row->input_date = date('Y-m-d H:i:s'); - $row->op_id = $this->my->id; - $row->status = 0; - $row->save(); - } - } - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionOutput() - { - $request = Yii::$app->request; - $type_items = GiftType2T::find()->all(); - - $gift_group_items = GiftGroupT::find()->all(); - - return $this->render('output',[ - 'type_items' => $type_items, - 'gift_group_items' => $gift_group_items, - ]); - } - - public function actionOutputSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $codes = $request->post('codes',array()); - $types = $request->post('types',array()); - $car_no = $request->post('car_no'); - - $tran = GiftTicketT::getDb()->beginTransaction(); - try { - foreach($types as $index => $type_id) { - if($type_id == 0) continue; - $ticket_info = GiftTicketT::findOne(['code'=>$codes[$index],'type_id'=>$type_id]); - if(!$ticket_info) { - $result['msg'] = '第'.($index+1).'组礼品编号不存在!'; - return $result; - } - if($ticket_info->status != 0) { - $result['msg'] = '第'.($index+1).'组礼品编号已经出库!'; - return $result; - } - $ticket_info->group_id = 0; - $ticket_info->car_no = $car_no; - $ticket_info->status = 1; - $ticket_info->use_date = date('Y-m-d H:i:s'); - $ticket_info->op_id = $this->my->id; - if(!$ticket_info->save()) { - var_dump($ticket_info->errors); - } - } - - $tran->commit(); - } catch(\Exception $e) { - $tran->rollBack(); - throw $e; - } - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionEdit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $back_params = $request->get('back_params'); - if($id > 0) { - $info = GiftTicketT::findOne(['id'=>$id]); - } else { - $info = new GiftTicketT(); - } - - $type_items = GiftTypeT::find()->all(); - - return $this->render('edit',[ - 'info' => $info, - 'type_items' => $type_items, - 'back_params' => $back_params, - ]); - } - - public function actionSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id'); - $status = $request->post('status'); - $car_no = $request->post('car_no'); - - $ticket_info = GiftTicketT::findOne(['id'=>$id]); - if(!$ticket_info) { - $result['msg'] = '礼品券不存在!'; - return $result; - } - - $ticket_info->car_no = $car_no; - $ticket_info->status = $status; - $ticket_info->use_date = date('Y-m-d H:i:s'); - $ticket_info->op_id = $this->my->id; - $ticket_info->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionDelete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = GiftTicketT::findOne(['id'=>$id]); - if($row->status == 0) { - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - - } - } - return $result; - } - - public function actionTicket2List() - { - $request = Yii::$app->request; - $code = $request->get('code'); - $car_no = $request->get('car_no'); - $type_id = $request->get('type_id',0); - $page = $request->get('page',1); - if($page < 1) $page = 1; - - $query = GiftTicketT::find() - ->where('status=1') - ->orderBy('id DESC'); - if($code != '') { - $query = $query->andWhere('code="'.$code.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_no like "'.$car_no.'"'); - } - if($type_id > 0) { - $query = $query->andWhere('type_id='.$type_id); - } -// echo $query->createCommand()->rawSql; - $total = $query->count(); - - $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]); - $pagination->setPage($page-1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); - $items = $query->all(); - - $type_items = GiftType2T::find()->all(); - $page_info = MyLib::getPageInfo($pagination); - - return $this->render('ticket2-list',[ - 'items' => $items, - 'code' => $code, - 'car_no' => $car_no, - 'page' => $page, - 'page_info' => $page_info, - 'type_items' => $type_items, - 'type_id' => $type_id, - ]); - } - - public function actionTicket2Output() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id == 0) { - echo '无效礼券'; - exit; - } - $ticket_info = GiftTicketT::findOne(['id'=>$id]); - - $gift_items = Gift2T::find()->all(); - $type_items = GiftType2T::find()->all(); - - return $this->render('ticket2-output',[ - 'ticket_info' => $ticket_info, - 'gift_items' => $gift_items, - 'type_items' => $type_items - ]); - } - - public function actionTicket2OutputSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $ticket_id = $request->post('ticket_id'); - $gift_id = (int)$request->post('gift_id'); - $send_type = $request->post('send_type'); - $send_no = $request->post('send_no'); - - $ticket_info = GiftTicketT::findOne(['id'=>$ticket_id]); - if(!$ticket_info) { - $result['msg'] = '礼品编号不存在!'; - return $result; - } - - if($gift_id == 0) { - $result['msg'] = '请选择礼品!'; - return $result; - } - - $ticket2_info = new GiftTicket2T(); - $ticket2_info->ticket_id = $ticket_info->id; - $ticket2_info->gift_id = $gift_id; - $ticket2_info->send_type = $send_type; - $ticket2_info->send_no = $send_no; - - $ticket2_info->status = 1; - $ticket2_info->op_id = $this->my->id; - $ticket2_info->use_date = date('Y-m-d H:i:s'); - - $ticket2_info->save(); - - $ticket_info->status = 2; - $ticket_info->use_date; - $ticket_info->op_id = $this->my->id; - $ticket_info->save(); - - //礼品 - $gift_info = Gift2T::findOne(['id'=>$gift_id]); - $gift_info->total = $gift_info->total - 1; - $gift_info->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionTicket2Edit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id > 0) { - $info = GiftTicket2T::findOne(['id'=>$id]); - } else { - $info = new GiftTicket2T(); - } - - $gift_items = GiftT::find()->all(); - $type_items = GiftTypeT::find()->all(); - - return $this->render('ticket2-edit',[ - 'info' => $info, - 'gift_items' => $gift_items, - 'type_items' => $type_items - ]); - } - - public function actionTicket2Save() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $status = (int)$request->post('status'); - - $row = GiftTicket2T::findOne(['id'=>$id]); - $gift_info = $row->gift; - $gift_info->total = $gift_info->total + 1; - $gift_info->save(); - $row->status = 3; - $row->use_date = date('Y-m-d H:i:s'); - $row->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionGift2List() - { - $request = Yii::$app->request; - $name = $request->get('name'); - - $query = Gift2T::find(); - if($name != '') { - $query = $query->andWhere(['like','name',$name]); - } - $items = $query->all(); - - return $this->render('gift2-list',[ - 'items' => $items, - 'name' => $name - ]); - } - - public function actionGift2Edit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id > 0) { - $info = Gift2T::findOne(['id'=>$id]); - } else { - $info = new GiftT(); - } - - return $this->render('gift2-edit',[ - 'info' => $info - ]); - } - - public function actionGift2Save() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $name = $request->post('name'); - $price = $request->post('price'); - $remark = $request->post('remark'); - $total = (int)$request->post('total'); - - if($name == '') { - $result['msg'] = '请输入名称!'; - return $result; - } - - $row = null; - if($id > 0) { - $row = Gift2T::findOne(['id'=>$id]); - } else { - $row = new Gift2T(); - } - $row->name = $name; - $row->price = $price; - $row->remark = $remark; - $row->total = $total; - $row->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionGift2Delete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = Gift2T::findOne(['id'=>$id]); - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - } - return $result; - } - - public function actionStastics() - { - $gift_type_items = GiftType2T::find()->all(); - $gift_items = Gift2T::find()->all(); - - return $this->render('stastics',[ - 'gift_type_items' => $gift_type_items, - 'gift_items' => $gift_items, - ]); - } -} diff --git a/frontend/controllers/GiftController.php b/frontend/controllers/GiftController.php index 394feac..43a0842 100644 --- a/frontend/controllers/GiftController.php +++ b/frontend/controllers/GiftController.php @@ -784,6 +784,126 @@ class GiftController extends \yii\web\Controller return $data; } + public function actionGiftUse() { + $type_items = GiftT::find() + ->where(['type_id'=>1,'is_delete'=>0]) + ->all(); + return $this->render('gift-use', [ + 'type_items' => $type_items + ]); + } + + public function actionGiftUseJson() + { + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $code = $request->get('code'); + $car_id = $request->get('car_id',0); + $car_no = $request->get('car_no'); + $order_id = $request->get('order_id'); + $username = $request->get('username'); + $s_begin_date = $request->get('s_begin_date'); + $s_end_date = $request->get('s_end_date'); + $p_begin_date = $request->get('p_begin_date'); + $p_end_date = $request->get('p_end_date'); + $status = $request->get('status'); + $frame_no = $request->get('frame_no'); + $engine_no = $request->get('engine_no'); + $insurer1_no = $request->get('insurer1_no'); + $type_id = $request->get('type_id'); + $offset = $request->get('offset',0); + $limit = $request->get('limit', 10); + + $query = GiftTicketTUse::find() + ->leftJoin('order_t','order_t.id=gift_ticket_t_use.order_id') + ->leftJoin('gift_t','gift_t.id=gift_ticket_t_use.type_id') + ->leftJoin('user_t','user_t.id=gift_ticket_t_use.user_id') + ->where('gift_t.type_id=2') + ->orderBy('id DESC'); + if($code != '') { + $query->andWhere('gift_ticket_t_use.code="'.$code.'"'); + } + if($car_id > 0) { + $query->andWhere('order_t.car_id='.$car_id); + } + if($order_id > 0) { + $query->andWhere('order_t.id='.$order_id); + } + if($car_no != '') { + $query->andWhere('gift_ticket_t_use.car_no like "'.$car_no.'"'); + } + if($username != ''){ + $user = UserT::find()->where('username="'.$username.'"')->andWhere('is_delete=0')->one(); + $query->andWhere('gift_ticket_t_use.op_id='.$user->id); + } + + if($s_begin_date != ''){ + $query->andWhere('order_t.submit_date>="'.$s_begin_date.'"'); + } + if($s_end_date != ''){ + $query = $query->andWhere('order_t.submit_date<="'.$s_begin_date.'"'); + } + if($p_begin_date != ''){ + $query = $query->andWhere('order_t.print_date>="'.$p_begin_date.'"'); + } + if($p_end_date != ''){ + $query = $query->andWhere('order_t.print_date<="'.$p_begin_date.'"'); + } + + if ($status == 1) {//礼券未使用 + $query = $query->andWhere('gift_t.type_id=2 and gift_ticket_t_use.status=1'); + } elseif ($status == 2) {//礼券使用中 + $query = $query->andWhere('gift_t.type_id=2 and gift_ticket_t_use.status=2'); + } + if ($status == 3) {//礼券使用完 + $query = $query->andWhere('gift_t.type_id=2 and gift_ticket_t_use.status=3'); + } + if ($status == 4) {//礼品未出库 + $query = $query->andWhere('gift_t.type_id=1 and gift_ticket_t_use.status=1'); + } + if ($status == 5) {//礼品已出库 + $query = $query->andWhere('gift_t.type_id=1 and gift_ticket_t_use.status=3'); + } + + if($frame_no != '') { + $query = $query->andWhere('order_t.car_frame_no="'.$frame_no.'"'); + } + if($engine_no != '') { + $query = $query->andWhere('order_t.engine_no="'.$engine_no.'"'); + } + if($insurer1_no != '') { + $query = $query->andWhere('order_t.insurer1_no='.$insurer1_no); + } + if($type_id > 0) { + $query = $query->andWhere('gift_ticket_t_use.type_id='.$type_id); + } + +// echo $query->createCommand()->rawSql; + $total = $query->count(); + $items = $query->offset($offset)->limit($limit)->all(); + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($items as $item) { + $order_info = $item->order; + $gift_info = $item->typeNew; + + $row = $item->toArray(); + $row['name'] = $gift_info->name; + $row['car_no'] = $item->car_no; + $row['car_frame_no'] = $order_info->car_no; + $row['op'] = $item->op?$item->op->getShowName():''; + $row['finished_date'] = $item->finished_date != '0000-00-00'?$item->finished_date:''; + $row['username'] = ($item->user && $item->status > 0)?$item->user->getShowName():''; + $row['submit_user'] = $order_info->user ? $order_info->user->getShowName():''; + $row['status'] = $item->getStatus(); + $row['use_num'] = $gift_info->use_num; + $data['rows'][] = $row; + } + + return $data; + } + public function actionTicketUse() { $type_items = GiftT::find() ->where(['type_id'=>2,'is_delete'=>0]) diff --git a/frontend/controllers/GiftGroupController.php b/frontend/controllers/GiftGroupController.php deleted file mode 100644 index 9ddcd35..0000000 --- a/frontend/controllers/GiftGroupController.php +++ /dev/null @@ -1,141 +0,0 @@ -request->cookies; - $user_id = MyLib::encrypt($cookie->get('aid'),'DECODE'); - - if($user_id != 0) - { - $this->my = UserT::findOne(['id'=>$user_id]); - } else { - Yii::$app->response->redirect('/common/login')->send(); - exit; - } - } - - public function actionIndex() - { - $request = Yii::$app->request; - $name = $request->get('name'); - - $query = GiftGroupT::find() - ->orderBy('id ASC') - ->where('id>0'); - if($name != '') { - $query = $query->andWhere('name like "'.$name.'%"'); - } - $total = $query->count(); - - $items = $query->all(); - - return $this->render('index',[ - 'items' => $items, - 'name' => $name - ]); - } - - public function actionEdit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $info = GiftGroupT::findOne(['id'=>$id]); - if(!$info) - $info = new GiftGroupT(); - $gifts = $info->gifts; - $gift_ids = array(); - if($gifts) { - foreach($gifts as $gift) { - $gift_ids[] = $gift->id; - } - } - - $gift_items = GiftType3T::find()->all(); - - return $this->render('edit',[ - 'info'=>$info, - 'gift_ids'=>$gift_ids, - 'gift_items'=>$gift_items - ]); - } - - public function actionSave() { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - if($request->isPost) { - $id = intval($request->post('id')); - $name = $request->post('name'); - $is_free = $request->post('is_free',0); - $is_damage = $request->post('is_damage',0); - $gift_ids = $request->post('gift_ids'); - $gift_str = join(',',$gift_ids); - $min_money = $request->post('min_money'); - $max_money = $request->post('max_money'); - $group_ids = $request->post('group_ids'); - - $row = null; - if($id > 0) { - $row = GiftGroupT::findOne(['id'=>$id]); - } else { - $row = new GiftGroupT(); - } - $row->name = $name; - $row->is_free = $is_free; - $row->is_damage = $is_damage; - $row->gift_ids = $gift_str; - $row->min_money = $min_money; - $row->max_money = $max_money; - $row->group_ids = $group_ids; - if(!$row->save()) { - var_dump($row->errors); - } - - $result['success'] = true; - $result['msg'] = '操作成功'; - return $result; - } - $result['success'] = false; - $reuslt['msg'] = '操作失败'; - return $result; - } - - public function actionDelete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = GiftGroupT::findOne(['id'=>$id]); - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - } - return $result; - } -} diff --git a/frontend/controllers/GiftTypeController.php b/frontend/controllers/GiftTypeController.php deleted file mode 100644 index d975671..0000000 --- a/frontend/controllers/GiftTypeController.php +++ /dev/null @@ -1,298 +0,0 @@ -request->cookies; - $user_id = MyLib::encrypt($cookie->get('aid'),'DECODE'); - - if($user_id != 0) - { - $this->my = UserT::findOne(['id'=>$user_id]); - } else { - Yii::$app->response->redirect('/common/login')->send(); - exit; - } - } - - public function actionIndex() - { - $request = Yii::$app->request; - $name = $request->get('name'); - - $query = GiftTypeT::find(); - if($name != '') { - $query = $query->andWhere(['like','name',$name]); - } - $items = $query->all(); - - return $this->render('index',[ - 'items' => $items, - 'name' => $name - ]); - } - - public function actionEdit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id > 0) { - $info = GiftTypeT::findOne(['id'=>$id]); - } else { - $info = new GiftTypeT(); - } - - return $this->render('edit',[ - 'info' => $info - ]); - } - - public function actionSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $name = $request->post('name'); - - if($name == '') { - $result['msg'] = '请输入名称!'; - return $result; - } - - $row = null; - if($id > 0) { - $row = GiftTypeT::findOne(['id'=>$id]); - } else { - $row = new GiftTypeT(); - } - $row->name = $name; - $row->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionDelete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = GiftTypeT::findOne(['id'=>$id]); - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - } - return $result; - } - - public function actionType2List() - { - $request = Yii::$app->request; - $name = $request->get('name'); - - $query = GiftType2T::find(); - if($name != '') { - $query = $query->andWhere(['like','name',$name]); - } - $items = $query->all(); - - return $this->render('type2-list',[ - 'items' => $items, - 'name' => $name - ]); - } - - public function actionType2Edit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id > 0) { - $info = GiftType2T::findOne(['id'=>$id]); - } else { - $info = new GiftType2T(); - } - - return $this->render('type2-edit',[ - 'info' => $info - ]); - } - - public function actionType2Save() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $name = $request->post('name'); - - if($name == '') { - $result['msg'] = '请输入名称!'; - return $result; - } - - $row = null; - if($id > 0) { - $row = GiftType2T::findOne(['id'=>$id]); - } else { - $row = new GiftType2T(); - } - $row->name = $name; - $row->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionType2Delete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = GiftType2T::findOne(['id'=>$id]); - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - } - return $result; - } - - public function actionType3List() - { - $request = Yii::$app->request; - $name = $request->get('name'); - - $query = GiftType3T::find(); - if($name != '') { - $query = $query->andWhere(['like','name',$name]); - } - $items = $query->all(); - - return $this->render('type3-list',[ - 'items' => $items, - 'name' => $name - ]); - } - - public function actionType3Edit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - if($id > 0) { - $info = GiftType3T::findOne(['id'=>$id]); - } else { - $info = new GiftType3T(); - } - - return $this->render('type3-edit',[ - 'info' => $info - ]); - } - - public function actionType3Save() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $name = $request->post('name'); - $price = $request->post('price',0); - $total = $request->post('total',-1); - $type = $request->post('type',0); - - if($name == '') { - $result['msg'] = '请输入名称!'; - return $result; - } - - $row = null; - if($id > 0) { - $row = GiftType3T::findOne(['id'=>$id]); - } else { - $row = new GiftType3T(); - } - $row->name = $name; - $row->price = $price; - $row->total = $total; - $row->type = $type; - if(!$row->save()) { - var_dump($row->errors); - } - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionType3Delete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - if($id > 0) { - $row = GiftType3T::findOne(['id'=>$id]); - $row->delete(); - - $result['success'] = true; - $result['msg'] = '删除成功'; - } - } - return $result; - } -} diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php index 97c1867..bdc9fe2 100644 --- a/frontend/controllers/MarketingStrategyController.php +++ b/frontend/controllers/MarketingStrategyController.php @@ -467,11 +467,20 @@ class MarketingStrategyController extends UserBaseController $car_use_id = $request->post('car_use_id', 0); $company2_id = $request->post('company2_id', 0); + //获取自己的所有策略 + $items = ZhongjiUserT::find() + ->where(['user_id'=>$this->my->id]) + ->all(); + $celuo_ids = []; + foreach($items as $item) { + $celuo_ids[] = $item->celuo_id; + } $date = date('Y-m-d H:i:s'); - $yingxiao_item = ZhongjiYingxiao::find() + $query = ZhongjiYingxiao::find() ->where('begin_date<=:begin_date and end_date>=:end_date',[':begin_date'=>$date,':end_date'=>$date]) - ->orderBy('id desc') - ->one(); + ->andWhere(['in','id',$celuo_ids]) + ->orderBy('id desc'); + $yingxiao_item = $query->one(); if(!$yingxiao_item) { return $result; } diff --git a/frontend/views/car/edit.php b/frontend/views/car/edit.php index 578d4c2..d198499 100644 --- a/frontend/views/car/edit.php +++ b/frontend/views/car/edit.php @@ -31,9 +31,12 @@ use \common\libs\MyLib;
- +
- +
@@ -41,6 +44,10 @@ use \common\libs\MyLib;
+ +
+ +
@@ -49,27 +56,13 @@ use \common\libs\MyLib;
- -
- -
- +
- +
- +
+ +
+ +
diff --git a/frontend/views/common/index.php b/frontend/views/common/index.php index acf5e10..a4a9689 100644 --- a/frontend/views/common/index.php +++ b/frontend/views/common/index.php @@ -70,7 +70,7 @@ + +
+
+ + + + + + + + + + + + + + + +
ID礼品编号礼品车牌号车架号提单人出库日期状态操作员操作
+
+
+
+
+ + + +beginBlock('footer_js'); ?> + + + + +endBlock(); ?> diff --git a/frontend/views/gift/index.php b/frontend/views/gift/index.php index d941933..f9ac198 100644 --- a/frontend/views/gift/index.php +++ b/frontend/views/gift/index.php @@ -22,8 +22,8 @@ use \common\libs\MyLib;
- + From ed3b6d16bac8c5f1a978a408998cf54e86b13799 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 09:54:00 +0800 Subject: [PATCH 05/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BDBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 2 +- frontend/views/finance/car-update-frame.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index ee9b715..8567a10 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -6356,7 +6356,7 @@ class FinanceController extends \frontend\controllers\UserBaseController $result['msg'] = '操作失败'; $web_path = Yii::$app->getBasePath() . '/../frontend/web'; - $filename = $web_path . $request->post('urlfile'); + $filename = $web_path . $request->post('file'); $base_filename=$request->post('file'); //读取Excel 2007 diff --git a/frontend/views/finance/car-update-frame.php b/frontend/views/finance/car-update-frame.php index 25ac9e4..f8cfdfb 100644 --- a/frontend/views/finance/car-update-frame.php +++ b/frontend/views/finance/car-update-frame.php @@ -70,7 +70,7 @@ use \common\libs\MyLib; }, function(){ var params = $("#theFrm").serialize(); $.post('/finance/car-update-frame-info',params,function(obj){ - parent.layer.msg(data.msg); + parent.layer.msg(obj.msg); if(obj.success) { window.location.reload(); } From fb0e0df5b234210fa015641168ee415e68bbf1c7 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 11:00:58 +0800 Subject: [PATCH 06/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/CarController.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 9c6170b..79a9118 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -404,37 +404,11 @@ class CarController extends BaseController $info = new CarT(); } $car_use_items = CarUseT::find()->all(); - $car_type_items = CarTypeT::find()->all(); - $brand_items = Brand2T::find()->all(); - $factory_items = FactoryT::find() - ->where('brand_id='.intval($info->brand_id)) - ->all(); - $series_items = Series2T::find() - ->where('factory_id='.intval($info->factory_id)) - ->all(); - $displacement_items = Displacement2T::find() - ->where('series_id='.intval($info->series_id)) - ->all(); - $year_items = YearT::find() - ->where('series_id='.intval($info->series_id.' and displacement_id='.intval($info->displacement_id))) - ->all(); - $model_items = ModelT::find() - ->where('series_id='.intval($info->series_id)) - ->andWhere('displacement_id='.intval($info->displacement_id)) - ->andWhere('year_id='.intval($info->year_id)) - ->all(); return $this->render('edit',[ 'user_id' => $user_id, 'info' => $info, 'car_use_items' => $car_use_items, - 'car_type_items' => $car_type_items, - 'brand_items' => $brand_items, - 'factory_items' => $factory_items, - 'series_items' => $series_items, - 'displacement_items' => $displacement_items, - 'year_items' => $year_items, - 'model_items' => $model_items, 'back_params' => $back_params ]); } From 77d82331a374bf8ec91a77339fc14ad1aa606719 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 11:44:27 +0800 Subject: [PATCH 07/63] =?UTF-8?q?=E5=9C=A8=E6=89=B9=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=EF=BC=8C=E8=AF=BB=E5=8F=96=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 8567a10..5606036 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -6379,19 +6379,19 @@ class FinanceController extends \frontend\controllers\UserBaseController for ($i = 2; $i <= $rowCount; $i++) { // echo $i.'/'.$rowCount."..."; $cell = $currentSheet->getCellByColumnAndRow(0, $i); - $car_no = $cell->getValue(); + $car_no = $cell->getFormattedValue(); // $cell = $currentSheet->getCellByColumnAndRow(1, $i); // $car_man = $cell->getValue(); $cell = $currentSheet->getCellByColumnAndRow(1, $i); - $factory_model = $cell->getValue();//$data[$i][3]; + $factory_model = $cell->getFormattedValue();//$data[$i][3]; $cell = $currentSheet->getCellByColumnAndRow(2, $i); - $engine_no = $cell->getValue();//$data[$i][2]; + $engine_no = $cell->getFormattedValue();//$data[$i][2]; // var_dump($cars); $cell = $currentSheet->getCellByColumnAndRow(3, $i); - $car_frame_no = $cell->getValue();//$data[$i][1]; + $car_frame_no = $cell->getFormattedValue();//$data[$i][1]; // var_dump($car_frame_no); $cell = $currentSheet->getCellByColumnAndRow(4, $i); - $register_date = $cell->getValue();//$data[$i][8]; + $register_date = $cell->getFormattedValue(); $cell = $currentSheet->getCellByColumnAndRow(5, $i); $company = $cell->getValue();//$data[$i][8]; $cell = $currentSheet->getCellByColumnAndRow(6, $i); From 99e3b3db1e42d1b8cd10c7424365fb2559a45a40 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 14:51:15 +0800 Subject: [PATCH 08/63] =?UTF-8?q?1.=20=E5=9C=A8=E4=B8=9A=E5=8A=A1=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=97=A0=E6=95=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD=202.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF=E9=A1=B5?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9DBUG.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/CarController.php | 62 ++++++++++++++++++++++-- frontend/views/car/info.php | 13 +++-- frontend/views/car/invalid-car.php | 67 ++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 9 deletions(-) create mode 100644 frontend/views/car/invalid-car.php diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 79a9118..2b343f8 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -65,6 +65,7 @@ use common\models\InvalidRenewal; use common\models\ZhongjiGiftT; use Yii; use yii\data\Pagination; +use yii\db\Exception; use yii\web\Response; class CarController extends BaseController @@ -724,12 +725,8 @@ class CarController extends BaseController $failure_items = InvalidT::getTreeXinbaoNew(2); $list = MeetT::getAllData(1); - - $business_group = BusinessGroupT::find()->all(); - $order_ad=OrderAddress::findOne(['id'=>$order_info->addr_id]); - //非车险方案表 $province = Region::find()->asArray()->where(['parent_id'=>0])->andWhere(['level'=>1])->all(); $c=[]; @@ -741,6 +738,7 @@ class CarController extends BaseController ->all(); return $this->render('info',[ + 'user_id' => $my->id, 'car_info' => $car_info, 'link_men' => $linkMan_items, 'insurer_type_items' => $insurer_type_items, @@ -765,7 +763,7 @@ class CarController extends BaseController 'city' =>$c, 'district' =>$d, 'twon' =>isset($e)?$e:[], - 'order_ad' =>isset($order_ad)?$order_ad:[], + 'order_ad' =>isset($order_ad)?$order_ad:[] ]); } /* @@ -4872,4 +4870,58 @@ class CarController extends BaseController 'district_items' => $district_items ]); } + + public function actionInvalidCar() { + $request = Yii::$app->request; + $car_id = $request->get('car_id'); + + $invalid_items = InvalidT::getTree(); + + return $this->render('invalid-car', [ + 'car_id' => $car_id, + 'invalid_items' => $invalid_items + ]); + } + + public function actionInvalidSave() { + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $car_id = $request->post('car_id'); + $invalid_id = $request->post('invalid_id'); + + if($invalid_id == 0) { + $result['msg'] = '请选择无效理由'; + return $result; + } + + $tran = CarT::getDb()->beginTransaction(); + try { + $car_info = CarT::findOne(['id'=>$car_id]); + $car_info->location = 5; + if(!$car_info->save(false)) { + throw new Exception(print_r($car_info->getFirstErrors(),true)); + } + + $invalid_info = CarInvalidT::findOne(['id'=>$car_info->id]); + if(!$invalid_info) { + $invalid_info = new CarInvalidT(false); + $invalid_info->id = $car_info->id; + $invalid_info->user_id = $this->my->id; + $invalid_info->invalid_id = $invalid_id; + if(!$invalid_info->save(false)) { + throw new Exception(print_r($invalid_info->getFirstErrors(),true)); + } + } + $this->addLog($car_info->id,'从业务员无效车辆信息',1); + + $result['success'] = true; + $result['msg'] = '操作成功'; + + $tran->commit(); + } catch (\Exception $e) { + $tran->rollBack(); + $result['msg'] = $e->getMessage(); + } + return $result; + } } diff --git a/frontend/views/car/info.php b/frontend/views/car/info.php index bae840d..c520ce3 100644 --- a/frontend/views/car/info.php +++ b/frontend/views/car/info.php @@ -22,7 +22,7 @@ use \common\libs\MyLib; 操作记录 - + 返回
@@ -195,6 +195,9 @@ use \common\libs\MyLib;
预约记录
+ + 无效数据 + 预约 @@ -259,6 +262,10 @@ use \common\libs\MyLib; title = '投保'; layer_show(title, '/car/order-add?car_id=id?>'); } + function invalidDlg() { + title = '无效数据'; + layer_show(title, '/car/invalid-car?car_id=id?>'); + } function appointmentDlg() { title = '添加预约'; layer_show(title, '/appointment/add?car_id=id?>'); @@ -416,7 +423,7 @@ use \common\libs\MyLib; var number_one = phone; - $.get('/phone/ax-out',{'phone':number_one,'user_id':'id?>'},function(obj){ + $.get('/phone/ax-out',{'phone':number_one,'user_id':''},function(obj){ if(obj.success) { @@ -565,7 +572,5 @@ use \common\libs\MyLib; ws.send(val); console.log("数据已发送"); } - - endBlock(); ?> \ No newline at end of file diff --git a/frontend/views/car/invalid-car.php b/frontend/views/car/invalid-car.php new file mode 100644 index 0000000..c8fb339 --- /dev/null +++ b/frontend/views/car/invalid-car.php @@ -0,0 +1,67 @@ + +beginBlock('header_css'); ?> + +endBlock(); ?> + +
+
+
+
+
+ + +
+ +
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+ +beginBlock('footer_js'); ?> + +endBlock('footer_js'); ?> From 4786519a10e21a263543d3ba8499cfdb583e3981 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 15:55:05 +0800 Subject: [PATCH 09/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=A8=E5=8F=B7?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/CarController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 2b343f8..46aec7b 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -738,7 +738,7 @@ class CarController extends BaseController ->all(); return $this->render('info',[ - 'user_id' => $my->id, + 'user_id' => $this->my->id, 'car_info' => $car_info, 'link_men' => $linkMan_items, 'insurer_type_items' => $insurer_type_items, From 4dc1925d69c9086127fa1bd426b954d08661d3bf Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 16 Oct 2019 17:49:44 +0800 Subject: [PATCH 10/63] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=9E=E5=8D=95?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 6 +- frontend/controllers/InsurerController.php | 2 + frontend/views/finance/receipt-info.php | 162 ++++++++++++--------- frontend/views/finance/receipt.php | 16 +- 4 files changed, 109 insertions(+), 77 deletions(-) diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 5606036..74e8880 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -213,7 +213,7 @@ class FinanceController extends \frontend\controllers\UserBaseController foreach($items as $item) { $row = $item->toArray(); $row['group'] = $item->user->group->name; - $row['company_name'] = $item->order->company->name; + $row['company_name'] = $item->order->company2->name; $row['username'] = $item->user->getShowName(); $row['submit_date'] = $item->order->submit_date; $row['print_date'] = $item->order->print_date; @@ -3607,8 +3607,7 @@ class FinanceController extends \frontend\controllers\UserBaseController return $this->render('receipt-info', [ - 'caiwu_info' => $caiwu_info, - 'back_params' => $back_params, + 'caiwu_info' => $caiwu_info ]); } public function actionEmsReceiptInfo() @@ -6417,7 +6416,6 @@ class FinanceController extends \frontend\controllers\UserBaseController $car_info = CarT::findOne(['car_frame_no' => $car_frame_no]); if ($car_info) { - if($car_no != ''){ $car_info->car_no = $car_no; } diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index 692a3ab..801ac1a 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -1253,6 +1253,7 @@ class InsurerController extends BaseController $row->car_no = $order_info->car_no; $row->factory_model = $order_info->car->factory_model; $row->id_man = $order_info->id_man; + $row->company = $order_info->company2->name(); $row->total = sprintf("%.2f",$order_info->total1); $row->total_clear = sprintf("%.2f",$order_info->total1_clear); $row->total_clear_real = sprintf("%.2f",($order_info->total1_clear * $order_info->total1_rate/100)); @@ -1277,6 +1278,7 @@ class InsurerController extends BaseController $row->insurer_no = $order_info->insurer2_no; $row->car_no = $order_info->car_no; $row->factory_model = $order_info->car->factory_model; + $row->company = $order_info->company2->name(); $row->id_man = $order_info->id_man; $row->total = sprintf("%.2f",$order_info->total2); $row->total_clear = sprintf("%.2f",$order_info->total2_clear); diff --git a/frontend/views/finance/receipt-info.php b/frontend/views/finance/receipt-info.php index 62a7751..79ef837 100644 --- a/frontend/views/finance/receipt-info.php +++ b/frontend/views/finance/receipt-info.php @@ -1,79 +1,105 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
车牌号 - car_no?> -
保险公司 - company?> - 保单号 - -
总保费 - total?> - 净保费 - total_clear?> -
手续费比例 - % -
回款金额 - - 回款日期 - -
- -    - -
- - - - + +beginBlock('header_css'); ?> + +endBlock(); ?> + +
+
+
+
+
+
+ +
+ +
+

car_no?>

+
+
+
+ +
+

order->company2->name?>

+
+ +
+ +
+
+
+ +
+

total?>

+
+ +
+

total_clear?>

+
+
+
+ +
+
+ +
%
+
+
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ +beginBlock('footer_js'); ?> + +endBlock('footer_js'); ?> + diff --git a/frontend/views/finance/receipt.php b/frontend/views/finance/receipt.php index ef5c8b4..c12a509 100644 --- a/frontend/views/finance/receipt.php +++ b/frontend/views/finance/receipt.php @@ -19,7 +19,7 @@ use \common\libs\MyLib;
-
+
+ +
- +
+ + +
+
+ + +
+
+ +
+ +
-
+ +
+
+
+ +
+ +
元
+
-
+ +
元
+
+
+ +
+
+ +
+ +
%
+
+
+
@@ -53,20 +106,26 @@ use \common\libs\MyLib; endBlock(); ?> From 70ba677eee3d17640d08f4b3f2bd3a9c5e2fe0d1 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Sun, 20 Oct 2019 16:05:45 +0800 Subject: [PATCH 55/63] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A1=A5=E7=82=B9?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/FinanceController.php | 122 +++----- frontend/views/finance/receipt2-import.php | 93 ++++++ frontend/views/finance/receipt2.php | 343 ++++++++------------- 3 files changed, 269 insertions(+), 289 deletions(-) create mode 100644 frontend/views/finance/receipt2-import.php diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index 6279d15..62fba5b 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -227,6 +227,10 @@ class FinanceController extends \frontend\controllers\UserBaseController public function actionReceiptImport() { return $this->render('receipt-import'); } + public function actionReceipt2Import() { + return $this->render('receipt2-import'); + } + public function actionEmsReceipt() { $request = Yii::$app->request; @@ -3864,10 +3868,17 @@ class FinanceController extends \frontend\controllers\UserBaseController return $result; } - public function actionReceipt2() + public function actionReceipt2() { + $insurer_company_items = InsurerCompany2T::find()->all(); + + return $this->render('receipt2', [ + 'insurer_company_items' => $insurer_company_items + ]); + } + public function actionReceipt2Json() { + Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; - $page = $request->get('page', 1); $begin_date = $request->get('begin_date'); $end_date = $request->get('end_date'); $r_begin_date = $request->get('r_begin_date'); @@ -3878,43 +3889,14 @@ class FinanceController extends \frontend\controllers\UserBaseController $sort_key = $request->get('sort_key'); $sort_value = $request->get('sort_value'); $company_id = $request->get('company_id'); - if ($page < 1) $page = 1; + $insurer_type = $request->get('insurer_type'); + $offset = $request->get('offset', 0); + $limit = $request->get('limit', 10); -// $query = OrderCaiwuT::find() -// ->where('budian_rate>0'); $query = CaiwuT::find() ->leftJoin(OrderCaiwuT::tableName(), "order_caiwu_t.order_id=caiwu_t.order_id") ->leftJoin(OrderT::tableName(), "order_caiwu_t.order_id=order_t.id") - ->where('order_caiwu_t.budian_rate > 0'); -// ->orderBy('order_t.print_date DESC'); - -// switch ($sort_key) { -// case 'total': -// $sort = 'caiwu_t.total '; -// break; -// case 'total_clear': -// $sort = 'caiwu_t.total_clear '; -// break; -// case 'total_rate': -// $sort = 'caiwu_t.total_rate '; -// break; -// case 'print_date'://默认按照print_date排序 -// default: -// $sort = 'order_t.print_date '; -// break; -// } - -// switch ($sort_value) { -// case 'ASC': -// $sort .= 'ASC'; -// break; -// case 'DESC': -// default: -// $sort .= 'DESC'; -// break; -// } - -// $query = $query->orderBy($sort); + ->where('caiwu_t.budian_rate > 0'); if( $company_id > 0) { $query = $query->andWhere('order_t.company_id='.$company_id); } @@ -3926,10 +3908,10 @@ class FinanceController extends \frontend\controllers\UserBaseController } if ($status > 0) { if ($status == 1) { - $query = $query->andWhere('r_date=""'); + $query = $query->andWhere('b1_date is null'); } if ($status == 2) { - $query = $query->andWhere('r_date<>""'); + $query = $query->andWhere('b1_date is not null'); } } if ($begin_date != "") { @@ -3944,43 +3926,38 @@ class FinanceController extends \frontend\controllers\UserBaseController if ($r_end_date != "") { $query = $query->andWhere('caiwu_t.r_date<="' . $r_end_date . '"'); } + + if($insurer_type != 0){ + $query = $query->andWhere('caiwu_t.insurer_type =' . $insurer_type); + } // echo $query->createCommand()->rawSql; $total = $query->count(); - $pagination = new Pagination(['totalCount' => $total, 'pageSize' => 20]); - $pagination->setPage($page - 1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); + $query->offset($offset)->limit($limit); $items = $query->all(); -// $sum_r_total = $query->sum('r_total'); - //商业净保费综合 -// $sum_total_clear = $query->sum('total_clear'); - - //商业总保费 -// $sum_total = $query->sum('total'); + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($items as $item) { + $row = $item->toArray(); + $row['company_name'] = $item->order->company2->name; + $row['print_date'] = $item->order->print_date; + $row['total_real'] = round($item->total_clear,2); + $row['budian_rate'] = $item->budian_rate; + $row['budian_money'] = $item->budian_money; + $row['b1_total'] = $item->b1_total; + $row['b1_date'] = $item->b1_date; + $row['b2_total'] = $item->b2_total; + $row['b2_date'] = $item->b2_date; + $row['b3_total'] = $item->b3_total; + $row['b3_date'] = $item->b3_date; + $row['b_total'] = round($row['b1_total']+$row['b2_total']+$row['b3_total'],2); + $row['un_b_total'] = round($row['budian_money'] - $row['b_total'],2); + $data['rows'][] = $row; + } - $page_info = MyLib::getPageInfo($pagination); - $company_items = InsurerCompanyT::find()->all(); - return $this->render('receipt2', [ - 'items' => $items, - 'page' => $page, - 'car_no' => $car_no, - 'insurer_no' => $insurer_no, - 'status' => $status, - 'begin_date' => $begin_date, - 'end_date' => $end_date, - 'r_begin_date' => $r_begin_date, - 'r_end_date' => $r_end_date, - 'page_info' => $page_info, - 'sort_key' => $sort_key, - 'company_items' => $company_items, - 'company_id' => $company_id, - 'sort_value' => $sort_value -// 'sum_r_total' => $sum_r_total, -// 'sum_total_clear' => $sum_total_clear, -// 'sum_total' => $sum_total, - ]); + return $data; } public function actionReceipt2Output() { @@ -4139,22 +4116,13 @@ class FinanceController extends \frontend\controllers\UserBaseController $insurer_total = $cell->getValue();//$data[$i][6]; $cell = $currentSheet->getCellByColumnAndRow(7, $i); $insurer_date = $cell->getFormattedValue(); -// $insurer_date = \PHPExcel_Shared_Date::ExcelToPHP($cell->getValue());//$data[$i][7]; $cell = $currentSheet->getCellByColumnAndRow(8, $i); $car_no = $cell->getValue();//$data[$i][8]; -// if($insurer_no == 'PDAA201811010000089441') { -// echo $insurer_no.'='.$policy_man.'='.$total_real.'='.$total_rate.'='; -// echo $pay_total.'='.$insurer_total.'='.date('Y-m-d',$insurer_date).'='.$car_no."\r\n"; -// exit; -// } -// $row = CaiwuT::findOne(['car_no' => $car_no, 'insurer_no' => $insurer_no]); $row = CaiwuT::findOne(['insurer_no' => $insurer_no]); if ($row) { CaiwuErrorT::deleteAll(['insurer_no' => $insurer_no]); -// echo $insurer_no.'='.$policy_man.'='.$total_real.'='.$total_rate.'='; -// echo $pay_total.'='.$insurer_total.'='.date('Y-m-d',$insurer_date).'='.$car_no."\r\n"; if($bdlx == 1) { $row->b1_total = $insurer_total; $row->b1_date = $insurer_date; diff --git a/frontend/views/finance/receipt2-import.php b/frontend/views/finance/receipt2-import.php new file mode 100644 index 0000000..b18cb9a --- /dev/null +++ b/frontend/views/finance/receipt2-import.php @@ -0,0 +1,93 @@ + +beginBlock('header_css'); ?> +endBlock(); ?> + +
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ + + 上传文件 + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ +beginBlock('footer_js'); ?> + +endBlock('footer_js'); ?> diff --git a/frontend/views/finance/receipt2.php b/frontend/views/finance/receipt2.php index c61f6a4..c201754 100644 --- a/frontend/views/finance/receipt2.php +++ b/frontend/views/finance/receipt2.php @@ -1,222 +1,141 @@ - - - - - - - - - - - - - - - -
导入类型 - -
批对日期 - - -
- -    - -
- - - - - - - -
- - - - 保单号： - 车牌： - - 出单日期： - - -- - - 回单日期： - - -- - - 保险公司： - 排序： - - - - -
- - - - - - - - - - - - - - - - - - - - $item) { - $start_index = ($page-1)*20+$index; - $order = $item->order; - $caiwu = $order->caiwu; -// $caiwu = $order->caiwu; -// $rate = $caiwu ? $caiwu->budian_rate : 0; - if($item->insurer_type==2){ - $caiwu->budian_rate=0; - } - $total_clear = round($item->total_clear * $caiwu->budian_rate/100,2); - $b_total = $item->b1_total+$item->b2_total+$item->b3_total; -// $total_clear_real = $item->total_clear * $rate/100; -// $total_dis = round($total_clear_real - $item->r_total,2); - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号车牌号保险公司保单号出单日期商业净保费补点比例应得金额补点1回款补点1日期补点2回款补点2日期补点3回款补点3日期已回金额未回金额
car_no?>company ? $order->company->name:''?>insurer_no?>print_date?>total_clear?>budian_rate?>b1_total?>b1_date?>b2_total?>b2_date?>b3_total?>b3_date?>
- - - - - - - - + + + +endBlock(); ?> From 91334bfffe495d1ed331e8bc3d996c5def24946f Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Mon, 21 Oct 2019 17:06:26 +0800 Subject: [PATCH 56/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E8=BD=A6=E8=88=B9=E7=A8=8E=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=B3=95?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=AE=A1=E7=AE=97BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/car/order-add.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/views/car/order-add.php b/frontend/views/car/order-add.php index b546522..43e2c26 100644 --- a/frontend/views/car/order-add.php +++ b/frontend/views/car/order-add.php @@ -535,7 +535,9 @@ use common\models\PriceT; $('#yuangong_money').blur(function(){ calc(); }); - + $('#total3').blur(function(){ + calc(); + }); //生成短信内容 $('.sms-make-btn').click(function(){ var params = $('#orderFrm').serialize(); From 5bae32ec51e874e6bb9b5ad8cc02a01ea795f476 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 22 Oct 2019 13:54:47 +0800 Subject: [PATCH 57/63] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=9A=E6=97=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9D=E5=A7=8B=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E5=BD=93=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/PhoneCenterController.php | 12 +----------- frontend/views/phone-center/usercall-index.php | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/frontend/controllers/PhoneCenterController.php b/frontend/controllers/PhoneCenterController.php index d9bec4a..77ef518 100644 --- a/frontend/controllers/PhoneCenterController.php +++ b/frontend/controllers/PhoneCenterController.php @@ -541,17 +541,7 @@ public function actionDownload(){ } $total = $query->count(); - - - -// foreach($items as $value){ -// $car_data= CarT::findOne(['id'=>$value->car_id]); -// $value->car_no=$car_data->car_no; -// $value->save(); -// } -// dd($items); -// die; - + $query = $query->offset($offset)->limit($limit); $items = $query->all(); diff --git a/frontend/views/phone-center/usercall-index.php b/frontend/views/phone-center/usercall-index.php index fdf8fd9..075f2c2 100644 --- a/frontend/views/phone-center/usercall-index.php +++ b/frontend/views/phone-center/usercall-index.php @@ -24,9 +24,9 @@ use \common\libs\MyLib;
- + 到 - +
From d6fc443bf7d4a66d73c760d6bce0a02dd4696205 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 22 Oct 2019 14:39:45 +0800 Subject: [PATCH 58/63] =?UTF-8?q?=E5=9C=A8=E6=88=91=E7=9A=84=E9=80=9A?= =?UTF-8?q?=E8=AF=9D=E5=8A=9F=E8=83=BD=E4=B8=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/PhoneCenterController.php | 15 ++++++++++++--- frontend/views/phone-center/call-records.php | 3 +++ frontend/views/phone-center/usercall-index.php | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/frontend/controllers/PhoneCenterController.php b/frontend/controllers/PhoneCenterController.php index 77ef518..47c6573 100644 --- a/frontend/controllers/PhoneCenterController.php +++ b/frontend/controllers/PhoneCenterController.php @@ -48,7 +48,12 @@ class PhoneCenterController extends BaseController public $layout = 'blue-main'; public function actionCallRecords() { - return $this->render('call-records'); + $request = Yii::$app->request; + $company_id = $request->get('company_id',0); + + return $this->render('call-records', [ + 'company_id' => $company_id + ]); } public function actionCallRecordsJson(){ Yii::$app->response->format = Response::FORMAT_JSON; @@ -500,7 +505,11 @@ public function actionDownload(){ } public function actionUsercallIndex() { - return $this->render('usercall-index'); + $request = Yii::$app->request; + $company_id = $request->get('company_id',0); + return $this->render('usercall-index',[ + 'company_id' => $company_id + ]); } public function actionUsercallIndexJson(){ Yii::$app->response->format = Response::FORMAT_JSON; @@ -541,7 +550,7 @@ public function actionDownload(){ } $total = $query->count(); - + $query = $query->offset($offset)->limit($limit); $items = $query->all(); diff --git a/frontend/views/phone-center/call-records.php b/frontend/views/phone-center/call-records.php index d32e8ef..2a668fe 100644 --- a/frontend/views/phone-center/call-records.php +++ b/frontend/views/phone-center/call-records.php @@ -17,10 +17,13 @@ use \common\libs\MyLib;
+ +
+
diff --git a/frontend/views/phone-center/usercall-index.php b/frontend/views/phone-center/usercall-index.php index 075f2c2..9807a2b 100644 --- a/frontend/views/phone-center/usercall-index.php +++ b/frontend/views/phone-center/usercall-index.php @@ -17,10 +17,13 @@ use \common\libs\MyLib;
+ +
+
From 2b83c3f82185741538d63bfe7958721044c6e8e7 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 22 Oct 2019 14:42:12 +0800 Subject: [PATCH 59/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/PhoneCenterController.php | 8 ++++---- frontend/views/phone-center/call-records.php | 4 ++-- frontend/views/phone-center/usercall-index.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/controllers/PhoneCenterController.php b/frontend/controllers/PhoneCenterController.php index 47c6573..1c7ce7c 100644 --- a/frontend/controllers/PhoneCenterController.php +++ b/frontend/controllers/PhoneCenterController.php @@ -49,10 +49,10 @@ class PhoneCenterController extends BaseController public function actionCallRecords() { $request = Yii::$app->request; - $company_id = $request->get('company_id',0); + $company_type = $request->get('company_type',0); return $this->render('call-records', [ - 'company_id' => $company_id + 'company_type' => $company_type ]); } public function actionCallRecordsJson(){ @@ -506,9 +506,9 @@ public function actionDownload(){ public function actionUsercallIndex() { $request = Yii::$app->request; - $company_id = $request->get('company_id',0); + $company_type = $request->get('company_type',0); return $this->render('usercall-index',[ - 'company_id' => $company_id + 'company_id' => $company_type ]); } public function actionUsercallIndexJson(){ diff --git a/frontend/views/phone-center/call-records.php b/frontend/views/phone-center/call-records.php index 2a668fe..9ca1dce 100644 --- a/frontend/views/phone-center/call-records.php +++ b/frontend/views/phone-center/call-records.php @@ -17,8 +17,8 @@ use \common\libs\MyLib;
- - + +
diff --git a/frontend/views/phone-center/usercall-index.php b/frontend/views/phone-center/usercall-index.php index 9807a2b..3a573aa 100644 --- a/frontend/views/phone-center/usercall-index.php +++ b/frontend/views/phone-center/usercall-index.php @@ -17,8 +17,8 @@ use \common\libs\MyLib;
- - + +
From b3125cf18eabb6ea4d9d7c214c81937afcfc7a75 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 22 Oct 2019 14:43:54 +0800 Subject: [PATCH 60/63] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/PhoneCenterController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/controllers/PhoneCenterController.php b/frontend/controllers/PhoneCenterController.php index 1c7ce7c..e2df368 100644 --- a/frontend/controllers/PhoneCenterController.php +++ b/frontend/controllers/PhoneCenterController.php @@ -508,7 +508,7 @@ public function actionDownload(){ $request = Yii::$app->request; $company_type = $request->get('company_type',0); return $this->render('usercall-index',[ - 'company_id' => $company_type + 'company_type' => $company_type ]); } public function actionUsercallIndexJson(){ From b5454a2a0c13b7d099576fef84c549a7fcb72ad3 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Tue, 22 Oct 2019 14:52:10 +0800 Subject: [PATCH 61/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=80=9A=E8=AF=9D=E8=AE=B0=E5=BD=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/phone-center/call-records.php | 3 ++- frontend/views/phone-center/usercall-index.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/views/phone-center/call-records.php b/frontend/views/phone-center/call-records.php index 9ca1dce..13dc9e1 100644 --- a/frontend/views/phone-center/call-records.php +++ b/frontend/views/phone-center/call-records.php @@ -17,7 +17,7 @@ use \common\libs\MyLib;
- +
@@ -165,6 +165,7 @@ use \common\libs\MyLib; params.duration_begin = $('#duration_begin').val(); params.duration_end = $('#duration_end').val(); params.is_called = $('#is_called').val(); + params.company_type = $('#company_type').val(); return params; } }); diff --git a/frontend/views/phone-center/usercall-index.php b/frontend/views/phone-center/usercall-index.php index 3a573aa..c030dce 100644 --- a/frontend/views/phone-center/usercall-index.php +++ b/frontend/views/phone-center/usercall-index.php @@ -94,6 +94,7 @@ use \common\libs\MyLib; params.duration_begin = $('#duration_begin').val(); params.duration_end = $('#duration_end').val(); params.is_called = $('#is_called').val(); + params.company_type = $('#company_type').val(); return params; } }); From ae26fc531064f241ab710c706b0fde6ce7fc4a18 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 23 Oct 2019 14:53:56 +0800 Subject: [PATCH 62/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/models/OrderGiftT.php | 2 +- frontend/controllers/BaseController.php | 2 +- frontend/controllers/InsurerController.php | 22 ++++++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/common/models/OrderGiftT.php b/common/models/OrderGiftT.php index a8b0b15..88c902b 100644 --- a/common/models/OrderGiftT.php +++ b/common/models/OrderGiftT.php @@ -84,6 +84,6 @@ class OrderGiftT extends \common\models\Base public function getGift() { - return $this->hasOne(GiftType3T::className(),['id'=>'gift_id']); + return $this->hasOne(GiftT::className(),['id'=>'gift_id']); } } diff --git a/frontend/controllers/BaseController.php b/frontend/controllers/BaseController.php index bf90dc0..23d54a5 100644 --- a/frontend/controllers/BaseController.php +++ b/frontend/controllers/BaseController.php @@ -61,7 +61,7 @@ class BaseController extends \yii\web\Controller $log_info->remark = $info; $log_info->info = ''; if(!$log_info->save()) { - var_dump($log_info->errors); + throw new \Exception(print_r($log_info->getErrors(), true)); } } public function addNonLog($non_id,$info,$type) diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index f76b3c2..a0e865e 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -3344,31 +3344,25 @@ class InsurerController extends BaseController $row->return_remark = $return_remark; $row->return_time = time(); $row->lock_id = 0; - $row->save(); + if(!$row->save()) { + throw new \Exception(print_r($row->getErrors(), true)); + } //处理操作人员状态 $order_user_info = OrderUserT::findOne(['order_id'=>$row->id,'user_id'=>$this->my->id,'status'=>0]); if($order_user_info) { $order_user_info->status = 2; //退回 - $order_user_info->save(); + if(!$order_user_info->save()) { + throw new \Exception(print_r($order_user_info->getErrors(), true)); + } $order_user_info2 = new OrderUserT(); $order_user_info2->user_id = $row->user_id; $order_user_info2->order_id = $row->id; $order_user_info2->type_id = 1; $order_user_info2->status = 0; - $order_user_info2->save(); - } - // - //处理礼品数量 - $sel_gifts = OrderGiftT::find() - ->where('order_id='.$order_id) - ->all(); - foreach($sel_gifts as $sel_gift) { - $gift_info = $sel_gift->gift; - if($gift_info && $gift_info->total > -1) { - $gift_info->total = $gift_info->total + 1; - $gift_info->save(); + if(!$order_user_info2->save()) { + throw new \Exception(print_r($order_user_info2->getErrors(), true)); } } From ccfd85f7e410f506e5cd42eddfc61bd6955def52 Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Wed, 23 Oct 2019 15:06:14 +0800 Subject: [PATCH 63/63] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=9D=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/InsurerController.php | 34 ++++++++-------------- frontend/views/insurer/search.php | 23 +++++++++++---- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index a0e865e..dddef3c 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -3673,30 +3673,19 @@ class InsurerController extends BaseController $id_man = $request->get('id_man'); $phone = $request->get('phone'); $car_no = $request->get('car_no'); - $page = $request->get('page',1); $date_begin = $request->get('date_begin'); $date_end = $request->get('date_end'); $date2_begin = $request->get('date2_begin'); $date2_end = $request->get('date2_end'); $date3_begin = $request->get('date3_begin'); $date3_end = $request->get('date3_end'); - $group_id = $request->get('group_id'); - $company_id = $request->get('company_id'); - $insurance_status= $request->get('insurance_status'); + $status = $request->get('status'); $offset = $request->get('offset',0); $limit = $request->get('limit', 10); - $group_items = GroupT::getTree(); - $group_ids[] = $group_id; - if($group_id > 0) { - $items = GroupT::getTree($group_id); - foreach($items as $group_info) { - $group_ids[] = $group_info->id; - } - } $query = OrderT::find() ->where('status_id>1') - ->orderBy('car_no desc,submit_date asc'); + ->orderBy('car_no desc,submit_date asc'); if($id_man != '') { $query->andWhere(['like','id_man',$id_man]); } @@ -3704,7 +3693,7 @@ class InsurerController extends BaseController $query->andWhere(['like','car_man',$car_man]); } if($phone != '') { - $query->andWhere(['like','link_phone',$phone]); + $query->andWhere('car_man_phone like :phone or id_man_phone like :phone or link_man_phone like :phone', [':phone'=>$phone]); } if($car_no != '') { $query->andWhere(['like','car_no',$car_no]); @@ -3722,17 +3711,18 @@ class InsurerController extends BaseController $query->andWhere('print_date<="'.$date2_end.'"'); } if($date3_begin != '') { - $query->andWhere('insurer1_begin_date>="'.$date3_begin.'"'); + $query->andWhere('insurer1_begin_date>=:begin_date or insurer2_begin_date>=:begin_date', [':begin_date'=>$date3_begin]); } if($date3_end != '') { - $query->andWhere('insurer1_begin_date<="'.$date3_end.'"'); - } - - if($company_id != '') { - $query->andWhere('company_id ="'.$company_id.'"'); + $query->andWhere('insurer1_begin_date<=:end_date or insurer2_begin_date<=:end_date', [':end_date'=>$date3_end]); } - if($insurance_status != '') { - $query->andWhere('insurance_status ="'.$insurance_status.'"'); + if($status > 0) { + if($status == 1) { + $query->andWhere('status>1 and status<10'); + } + if($status == 2) { + $query->andWhere('status=10'); + } } $total = $query->count(); diff --git a/frontend/views/insurer/search.php b/frontend/views/insurer/search.php index 0d69d7a..7317720 100644 --- a/frontend/views/insurer/search.php +++ b/frontend/views/insurer/search.php @@ -16,7 +16,7 @@ use \common\libs\MyLib;
- +
@@ -57,6 +57,14 @@ use \common\libs\MyLib;
+
+ + +
@@ -92,6 +100,7 @@ use \common\libs\MyLib;