Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/branch/BranchScoreController.php

@@ -9,6 +9,7 @@ use backend\helpers\Func;
 use yii\web\BadRequestHttpException;
 use yii\web\ServerErrorHttpException;
 use app\models\v1\branch\ShopBranch;
+use app\models\v1\rbacuser\ShopRbacUser;
 use backend\helpers\UploadFiles;
 use yii\web\UploadedFile;
 use yidas\phpSpreadsheet\Helper;
@@ -272,9 +273,10 @@ class BranchScoreController extends BaseController
         $model->scenario = 'creation';
         $model->attributes = Yii::$app->request->post();
 
+        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
         $info = ShopBranch::findOne(['CODE' => $model->BRANCH_CODE]);
-        if (!$info) {
-            throw new BadRequestHttpException('新增失败，该门店不存在');
+        if (!$info || ($userInfo['BRANCH_CODE'] != $info['CODE'] && $userInfo['BRANCH_CODE'] != $info['PARENT_GUID'])) {
+            throw new BadRequestHttpException('门店编号不正确，或不存在');
         }
 
         $model->BRANCH_NAME = $info['NAME'];

backend/controllers/v1/shopuser/ShopEmployeeController.php

@@ -322,6 +322,7 @@ class ShopEmployeeController extends BaseController
             throw new BadRequestHttpException("不存在此员工！");
         }
         $_model->scenario = 'employeeUpdate';
+        $_model->attributes = $params;
         $_model->CODE = $params['MOBILE_PHONE'];
         $_model->UPDATE_GUID = Yii::$app->user->identity->GUID;
         $_model->UPDATE_NAME = Yii::$app->user->identity->NAME;

backend/controllers/v1/transport/TransportSettingController.php

@@ -102,9 +102,9 @@ class TransportSettingController extends BaseController
         if (!$info) {
             throw new BadRequestHttpException('请求信息不存在');
         }
-        $info['SELECT_AREA'] = explode(',', $info['SELECT_AREA']);
+        $info['SELECT_AREA'] = trim($info['SELECT_AREA']) ? explode(',', $info['SELECT_AREA']) : [];
         $info['PROVINCES'] = (new ShopTransportArea)->getProvinces($info['SELECT_AREA']);
-        $info['LIMIT_MEMBER_GROUP_GUID'] = explode(',', $info['LIMIT_MEMBER_GROUP_GUID']);
+        $info['LIMIT_MEMBER_GROUP_GUID'] = trim($info['LIMIT_MEMBER_GROUP_GUID']) ? explode(',', $info['LIMIT_MEMBER_GROUP_GUID']) : [];
 
         $transportBranches = (new ShopPackagingcostsBranches)->transportBranches($model->GUID);
         $info['BRANCHES_INFO'] = $transportBranches;  //指定省级
@@ -176,9 +176,8 @@ class TransportSettingController extends BaseController
         }
 
         //验证权限
-        // $branchInfo = ShopBranch::find()->select(['BRANCH_TYPE', 'SUPPROVINCE_GUID'])->where(['GUID' => $_model['GROUP_GUID']])->one();  //门店管理权限，或三级及以下权限用
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        //分部管理员权限2,（当同为省级，非管理员所属省级不可编辑；属于上级创建可编辑）
+        //分部管理员权限,（当同为省级，非管理员所属省级不可编辑；属于上级创建可编辑）
         if ($userInfo['BRANCH_TYPE'] == BRANCH_TYPE_REGION && ($userInfo['BRANCH_GUID'] != $_model['GROUP_GUID']) && ($userInfo['PARENT_BRANCH_GUID'] != $_model['GROUP_GUID'])) {
             throw new BadRequestHttpException('没有修改权限！');
         }
@@ -225,11 +224,13 @@ class TransportSettingController extends BaseController
             throw new ServerErrorHttpException($th);
         }
 
-        //如果是总部创建的模板门店不能修改shop_transport_setting 数据
+        //如果是总部创建的模板下级不能修改shop_transport_setting 数据
+        if ($userInfo['BRANCH_TYPE'] != BRANCH_TYPE_REGION && $userInfo['PARENT_BRANCH_GUID'] != $_model['GROUP_GUID']) {
             if (!$_model->save()) {
                 Yii::$app->response->statusCode = 422;
                 return $_model->errors;
             }
+        }
         throw new HttpException(200, "更新成功！");
     }
 

backend/models/v1/branch/ShopBranchScore.php

@@ -174,10 +174,27 @@ class ShopBranchScore extends BaseModel
      */
     public function branchScoreExport($params)
     {
+        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
+        //权限
+        $where = [];
+        switch ($userInfo['BRANCH_TYPE']) {
+            case BRANCH_TYPE_REGION:  //省级
+                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID'],'CODE');
+                $branches[] = $userInfo['BRANCH_CODE'];
+                $where = ['sbs.BRANCH_CODE' => $branches];
+                break;
+            case BRANCH_TYPE_STORE:  //门店
+                $where = ['sbs.BRANCH_CODE' => $userInfo['BRANCH_CODE']];
+                break;
+            default:
+                $where = [];
+                break;
+        }
         $query = static::find()->alias('sbs')
             ->select('sb.NAME as BRANCH_NAME,sbs.BRANCH_CODE,sbs.BASIC_SERVICES,sbs.QUALITY_ASSURANCE,sbs.OPERATION_MANAGEMENT,sbs.STORE_IMAGE,sbs.ELECTRICITY_MANAGEMENT,sbs.CUSTOMERE_VALUATION,sbs.STORE_CONFIGURATION,sbs.ARTIFICIAL_NUMBER,sbs.ARTIFICIAL_NAME,sbs.UPDATE_TIME,sb.SCORE')
             ->leftJoin('shop_branch sb', 'sbs.BRANCH_CODE=sb.CODE')
-            ->orderBy(['BRANCH_CODE' => SORT_ASC]);
+            ->orderBy(['BRANCH_CODE' => SORT_ASC])
+            ->andFilterWhere($where);
 
         if (isset($params['BRANCH_CODE'])) {
             $query->andfilterWhere(['like', 'sbs.BRANCH_CODE', $params['BRANCH_CODE']]);

backend/models/v1/shopuser/ShopEmployee.php

@@ -21,7 +21,6 @@ class ShopEmployee extends ShopUser
         $fields[] = [['EMPLOYEE_CODE'], 'unique', 'on' => ['add', 'employeeUpdate']];
         $fields[] = [['EMPLOYEE_CODE'], 'required', 'on' => ['import', 'add']];
         $fields[] = ['MOBILE_PHONE', 'match', 'pattern' => '/^[1][34578][0-9]{9}$/', 'message' => '请输入有效的手机号码'];
-        $fields[] = [['CONTACTBIRTH_DATE'], 'date', 'format' => 'Y-m-d'];
         $fields[] = ['BRANCH_CODE', 'validateBranchCode', 'on' => ['add', 'employeeUpdate']];
         return $fields;
     }

backend/models/v1/shopuser/ShopUser.php

@@ -100,6 +100,7 @@ class ShopUser extends BaseModel
             [['ALIPAYAC_COUNT'], 'string', 'max' => 30],
             [['CODE'], 'unique', 'on' => ['creation']],
             [['GUID'], 'unique', 'on' => ['creation','add']],
+            [['CONTACTBIRTH_DATE'], 'date', 'format' => 'Y-m-d'],
         ];
     }
 

backend/models/v1/transport/TransportSetting.php

@@ -99,6 +99,9 @@ class TransportSetting extends \app\models\v1\BaseModel
             case BRANCH_TYPE_REGION:
                 $where = ['or', ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']], ['ts.GROUP_GUID' => $userInfo['BRANCH_GUID']]];
                 break;
+            case BRANCH_TYPE_STORE:
+                $where = ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']];
+                break;
             default:
                 $where = ['>', 1, 2];
                 break;