From 3fa28ee2f8cc84eb200c3de84c03dd324cfd0ba0 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Thu, 12 Dec 2019 16:47:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E8=BF=90=E8=B4=B9=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/ExpressTemplateController.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/modules/shop/controllers/ExpressTemplateController.php b/backend/modules/shop/controllers/ExpressTemplateController.php
index bdfea2a..3ee18a9 100755
--- a/backend/modules/shop/controllers/ExpressTemplateController.php
+++ b/backend/modules/shop/controllers/ExpressTemplateController.php
@@ -4,9 +4,11 @@ namespace backend\modules\shop\controllers;
 
 use backend\modules\shop\logic\ShopManager;
 use backend\modules\shop\models\searchs\ExpressAreaSearch;
+use Throwable;
 use Yii;
 use backend\modules\shop\models\ars\ExpressTemplate;
 use backend\modules\shop\models\searchs\ExpressTemplateSearch;
+use yii\db\StaleObjectException;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
@@ -14,7 +16,7 @@ use yii\web\Response;
 use yii\widgets\ActiveForm;
 use backend\modules\shop\models\ars\ExpressArea;
 use backend\modules\goods\models\ars\Goods;
-use backend\modules\shop\logic\CommonManager;
+use iron\widget\Excel;
 
 
 /**
@@ -110,6 +112,8 @@ class ExpressTemplateController extends Controller
      * @param integer $id
      * @return mixed
      * @throws NotFoundHttpException if the model cannot be found
+     * @throws Throwable
+     * @throws StaleObjectException
      */
     public function actionDelete($id)
     {
@@ -152,7 +156,7 @@ class ExpressTemplateController extends Controller
         } else {
             $dataProvider = $searchModel->search($params);
         }
-    \iron\widget\Excel::export([
+        Excel::export([
             'models' => $dataProvider->getModels(),
             'format' => 'Xlsx',
             'asAttachment' => true,
@@ -162,6 +166,7 @@ class ExpressTemplateController extends Controller
     }
 
     /**
+     * @param $id
      * @return string
      * 运费区域列表
      */
@@ -185,8 +190,7 @@ class ExpressTemplateController extends Controller
      */
     public function actionExpressAreaCreate()
     {
-        $expressTemplateId = Yii::$app->request->get('expressTemplateId');
-        $expressTemplateModel = ExpressTemplate::findOne($expressTemplateId);
+        $expressTemplateModel = ExpressTemplate::findOne(Yii::$app->request->get('expressTemplateId'));
         $model = new ExpressArea();
         $model->basic_count = 1;
         $model->basic_price = '0.00';
@@ -213,7 +217,6 @@ class ExpressTemplateController extends Controller
         }
 
         $data = ShopManager::filterCity($model);    //获取筛选的城市数据
-
         if (empty($data)) {
             Yii::$app->session->setFlash('error', '已无地区选择');
             return $this->redirect('express-area-list?id='.$expressTemplateModel->id);
@@ -277,6 +280,12 @@ class ExpressTemplateController extends Controller
         ]);
     }
 
+    /**
+     * @param $id
+     * @return Response
+     * @throws StaleObjectException
+     * @throws Throwable
+     */
     public function actionExpressAreaDelete($id)
     {
         $expressAreaModel = ExpressArea::findOne($id);