格式化处理

Signed-off-by: sunlei <sunlei@romens.cn>

backend/controllers/v1/branch/BranchServiceTypeController.php

@@ -17,7 +17,7 @@ use app\models\v1\rbacuser\ShopRbacUser;
 
 class BranchServiceTypeController extends BaseController
 {
-    public $modelClass='app\models\v1\branch\BranchServiceType';
+    public $modelClass = 'app\models\v1\branch\BranchServiceType';
 
     /**
      * @OA\Get(
@@ -42,16 +42,16 @@ class BranchServiceTypeController extends BaseController
      * )
      */
     public function actionBranchServiceList()
-    {    
+    {
         //权限信息
         $rbac = new ShopRbacUser();
         $userGuid = Yii::$app->user->identity->GUID;
         $userinfo = $rbac->getRbacUserInfo($userGuid);
-        if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){
+        if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
             throw new BadRequestHttpException('您没有查看门店服务类目列表的权限，请联系管理员');
         }
 
-        $model=new $this->modelClass();
+        $model = new $this->modelClass();
         //用户输入数据赋值到模型属性
         $model->CODE = Yii::$app->request->get('code');
         $model->NAME = Yii::$app->request->get('name');
@@ -60,7 +60,7 @@ class BranchServiceTypeController extends BaseController
             //所有输入数据都有效 all inputs are valid
             $code = $model->CODE;
             $name = $model->NAME;
-            $info = $model->BranchServiceInfo($code,$name);
+            $info = $model->BranchServiceInfo($code, $name);
             if (!$info->getModels()) {
                 throw new BadRequestHttpException('未找到符合的门店服务类目信息');
             }
@@ -91,15 +91,15 @@ class BranchServiceTypeController extends BaseController
      * )
      */
     public function actionBranchServiceInfo()
-    {               
-        $model=new $this->modelClass();
+    {
+        $model = new $this->modelClass();
         //用户输入数据赋值到模型属性
         $model->CODE = Yii::$app->request->get('code');
 
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
             $code = $model->CODE;
-            $info = $model->BranchServiceInfo($code,'');
+            $info = $model->BranchServiceInfo($code, '');
             if (!$info->getModels()) {
                 throw new BadRequestHttpException('未找到符合的门店服务类目信息');
             }
@@ -136,14 +136,14 @@ class BranchServiceTypeController extends BaseController
     public function actionAddBranchService()
     {
         $model = new $this->modelClass();
-        $model->scenario = 'create';//创建的场景
+        $model->scenario = 'create'; //创建的场景
         // $datetime = new \DateTime;
         // $create_time = $datetime->format('Y-m-d H:i:s');
-        $create_time = date('Y-m-d H:i:s',time());
+        $create_time = date('Y-m-d H:i:s', time());
         $other_param = array(
-            'GUID'=>Func::create_guid(),
-            'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
-            'CREATE_TIME'=>$create_time,
+            'GUID' => Func::create_guid(),
+            'ORG_GUID' => Yii::$app->user->identity->ORG_GUID,
+            'CREATE_TIME' => $create_time,
         );
         $model->setAttributes($other_param);
 
@@ -156,7 +156,7 @@ class BranchServiceTypeController extends BaseController
         }
         return $model;
     }
-     /**
+    /**
      * @OA\PUT(
      *     path="/backend/web/v1/branch/branch-service-types/revise-branch-service",
      *     tags={"门店&DC"},
@@ -184,12 +184,12 @@ class BranchServiceTypeController extends BaseController
     {
         $guid = Yii::$app->getRequest()->post('GUID');
         $model = $this->modelClass::findOne($guid);
-        if(!$model){
+        if (!$model) {
             throw new BadRequestHttpException('没有找到要修改的记录');
         }
-        $model->scenario = 'update';//创建的场景
+        $model->scenario = 'update'; //创建的场景
         $model->setAttributes(Yii::$app->getRequest()->post());
-        
+
         if ($model->save() === false && !$model->hasErrors()) {
             throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
         }
@@ -221,9 +221,9 @@ class BranchServiceTypeController extends BaseController
         $guid = Yii::$app->getRequest()->post('GUID');
         $model = new $this->modelClass();
         $branchservice = $model::findOne($guid);
-        if(!$branchservice){
+        if (!$branchservice) {
             throw new BadRequestHttpException('没有找到要删除的记录');
-        }else if ($branchservice->delete() === false) {
+        } else if ($branchservice->delete() === false) {
             throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
         }
 
@@ -263,44 +263,44 @@ class BranchServiceTypeController extends BaseController
         $rbac = new ShopRbacUser();
         $userGuid = Yii::$app->user->identity->GUID;
         $userinfo = $rbac->getRbacUserInfo($userGuid);
-        if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){
+        if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
             throw new BadRequestHttpException('您没有导入门店服务类目的权限，请联系管理员');
         }
-        
+
         $model = new UploadFiles();
         if (Yii::$app->request->isPost) {
             //多文件用getInstances
-            $model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
+            $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
 
             $fileInfo = $model->upload();
-            
-            if ($fileInfo['CODE']==200) {
+
+            if ($fileInfo['CODE'] == 200) {
                 // 文件上传成功
                 $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
-                $tempArr=array_slice($rows,2);
+                $tempArr = array_slice($rows, 2);
                 $branchServiceModel = new $this->modelClass();
                 $branchServiceModel->scenario = 'import';
-                $transaction=$branchServiceModel->getDb()->beginTransaction();
+                $transaction = $branchServiceModel->getDb()->beginTransaction();
 
                 try {
                     foreach ($tempArr as $key => $value) {
                         $_servicModel = $branchServiceModel::findOne(['CODE' => $value[0]]);
-                        if ($_servicModel===null) {
+                        if ($_servicModel === null) {
                             $_servicModel = clone $branchServiceModel;
-                            $_servicModel->GUID=Func::create_guid();
-                            $_servicModel->ORG_GUID=Yii::$app->user->identity->ORG_GUID;
-                            $_servicModel->CREATE_TIME=date('Y-m-d H:i:s',time());
+                            $_servicModel->GUID = Func::create_guid();
+                            $_servicModel->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
+                            $_servicModel->CREATE_TIME = date('Y-m-d H:i:s', time());
                         }
-                        
-                        $_servicModel->CODE=$value[0];
-                        $_servicModel->NAME=$value[1];
-                        $_servicModel->THEME_COLOR=$value[2];
-                        $_servicModel->DESCRIPTION=$value[3];
+
+                        $_servicModel->CODE = $value[0];
+                        $_servicModel->NAME = $value[1];
+                        $_servicModel->THEME_COLOR = $value[2];
+                        $_servicModel->DESCRIPTION = $value[3];
 
                         if (!$_servicModel->save()) {
                             $transaction->rollBack();
                             $returnInfo = [
-                                ($key+1) => $_servicModel->errors
+                                ($key + 1) => $_servicModel->errors
                             ];
                             return $returnInfo;
                         }
@@ -308,12 +308,12 @@ class BranchServiceTypeController extends BaseController
                     $transaction->commit();
                     @unlink($fileInfo['INFO'][0]);
                     throw new HttpException("200", '导入成功');
-                }catch(\Throwable $e) {
+                } catch (\Throwable $e) {
                     $transaction->rollBack();
                     @unlink($fileInfo['INFO'][0]);
                     throw $e;
                 }
-            }else{
+            } else {
                 return $fileInfo['INFO'];
             }
         }
@@ -330,25 +330,25 @@ class BranchServiceTypeController extends BaseController
      *     security={{"Authorization": {}}}    
      * )
      */
-     public function actionBranchServiceExport()
-     {
+    public function actionBranchServiceExport()
+    {
         $model = new $this->modelClass();
         $params = Yii::$app->request->queryParams;
 
         $model->attributes = $params;
-        if(!$model->validate()){
-            throw new HttpException(422,json_encode($model->errors));
+        if (!$model->validate()) {
+            throw new HttpException(422, json_encode($model->errors));
         }
 
         $list = $model->BranchServiceExport($params);
-        if(!$list){
+        if (!$list) {
             throw new BadRequestHttpException('未找到符合条件的数据');
         }
 
-        $name = '门店服务类目'.date('Y-m-d',time());
+        $name = '门店服务类目' . date('Y-m-d', time());
         return Helper::newSpreadsheet()
-                ->addRow(['服务类目名称','服务类目编号','服务类目描述','主体颜色','创建时间'])
-                ->addRows($list)
-                ->output($name,'Csv');
-     } 
+            ->addRow(['服务类目名称', '服务类目编号', '服务类目描述', '主体颜色', '创建时间'])
+            ->addRows($list)
+            ->output($name, 'Csv');
+    }
 }

backend/controllers/v1/shopuser/UserComplainController.php

@@ -9,30 +9,27 @@ use yii\web\BadRequestHttpException;
 
 class UserComplainController extends BaseController
 {
-    public $modelClass='app\models\v1\shopuser\UserComplain';
-    // public $serializer = [
-    //     'class' => 'yii\rest\Serializer',
-    //     'collectionEnvelope' => 'usercomplain',
-    // ];
-/**
-* @OA\Get(
-*   path="/backend/web/v1/shopuser/user-complains/user-complain",
-*   tags={"用户&员工接口"},
-*   description="留言信息列表",
-*   summary="留言信息列表(孙磊)",
-*   operationId="UserComplain",
-*   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
-*   @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
-*   @OA\Response(response="200",description="OK。一切正常"),
-*   security={{"Authorization": {}}}
-* )
-*/
+    public $modelClass = 'app\models\v1\shopuser\UserComplain';
+    
+    /**
+     * @OA\Get(
+     *   path="/backend/web/v1/shopuser/user-complains/user-complain",
+     *   tags={"用户&员工接口"},
+     *   description="留言信息列表",
+     *   summary="留言信息列表(孙磊)",
+     *   operationId="UserComplain",
+     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
+     *   @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
+     *   @OA\Response(response="200",description="OK。一切正常"),
+     *   security={{"Authorization": {}}}
+     * )
+     */
     public function actionUserComplain()
-    {       
-        $model=new UserComplain();        
+    {
+        $model = new UserComplain();
         //用户输入数据赋值到模型属性
         $model->TS_PHONE = Yii::$app->request->get('phone');
-        
+
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
             $phone = $model->TS_PHONE;
@@ -47,5 +44,4 @@ class UserComplainController extends BaseController
             return $errors;
         }
     }
-
 }

backend/controllers/v1/shopuser/UserDepartmentController.php

@@ -9,28 +9,25 @@ use yii\web\BadRequestHttpException;
 
 class UserDepartmentController extends BaseController
 {
-    public $modelClass='app\models\v1\shopuser\UserDepartment';
-    // public $serializer = [
-    //     'class' => 'yii\rest\Serializer',
-    //     'collectionEnvelope' => 'userdepartment',
-    // ];
-/**
- * @OA\Get(
- *   path="/backend/web/v1/shopuser/user-departments/department",
- *   tags={"用户&员工接口"},
- *   description="部门信息列表",
- *   summary="部门信息列表(孙磊)",
- *   operationId="Department",
- *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
- *   @OA\Parameter(name="code",in="query",description="部门编号",@OA\Schema(type="string")),
- *   @OA\Parameter(name="name",in="query",description="部门名称",@OA\Schema(type="string")),
- *   @OA\Response(response="200",description="OK。一切正常"),
- *   security={{"Authorization": {}}}
- * )
- */
+    public $modelClass = 'app\models\v1\shopuser\UserDepartment';
+    
+    /**
+     * @OA\Get(
+     *   path="/backend/web/v1/shopuser/user-departments/department",
+     *   tags={"用户&员工接口"},
+     *   description="部门信息列表",
+     *   summary="部门信息列表(孙磊)",
+     *   operationId="Department",
+     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
+     *   @OA\Parameter(name="code",in="query",description="部门编号",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="name",in="query",description="部门名称",@OA\Schema(type="string")),
+     *   @OA\Response(response="200",description="OK。一切正常"),
+     *   security={{"Authorization": {}}}
+     * )
+     */
     public function actionDepartment()
-    {               
-        $model=new UserDepartment();
+    {
+        $model = new UserDepartment();
         //用户输入数据赋值到模型属性
         $model->CODE = Yii::$app->request->get('code');
         $model->NAME = Yii::$app->request->get('name');
@@ -39,7 +36,7 @@ class UserDepartmentController extends BaseController
             //所有输入数据都有效 all inputs are valid
             $code = $model->CODE;
             $name = $model->NAME;
-            $info = $model->DepartmentInfo($code,$name);
+            $info = $model->DepartmentInfo($code, $name);
             if (!$info->getModels()) {
                 throw new BadRequestHttpException('未找到符合的部门信息');
             }

backend/controllers/v1/transport/TransportInitialPriceController.php

@@ -45,16 +45,16 @@ class TransportInitialPriceController extends BaseController
      * )
      */
     public function actionInitialPriceList()
-    {   
-        $model = new ShopCityDistributionRegion();         
+    {
+        $model = new ShopCityDistributionRegion();
         $params = Yii::$app->request->queryParams;
         //权限信息
         $rbac = new ShopRbacUser();
         $userGuid = Yii::$app->user->identity->GUID;
         $userinfo = $rbac->getRbacUserInfo($userGuid);
-        if($userinfo){
+        if ($userinfo) {
             $params['BRANCH_GUID'] = $userinfo['BRANCH_GUID'];
-        }else{
+        } else {
             $params['BRANCH_GUID'] = '';
         }
         $params['BRANCH_GUID'] = 003;
@@ -98,14 +98,14 @@ class TransportInitialPriceController extends BaseController
         $param = Yii::$app->getRequest()->post();
         $guid = $param['GUID'];
         $model = $this->modelClass::findOne($guid);
-        
-        if(!$model){
+
+        if (!$model) {
             throw new BadRequestHttpException('没有找到要修改的记录');
         }
         //门店起送价修改
-        $model->scenario = 'update';//创建的场景
+        $model->scenario = 'update'; //创建的场景
         $model->setAttributes($param);
-        
+
         if ($model->save() === false && !$model->hasErrors()) {
             throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
         }
@@ -144,22 +144,22 @@ class TransportInitialPriceController extends BaseController
         $model = new UploadFiles();
         if (Yii::$app->request->isPost) {
             //多文件用getInstances
-            $model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
+            $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
 
             $fileInfo = $model->upload();
-            
-            if ($fileInfo['CODE']==200) {
+
+            if ($fileInfo['CODE'] == 200) {
                 // 文件上传成功
                 $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
-                $tempArr=array_slice($rows,2);
+                $tempArr = array_slice($rows, 2);
                 $citydisregion = new $this->modelClass();
                 $citydisregion->scenario = 'import';
-                $transaction=$citydisregion->getDb()->beginTransaction();
-                
+                $transaction = $citydisregion->getDb()->beginTransaction();
+
                 try {
                     foreach ($tempArr as $key => $value) {
-                        $CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID.'-'.$value[0];
-                        $_citydisregion = $citydisregion->getBranchInitialPrice('',$CS_BRANCH_GUID);
+                        $CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID . '-' . $value[0];
+                        $_citydisregion = $citydisregion->getBranchInitialPrice('', $CS_BRANCH_GUID);
                         // $_citydisregion = $citydisregion->getBranchInitialPrice('',003);
                         //权限信息
                         $rbac = new ShopRbacUser();
@@ -167,36 +167,36 @@ class TransportInitialPriceController extends BaseController
                         $userinfo = $rbac->getRbacUserInfo($userGuid);
                         //return $userinfo;
                         //判断当前账号是省级还是门店还是总部
-                        if($userinfo['ROLE_ID'] == USER_ROLE_HEADQUARTERS_ADMIN || $userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN){
+                        if ($userinfo['ROLE_ID'] == USER_ROLE_HEADQUARTERS_ADMIN || $userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
                             //如果是省级,查询出该门店是否是该省级下的
                             $branchModel = new ShopBranch();
                             // $userinfo['BRANCH_GUID'] = 003;
-                            $isbrancharr = $branchModel->GetBranch($CS_BRANCH_GUID,$userinfo['BRANCH_GUID']);
-                            
-                            if(!$isbrancharr){
+                            $isbrancharr = $branchModel->GetBranch($CS_BRANCH_GUID, $userinfo['BRANCH_GUID']);
+
+                            if (!$isbrancharr) {
                                 continue;
                             }
-                        }else if($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN){//如果是门店
-                            if($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID){
+                        } else if ($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN) { //如果是门店
+                            if ($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID) {
                                 continue;
                             }
                         }
                         //修改已有的起送价设置
-                        if(!$list = $_citydisregion->getModels()){
+                        if (!$list = $_citydisregion->getModels()) {
                             continue;
-                        }else{
+                        } else {
                             //更新起送价
                             $GUID = $list[0]['GUID'];
                             $_cdrModel = $citydisregion::findOne(['GUID' => $GUID]);
-                            if(empty($value[1])){
-                                $value[1]=0;
+                            if (empty($value[1])) {
+                                $value[1] = 0;
                             }
-                            $_cdrModel->INITIAL_PRICE=$value[1];
+                            $_cdrModel->INITIAL_PRICE = $value[1];
 
                             if (!$_cdrModel->save()) {
                                 $transaction->rollBack();
                                 $returnInfo = [
-                                    ($key+1) => $_cdrModel->errors
+                                    ($key + 1) => $_cdrModel->errors
                                 ];
                                 return $returnInfo;
                             }
@@ -205,12 +205,12 @@ class TransportInitialPriceController extends BaseController
                     $transaction->commit();
                     @unlink($fileInfo['INFO'][0]);
                     throw new HttpException("200", '导入成功');
-                }catch(\Throwable $e) {
+                } catch (\Throwable $e) {
                     $transaction->rollBack();
                     @unlink($fileInfo['INFO'][0]);
                     throw $e;
                 }
-            }else{
+            } else {
                 return $fileInfo['INFO'];
             }
         }

backend/models/v1/branch/BranchServiceType.php

@@ -5,6 +5,7 @@ namespace app\models\v1\branch;
 use Yii;
 use app\models\v1\BaseModel;
 use yii\data\ActiveDataProvider;
+
 /**
  * This is the model class for table "shop_branch_service_type".
  *
@@ -32,15 +33,15 @@ class BranchServiceType extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required','on'=>['create','update']],
+            [['GUID'], 'required', 'on' => ['create', 'update']],
             [['CREATE_TIME'], 'safe'],
             [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
             [['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255],
             [['GUID'], 'unique'],
 
-            [['CODE','NAME'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'],
-            [['DESCRIPTION'],'string', 'max' => 100,'on'=>['import'],'tooLong'=>'最大长度不能超过100'],
-            [['NAME'],'string', 'max' => 50,'on'=>['import'],'tooLong'=>'{attribute}最大长度不能超过50'],
+            [['CODE', 'NAME'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
+            [['DESCRIPTION'], 'string', 'max' => 100, 'on' => ['import'], 'tooLong' => '最大长度不能超过100'],
+            [['NAME'], 'string', 'max' => 50, 'on' => ['import'], 'tooLong' => '{attribute}最大长度不能超过50'],
         ];
     }
 
@@ -60,7 +61,7 @@ class BranchServiceType extends BaseModel
         ];
     }
     //门店-门店服务类目信息
-    public function BranchServiceInfo($code,$name,$guid='')
+    public function BranchServiceInfo($code, $name, $guid = '')
     {
         $query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME');
 
@@ -75,7 +76,7 @@ class BranchServiceType extends BaseModel
         if (isset($guid) && !empty($guid)) {
             $query->andWhere(['=', 'GUID', $guid]);
         }
-        
+
         return new ActiveDataProvider(
             [
                 'query' => $query->asArray(),
@@ -89,8 +90,8 @@ class BranchServiceType extends BaseModel
     public function BranchServiceInfoAll()
     {
         $query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME')
-                               ->all();
-        
+            ->all();
+
         return $query;
     }
     //门店服务类目导出
@@ -107,11 +108,11 @@ class BranchServiceType extends BaseModel
         }
 
         $list = [];
-        foreach($query->all() as $request){
+        foreach ($query->all() as $request) {
             $list[] = $request->toArray();
         }
 
-        foreach($list as $key => $value){
+        foreach ($list as $key => $value) {
             $row_list[] = [
                 $value['NAME'],         //服务类目名称
                 $value['CODE'],         //服务类目编号
@@ -122,4 +123,4 @@ class BranchServiceType extends BaseModel
         }
         return $row_list;
     }
-}
+}
\ No newline at end of file

backend/models/v1/branch/ShopBranch.php

@@ -96,16 +96,16 @@ class ShopBranch extends BaseModel
     }
     const SCENARIO_DCUPDATE = 'dcUpdate';
 
-    public $IS_BRANCH_SELF_MENTION;//是否门店自提
-    public $IS_BRANCH_EXPRESS_DELIVERY;//是否门店快递配送
-    public $IS_DELIVERS_GOODS;//是否送货上门
-    public $IS_EXPRESS_DELIVERY;//是否快递配送
-    public $IS_BRANCH_SELF_DELIVERY;//是否门店自配送
-    public $IS_HAFL_HOUR_DELIVERY;//是否半小时达
-    public $IS_ONE_HOUR_DELIVERY;//是否1小时达
-    public $IS_TWO_HOUR_DELIVERY;//是否2小时达
-    public $IS_DAY_DELIVERY;//是否当日定时达
-    public $SERVICE_TYPE_CODE;//服务门店CODE
+    public $IS_BRANCH_SELF_MENTION; //是否门店自提
+    public $IS_BRANCH_EXPRESS_DELIVERY; //是否门店快递配送
+    public $IS_DELIVERS_GOODS; //是否送货上门
+    public $IS_EXPRESS_DELIVERY; //是否快递配送
+    public $IS_BRANCH_SELF_DELIVERY; //是否门店自配送
+    public $IS_HAFL_HOUR_DELIVERY; //是否半小时达
+    public $IS_ONE_HOUR_DELIVERY; //是否1小时达
+    public $IS_TWO_HOUR_DELIVERY; //是否2小时达
+    public $IS_DAY_DELIVERY; //是否当日定时达
+    public $SERVICE_TYPE_CODE; //服务门店CODE
     public $search; //门店编码或名称搜索
 
     /**
@@ -115,11 +115,13 @@ class ShopBranch extends BaseModel
     public function scenarios()
     {
         $scenarios = parent::scenarios();
-        $scenarios[self::SCENARIO_DCUPDATE] =  ['NAME','BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY','RECIVER_REGION','ADDRESS','PHONE',
-        'CONTACT_NAME','BRANCH_TYPE','LAT','LNG','IS_SHELVE','WORK_TIME','DELIVERY_TIME','RETURN_ADDRESS','DESCRIPTION',
-        'UPDATE_TIME'];
+        $scenarios[self::SCENARIO_DCUPDATE] =  [
+            'NAME', 'BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'ADDRESS', 'PHONE',
+            'CONTACT_NAME', 'BRANCH_TYPE', 'LAT', 'LNG', 'IS_SHELVE', 'WORK_TIME', 'DELIVERY_TIME', 'RETURN_ADDRESS', 'DESCRIPTION',
+            'UPDATE_TIME'
+        ];
         return $scenarios;
-    }  
+    }
     /**
      * {@inheritdoc}
      */
@@ -158,9 +160,9 @@ class ShopBranch extends BaseModel
                 'IS_DAY_DELIVERY'
             ], 'in', 'range' => [0, 1], 'on' => ['import'], 'message' => '{attribute}只能为0或1'],
 
-            [['SERVICE_TYPE_CODE'], 'validateEffective'],//如果影响性能就注释掉
-            [['BRANCH_NAME', 'NAME','BRANCH_TYPE'], 'required','on'=>[self::SCENARIO_DCUPDATE]],
-            [['BRANCH_TYPE'], 'in', 'range' => [1, 2],'on'=>[self::SCENARIO_DCUPDATE]],
+            [['SERVICE_TYPE_CODE'], 'validateEffective'], //如果影响性能就注释掉
+            [['BRANCH_NAME', 'NAME', 'BRANCH_TYPE'], 'required', 'on' => [self::SCENARIO_DCUPDATE]],
+            [['BRANCH_TYPE'], 'in', 'range' => [1, 2], 'on' => [self::SCENARIO_DCUPDATE]],
             [['search'], 'string', 'on' => 'search'],
         ];
     }
@@ -376,26 +378,26 @@ class ShopBranch extends BaseModel
     {
         return $query = static::find()
             ->select('GUID,NAME')
-            ->where(['BRANCH_TYPE'=>1])
+            ->where(['BRANCH_TYPE' => 1])
             ->all();
     }
     //获取门店区域信息或分公司下区域信息
-    public function getBranchRegion($SUPPROVINCE_GUID,$flag='')
+    public function getBranchRegion($SUPPROVINCE_GUID, $flag = '')
     {
-        if(empty($flag) && !empty($SUPPROVINCE_GUID)){
+        if (empty($flag) && !empty($SUPPROVINCE_GUID)) {
             return $query = static::find()
-            ->select('GUID,NAME')
-            ->where(['BRANCH_TYPE'=>2])
-            ->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID])
-            ->asArray()
-            ->all();
+                ->select('GUID,NAME')
+                ->where(['BRANCH_TYPE' => 2])
+                ->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
+                ->asArray()
+                ->all();
         }
-        if(!empty($flag) && !empty($SUPPROVINCE_GUID)){
+        if (!empty($flag) && !empty($SUPPROVINCE_GUID)) {
             return $query = static::find()
-            ->select('GUID,NAME')
-            ->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID])
-            ->asArray()
-            ->all();
+                ->select('GUID,NAME')
+                ->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
+                ->asArray()
+                ->all();
         }
         return '';
     }

backend/models/v1/branch/ShopBranchService.php

@@ -31,11 +31,11 @@ class ShopBranchService extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required','on'=>['create','update']],
+            [['GUID'], 'required', 'on' => ['create', 'update']],
             [['STATE'], 'integer'],
             [['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID'], 'string', 'max' => 50],
             [['ORDER_INDEX'], 'string', 'max' => 5],
-            [['GUID'], 'unique','on'=>['create']],
+            [['GUID'], 'unique', 'on' => ['create']],
         ];
     }
 
@@ -55,7 +55,7 @@ class ShopBranchService extends BaseModel
     //删除门店原有服务类目
     public function BranchServiceDel($b_guid)
     {
-        $branch_service = static::deleteAll(['BRANCH_GUID'=>$b_guid]);
+        $branch_service = static::deleteAll(['BRANCH_GUID' => $b_guid]);
         return $branch_service;
     }
     //获取门店服务类目关系
@@ -63,12 +63,11 @@ class ShopBranchService extends BaseModel
     {
         $branch_service = static::find()
             ->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID')
-            ->where(['STATE'=>1])
-            ->andwhere(['BRANCH_GUID'=>$b_guid])
+            ->where(['STATE' => 1])
+            ->andwhere(['BRANCH_GUID' => $b_guid])
             ->asArray()
             ->all();
-            
+
         return $branch_service;
     }
-    
-}
+}
\ No newline at end of file

backend/models/v1/branch/ShopCityDistributionRegion.php

 <?php
+
 namespace app\models\v1\branch;
 
 use Yii;
@@ -40,17 +41,17 @@ class ShopCityDistributionRegion extends BaseModel
     public function rules()
     {
         return [
-            [['GUID','SORT','COLORS','DIVIDE_TYPE','REGION_R','REGION_RANGE','INITIAL_PRICE','DELIVERY_PRICE'], 'required','on'=>"save"],
-            [['DIVIDE_TYPE'], 'in', 'range' => [1, 2],'on'=>"save"],
+            [['GUID', 'SORT', 'COLORS', 'DIVIDE_TYPE', 'REGION_R', 'REGION_RANGE', 'INITIAL_PRICE', 'DELIVERY_PRICE'], 'required', 'on' => "save"],
+            [['DIVIDE_TYPE'], 'in', 'range' => [1, 2], 'on' => "save"],
             [['SORT'], 'integer'],
-            [['REGION_RANGE','COLORS'], 'string'],
-            [['INITIAL_PRICE', 'DELIVERY_PRICE','REGION_R'], 'double'],
+            [['REGION_RANGE', 'COLORS'], 'string'],
+            [['INITIAL_PRICE', 'DELIVERY_PRICE', 'REGION_R'], 'double'],
 
-            [['GUID', 'REGION_RANGE'], 'required','on'=>['create']],
-            [['GUID'],'required','on'=>['update']],
-            [['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50,'on'=>['create']],
-            [['GUID'], 'unique','on'=>['create']],
-            [['INITIAL_PRICE'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'],
+            [['GUID', 'REGION_RANGE'], 'required', 'on' => ['create']],
+            [['GUID'], 'required', 'on' => ['update']],
+            [['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50, 'on' => ['create']],
+            [['GUID'], 'unique', 'on' => ['create']],
+            [['INITIAL_PRICE'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
         ];
     }
 
@@ -83,29 +84,29 @@ class ShopCityDistributionRegion extends BaseModel
         return $this->hasOne(ShopCityDistributionSetting::className(), ['GUID' => 'CITY_DISTR_GUID']);
     }
     //获取门店起送价
-    public function getBranchInitialPrice($params,$guid='')
+    public function getBranchInitialPrice($params, $guid = '')
     {
         $query = static::find()->alias('sg')
             ->select("sg.GUID,cs.REGION_TYPE,cs.REGION_DISTR_DISTANCE,cs.REGION_DISTR_PRICE,cs.INCREASE_DISTANCE,
-                      cs.INCREASE_PRICE,sg.DELIVERY_PRICE,cs.STATUS,sb.CODE,sb.NAME,sg.INITIAL_PRICE,cs.SETTING_TYPE" )
+                      cs.INCREASE_PRICE,sg.DELIVERY_PRICE,cs.STATUS,sb.CODE,sb.NAME,sg.INITIAL_PRICE,cs.SETTING_TYPE")
             ->leftJoin('SHOP_CITY_DISTRIBUTION_SETTING cs', 'cs.GUID=sg.CITY_DISTR_GUID')
-            ->leftJoin('SHOP_BRANCH sb','sb.GUID=cs.BRANCH_GUID')
+            ->leftJoin('SHOP_BRANCH sb', 'sb.GUID=cs.BRANCH_GUID')
             ->where(['cs.SETTING_TYPE' => 2]);
-        
+
         //门店名称或编码
         if (isset($params['CODE']) && !empty($params['CODE'])) {
-            $query->andfilterWhere(['or', ['like','sb.CODE', $params['CODE']],['like', 'sb.NAME', $params['CODE']]]);
+            $query->andfilterWhere(['or', ['like', 'sb.CODE', $params['CODE']], ['like', 'sb.NAME', $params['CODE']]]);
         }
         //当前权限允许的门店
         if (isset($params['BRANCH_GUID']) && !empty($params['BRANCH_GUID'])) {
-            $query->andFilterWhere(['or',['=','ifnull(sb.SUPPROVINCE_GUID,cs.BRANCH_GUID)',$params['BRANCH_GUID']],['=',"ifnull(sb.PARENT_GUID,'')",$params['BRANCH_GUID']]]);
+            $query->andFilterWhere(['or', ['=', 'ifnull(sb.SUPPROVINCE_GUID,cs.BRANCH_GUID)', $params['BRANCH_GUID']], ['=', "ifnull(sb.PARENT_GUID,'')", $params['BRANCH_GUID']]]);
             //$query->andWhere(['not', ['sg.GUID' => '']]);
-            $query->andWhere(['!=','sg.GUID','']);
+            $query->andWhere(['!=', 'sg.GUID', '']);
         }
         //批量修改 条件
-        if(isset($guid) && !empty($guid)){
-            $query->andFilterWhere(['=','cs.BRANCH_GUID',$guid]);
-            $query->andWhere(['!=','sg.GUID','']);
+        if (isset($guid) && !empty($guid)) {
+            $query->andFilterWhere(['=', 'cs.BRANCH_GUID', $guid]);
+            $query->andWhere(['!=', 'sg.GUID', '']);
         }
 
         return new ActiveDataProvider([

backend/models/v1/rbacuser/ShopRbacRole.php

@@ -3,10 +3,10 @@
 namespace app\models\v1\rbacuser;
 
 use Yii;
-use yii\web\IdentityInterface;    
-use app\models\v1\BaseModel; 
+use yii\web\IdentityInterface;
+use app\models\v1\BaseModel;
 use yii\web\HttpException;
-use yii\data\ActiveDataProvider;   
+use yii\data\ActiveDataProvider;
 
 /**
  * This is the model class for table "shop_rbac_role".
@@ -71,14 +71,14 @@ class ShopRbacRole extends  BaseModel
     public function getAuthorityRoles($ID)
     {
         $query = static::find()
-                 ->select('ID,NAME,PID,STATUS,REMARK,SORT')
-                 ->where(['STATUS' => 1])
-                 ->orderBy('SORT ASC');
-        
-        if(isset($ID) && !empty($ID)){
-            $query->andFilterWhere(['=','ID',$ID]);
+            ->select('ID,NAME,PID,STATUS,REMARK,SORT')
+            ->where(['STATUS' => 1])
+            ->orderBy('SORT ASC');
+
+        if (isset($ID) && !empty($ID)) {
+            $query->andFilterWhere(['=', 'ID', $ID]);
         }
-                 
+
         return new ActiveDataProvider([
             'query' => $query->asArray(),
             'pagination' => [

backend/models/v1/rbacuser/ShopRbacRoleAccess.php

@@ -2,9 +2,9 @@
 
 namespace app\models\v1\rbacuser;
 
-use Yii;   
-use app\models\v1\BaseModel; 
-use yii\web\HttpException;   
+use Yii;
+use app\models\v1\BaseModel;
+use yii\web\HttpException;
 
 /**
  * This is the model class for table "shop_rbac_role_access".
@@ -29,7 +29,7 @@ class ShopRbacRoleAccess extends  BaseModel
     public function rules()
     {
         return [
-            [['NODE_ID'], 'required','on'=>['create']],
+            [['NODE_ID'], 'required', 'on' => ['create']],
             [['ROLE_ID', 'NODE_ID'], 'string', 'max' => 20],
             [['ORG_GUID'], 'string', 'max' => 50],
         ];
@@ -50,15 +50,15 @@ class ShopRbacRoleAccess extends  BaseModel
     public function getRoleAuthorities($id)
     {
         return $query = static::find()
-                 ->select('ROLE_ID,NODE_ID')
-                 ->where(['ROLE_ID' => $id])
-                 ->asArray()
-                 ->all(); 
+            ->select('ROLE_ID,NODE_ID')
+            ->where(['ROLE_ID' => $id])
+            ->asArray()
+            ->all();
     }
     //删除角色原有权限
     public function delRoleAuthorities($ROLE_ID)
     {
-        $roleAuth = static::find()->where(['ROLE_ID'=>$ROLE_ID])->one(); 
+        $roleAuth = static::find()->where(['ROLE_ID' => $ROLE_ID])->one();
         $res = $roleAuth->delete();
         return $res;
     }

backend/models/v1/shopuser/UserComplain.php

@@ -42,7 +42,7 @@ class UserComplain extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required','on'=>['create']],
+            [['GUID'], 'required', 'on' => ['create']],
             [['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'],
             [['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'],
             [['COMPLAIN_TYPE'], 'integer'],
@@ -80,10 +80,10 @@ class UserComplain extends BaseModel
     public function UserComplainInfo($phone)
     {
         $query = static::find()
-              ->from('shop_user_complain suc')
-              ->select('suc.GUID,su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE')
-              ->leftjoin('shop_user su', 'su.GUID = suc.TS_USER_GUID');
-        if($phone){
+            ->from('shop_user_complain suc')
+            ->select('suc.GUID,su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE')
+            ->leftjoin('shop_user su', 'su.GUID = suc.TS_USER_GUID');
+        if ($phone) {
             $query->Where(['like', 'suc.TS_PHONE', $phone]);
         }
         return new ActiveDataProvider(
@@ -93,6 +93,6 @@ class UserComplain extends BaseModel
                     'pageSize' =>  15,
                 ]
             ]
-        );    
+        );
     }
-}
+}
\ No newline at end of file

backend/models/v1/shopuser/UserDepartment.php

@@ -33,7 +33,7 @@ class UserDepartment extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required','on'=>['create']],
+            [['GUID'], 'required', 'on' => ['create']],
             [['UPDATE_TIME'], 'safe'],
             [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
             [['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255],
@@ -57,11 +57,11 @@ class UserDepartment extends BaseModel
         ];
     }
     //用户-部门信息
-    public function DepartmentInfo($code,$name)
+    public function DepartmentInfo($code, $name)
     {
         //$org_guid = 2;
         $query = static::find()->select('GUID,NAME,CODE,COMPANY,SUB_COMPANY,UPDATE_TIME');
-            //->where(['ORG_GUID' => $org_guid]);
+        //->where(['ORG_GUID' => $org_guid]);
 
         if (isset($name) && !empty($name)) {
             $query->andWhere(['like', 'NAME', $name]);
@@ -79,4 +79,4 @@ class UserDepartment extends BaseModel
             ]
         );
     }
-}
+}
\ No newline at end of file