一些调整

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

backend/controllers/v1/shopuser/ShopEmployeeController.php

@@ -3,6 +3,7 @@
 namespace backend\controllers\v1\shopuser;
 
 use app\models\v1\branch\ShopBranch;
+use app\models\v1\rbacuser\ShopRbacUser;
 use Yii;
 use backend\controllers\v1\BaseController;
 use backend\helpers\Func;
@@ -137,7 +138,7 @@ class ShopEmployeeController extends BaseController
         }
 
         $data = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(true, ['rowOffset' => 2, 'columns' => 9]);
-        $arr = (new ShopBranch)->validateBranch($data, 8);
+        $arr = (new ShopBranch)->validateBranch($data, 8); //批量验证门店
         if (isset($arr['CODE'])) {
             @unlink($fileInfo['INFO'][0]);
             Yii::$app->response->statusCode = 422;
@@ -237,9 +238,26 @@ class ShopEmployeeController extends BaseController
     public function actionEmployeeAdd()
     {
         $params = Yii::$app->request->bodyParams;
+        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
+        //权限
+        switch ($userInfo['BRANCH_TYPE']) {
+            case BRANCH_TYPE_REGION:  //省级
+                $branches = (new ShopBranch)->getBranches($userInfo['BRANCH_GUID']);
+                $branches[] = $userInfo['BRANCH_GUID'];
+                $permit = in_array($params['BRANCH_CODE'], $branches) ? 1 : 0;
+                break;
+            case BRANCH_TYPE_STORE:  //门店
+                $permit = $userInfo['BRANCH_GUID'] == $params['BRANCH_CODE'] ? 1 : 0;
+                break;
+            default:
+                $permit = 1;
+                break;
+        }
+        if ($permit == 0) {
+            throw new BadRequestHttpException('门店编码有误！');
+        }
         $model = new $this->modelClass();
         $model->scenario = 'add';
-
         $model->attributes = $params;
         $model->GUID = Func::create_guid();
         $model->CODE = $params['MOBILE_PHONE'];

backend/controllers/v1/transport/TransportSettingController.php

@@ -26,7 +26,7 @@ class TransportSettingController extends BaseController
      *                运费模板列表:
      *                运费模板所属平台，如果不填默认取微商城的运费模板",
      *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
-     *   @OA\Parameter(name="PLATFORM_TYPE",in="query",required=true,description="运费模板所属平台(微商城:shop,积分商城:points)",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="PLATFORM_TYPE",in="query",description="运费模板所属平台(默认微商城:shop,积分商城:points)",@OA\Schema(type="string"),example="shop"),
      *   @OA\Response(response="200",description="
      *                GUID:运费模板GUID,
      *                TRANSPORT_NAME:配送方式,
@@ -329,9 +329,9 @@ class TransportSettingController extends BaseController
      *                @OA\Property(property="PLATFORM_TYPE",type="sting",description="运费模板所属平台(默认微商城:shop,积分商城:points)",example="shop"),
      *                @OA\Property(property="TRANSPOR_TTYPE" ,type="string", description="配送方式(GUID)"),
      *                @OA\Property(property="BASE_FEE", type="float(18,2)",description="统一费用(元)"),
-     *                @OA\Property(property="BASE_WEIGHT", type="string",description="首重(克)"),
+     *                @OA\Property(property="BASE_WEIGHT", type="float(18,2)",description="首重(克)"),
      *                @OA\Property(property="BASE_WEIGHT_FEE", type="float(18,2)",description="首重费用(元)"),
-     *                @OA\Property(property="INCREASE_WEIGHT", type="string",description="续重(克)"),
+     *                @OA\Property(property="INCREASE_WEIGHT", type="float(18,2)",description="续重(克)"),
      *                @OA\Property(property="INCREASE_WEIGHT_FEE", type="float(18,2)",description="续重费用(元)"),
      *                @OA\Property(property="IS_USED", type="int",description="是否启用（默认启用）",example="1"),
      *                @OA\Property(property="DESCRIPTION", type="string",description="简介"),

backend/models/v1/branch/ShopBranch.php

@@ -485,20 +485,21 @@ class ShopBranch extends BaseModel
     }
 
     /**
-     * 获取某省级下的所有门店GUID
+     * 获取某省级下的所有门店GUID，或其他单一字段，例如'CODE'
      * 
      * @param string $ProvinceBranchGuid  省级门店GUID
+     * @param string $attribute 需要获取的字段(单个字段,默认获取GUID)
      * @return array|null  返回此省级下的所有门店
      */
-    public function getBranches($ProvinceBranchGuid)
+    public function getBranches($ProvinceBranchGuid, $attribute = "GUID")
     {
         $query = static::find()
-            ->select('GUID')
+            ->select($attribute)
             ->where(['BRANCH_TYPE' => BRANCH_TYPE_STORE])
             ->andWhere(['PARENT_GUID' => $ProvinceBranchGuid])
             ->asArray()
             ->all();
-        $temp = array_column($query, 'GUID');
+        $temp = array_column($query, $attribute);
         return $temp;
     }
 

backend/models/v1/branch/ShopBranchScore.php

@@ -4,6 +4,7 @@ namespace app\models\v1\branch;
 
 use Yii;
 use app\models\v1\BaseModel;
+use app\models\v1\rbacuser\ShopRbacUser;
 use yii\data\ActiveDataProvider;
 
 /**
@@ -93,9 +94,26 @@ class ShopBranchScore extends BaseModel
      */
     public function branchScoreList($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('sbs.GUID,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');
+            ->leftJoin('shop_branch sb', 'sbs.BRANCH_CODE=sb.CODE')
+            ->andFilterWhere($where);
 
         if (isset($params['BRANCH_CODE'])) {
             $query->andfilterWhere(['like', 'sbs.BRANCH_CODE', $params['BRANCH_CODE']]);
@@ -108,7 +126,7 @@ class ShopBranchScore extends BaseModel
         return new ActiveDataProvider([
             'query' => $query->asArray(),
             'pagination' => [
-                'pageSize' => 10
+                'pageSize' => PAGE_SIZE
             ],
             'sort' => [
                 'attributes' => [

backend/models/v1/transport/TransportSetting.php

@@ -44,10 +44,10 @@ class TransportSetting extends \app\models\v1\BaseModel
     {
         return [
             [['GUID', 'ORG_GUID'], 'required', 'on' => ['creation']],
-            [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE'], 'number'],
+            [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'BASE_WEIGHT'], 'number'],
             [['SELECT_AREA', 'LIMIT_MEMBER_GROUP_GUID'], 'string'],
             [['IS_DEFAULT', 'IS_USED'], 'integer'],
-            [['GUID', 'ORG_GUID', 'TRANSPOR_TTYPE', 'TRANSPORT_COMPANY', 'BASE_WEIGHT', 'INCREASE_WEIGHT', 'PLATFORM_TYPE', 'GROUP_GUID'], 'string', 'max' => 50],
+            [['GUID', 'ORG_GUID', 'TRANSPOR_TTYPE', 'TRANSPORT_COMPANY', 'PLATFORM_TYPE', 'GROUP_GUID'], 'string', 'max' => 50],
             [['DESCRIPTION'], 'string', 'max' => 300],
             [['GUID'], 'unique', 'on' => ['creation']],
             [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'BASE_WEIGHT', 'INCREASE_WEIGHT'], 'default', 'value' => 0, 'on' => ['creation', 'update']],