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

backend/config/urlmanager.php

@@ -31,6 +31,7 @@ return [
                         'PUT,OPTIONS revise' => 'revise',
                         'POST,OPTIONS add' => 'add',
                         'DELETE,OPTIONS del' => 'del',
+                        'GET,OPTIONS branch-score-list' => 'branch-score-list',
                     ],
                 ],
                 'GET swaggers/swagger/<id>'=>'swagger/swagger',

backend/controllers/v1/branch/BranchController.php

+<?php
+
+namespace backend\controllers\v1\branch;
+
+use app\models\v1\shop\branch\ShopBranchScore;
+use Yii;
+use backend\controllers\v1\BaseController;
+use yii\web\BadRequestHttpException;
+
+class BranchController extends BaseController
+{
+    public $modelClass='app\models\v1\shop\branch\ShopBranch';
+
+    /**
+     * @OA\GET(
+     *   path="/backend/web/v1/shop/branch/branches/branch-score-list",
+     *   tags={"门店&DC"},
+     *   summary="门店评价管理(侯贺政)",
+     *   description="门店服务打分列表",
+     *   @OA\Parameter(name="BRANCH_CODE",in="query",description="门店编号",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="ARTIFICIAL_NUMBER",in="query",description="导入人工号",@OA\Schema(type="string")),
+     *   @OA\Response(response="200",description="
+     *                GUID:评分GUID
+     *                BRANCH_NAME:门店名称,
+     *                BRANCH_CODE:门店编号,
+     *                BASIC_SERVICES:基础服务分数,
+     *                QUALITY_ASSURANCE:质量管理分数,
+     *                OPERATION_MANAGEMENT:运营管理分数,
+     *                STORE_IMAGE:门店形象分数,
+     *                ELECTRICITY_MANAGEMENT:店务管理分数,
+     *                CUSTOMERE_VALUATION:手动干预评价分数,
+     *                SCORE:门店评价原值,
+     *                REAL_SCORE:门店评价最终值,
+     *                STORE_CONFIGURATION:门店配置分数,
+     *                ARTIFICIAL_NUMBER:导入员工,
+     *                ARTIFICIAL_NAME:导入员工姓名,
+     *                UPDATE_TIME:更新时间"),
+     *   security={{"Authorization":{}}}
+     * )
+     */
+    public function actionBranchScoreList()
+    {
+        $model = new ShopBranchScore();
+        $params = Yii::$app->request->queryParams;
+
+        $model->attributes = $params;
+        if(!$model->validate()){
+            throw new BadRequestHttpException('Your request probably have some mistake !');
+        }
+
+        $data = $model->branchScoreList($params);
+        if(!$list=$data->getModels()){
+            throw new BadRequestHttpException('未找到符合条件的数据');
+        }
+        //门店评价最终值计算
+        foreach($list as $key=>$value){
+            $list[$key]['REAL_SCORE'] = $value['SCORE'] + $value['CUSTOMERE_VALUATION'];
+        }
+        $data->setModels($list);
+        return $data;
+    }
+}

backend/controllers/v1/common/ShopTransportAreaController.php

+<?php
+
+namespace backend\controllers\v1\common;
+
+class ShopTransportAreaController extends \yii\web\Controller
+{
+    public function actionIndex()
+    {
+        return $this->render('index');
+    }
+
+}

backend/controllers/v1/shop/branch/BranchController.php

-<?php
-
-namespace backend\controllers\v1\shop\branch;
-
-use Yii;
-use backend\controllers\v1\BaseController;
-
-class BranchController extends BaseController
-{
-    public $modelClass='app\models\v1\shop\branch\ShopBranch';
-
-
-}

backend/controllers/v1/shopuser/ShopUserController.php

@@ -37,7 +37,7 @@ class ShopUserController extends BaseController
         $params = Yii::$app->request->queryParams;
         $model->attributes = $params;
         if (!$model->validate()) {
-            throw new BadRequestHttpException('请求内容有误！');
+            throw new BadRequestHttpException('Your request probably have some mistake !');
         }
 
         $list = $model->employeeSearch($params);
@@ -73,7 +73,7 @@ class ShopUserController extends BaseController
         $model = new ShopUser();
         $model->GUID = $id;
         if(!$model->validate()){
-            throw new BadRequestHttpException('请求内容有误！');
+            throw new BadRequestHttpException('Your request probably have some mistake !');
         }
 
         $data = $model->employeeInfo($id);

backend/models/v1/shop/branch/ShopBranch.php → backend/models/v1/branch/ShopBranch.php

 <?php
 
-namespace app\models\v1\shop\branch;
+namespace app\models\v1\branch;
 
 use app\models\v1\BaseModel;
 use Yii;

backend/models/v1/branch/ShopBranchScore.php

+<?php
+
+namespace app\models\v1\shop\branch;
+
+use Yii;
+use app\models\v1\BaseModel;
+use yii\data\ActiveDataProvider;
+
+/**
+ * This is the model class for table "shop_branch_score".
+ *
+ * @property string $GUID
+ * @property string $BRANCH_CODE 门店CODE
+ * @property string $BRANCH_NAME 门店名称
+ * @property double $BASIC_SERVICES 基础服务分数
+ * @property double $QUALITY_ASSURANCE 质量管理分数
+ * @property double $OPERATION_MANAGEMENT 运营管理分数
+ * @property double $STORE_IMAGE 门店形象分数
+ * @property double $ELECTRICITY_MANAGEMENT 店务管理分数
+ * @property double $CUSTOMERE_VALUATION 顾客评价分数（手动干预值）
+ * @property double $STORE_CONFIGURATION 门店配置分数
+ * @property string $ARTIFICIAL_NUMBER 导入人工号
+ * @property string $ARTIFICIAL_NAME 导入人姓名
+ * @property string $UPDATE_TIME 更新时间
+ */
+class ShopBranchScore extends BaseModel
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'shop_branch_score';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['GUID', 'BRANCH_CODE'], 'required', 'on' => ['creation']],
+            [['BASIC_SERVICES', 'QUALITY_ASSURANCE', 'OPERATION_MANAGEMENT', 'STORE_IMAGE', 'ELECTRICITY_MANAGEMENT', 'CUSTOMERE_VALUATION', 'STORE_CONFIGURATION'], 'number'],
+            [['UPDATE_TIME'], 'safe'],
+            [['GUID', 'BRANCH_CODE', 'BRANCH_NAME'], 'string', 'max' => 50],
+            [['ARTIFICIAL_NUMBER'], 'string', 'max' => 12],
+            [['ARTIFICIAL_NAME'], 'string', 'max' => 20],
+            [['GUID'], 'unique'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        return [
+            'GUID' => 'Guid',
+            'BRANCH_CODE' => 'Branch Code',
+            'BRANCH_NAME' => 'Branch Name',
+            'BASIC_SERVICES' => 'Basic Services',
+            'QUALITY_ASSURANCE' => 'Quality Assurance',
+            'OPERATION_MANAGEMENT' => 'Operation Management',
+            'STORE_IMAGE' => 'Store Image',
+            'ELECTRICITY_MANAGEMENT' => 'Electricity Management',
+            'CUSTOMERE_VALUATION' => 'Customere Valuation',
+            'STORE_CONFIGURATION' => 'Store Configuration',
+            'ARTIFICIAL_NUMBER' => 'Artificial Number',
+            'ARTIFICIAL_NAME' => 'Artificial Name',
+            'UPDATE_TIME' => 'Update Time',
+        ];
+    }
+
+    /**
+     * 查询门店评分列表
+     * 
+     * @params array $params 查询参数数组
+     * @return array|null 返回查询结果
+     */
+    public function branchScoreList($params)
+    {
+        $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')
+            ->where('1');
+
+        if (isset($params['BRANCH_CODE'])) {
+            $query->andfilterWhere(['like','sbs.BRANCH_CODE',$params['BRANCH_CODE']]);
+        }
+
+        if (isset($params['ARTIFICIAL_NUMBER'])) {
+            $query->andfilterWhere(['like','sbs.ARTIFICIAL_NUMBER',$params['ARTIFICIAL_NUMBER']]);
+        }
+
+        return new ActiveDataProvider([
+            'query' => $query->asArray(),
+            'pagination' => [
+                'pageSize' => 10
+            ],
+            'sort' => [
+                'attributes' => [
+                    'BRANCH_CODE' => SORT_DESC
+                ]
+            ]
+        ]);
+    }
+}

backend/models/v1/shop/branch/ShopTransportArea.php → backend/models/v1/commom/ShopTransportArea.php

 <?php
 
-namespace app\models\v1\shop\branch;
+namespace app\models\v1\common;
 
 use app\models\v1\BaseModel;
 use Yii;

backend/models/v1/shopuser/ShopUser.php

@@ -187,20 +187,20 @@ class ShopUser extends BaseModel
             ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')
             ->where(['su.BELONG' => 1]);
 
-        if (isset($params['NAME']) && !empty($params['NAME'])) {
-            $query->andWhere(['like', 'su.NAME', $params['NAME']]);
+        if (isset($params['NAME'])) {
+            $query->andfilterWhere(['like', 'su.NAME', $params['NAME']]);
         }
 
-        if (isset($params['EMPLOYEE_CODE']) && !empty($params['EMPLOYEE_CODE'])) {
-            $query->andWhere(['like', 'su.EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
+        if (isset($params['EMPLOYEE_CODE'])) {
+            $query->andfilterWhere(['like', 'su.EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
         }
 
-        if (isset($params['MOBILEPHONE']) && !empty($params['MOBILEPHONE'])) {
-            $query->andWhere(['like', 'su.MOBILEPHONE', $params['MOBILEPHONE']]);
+        if (isset($params['MOBILEPHONE'])) {
+            $query->andfilterWhere(['like', 'su.MOBILEPHONE', $params['MOBILEPHONE']]);
         }
 
-        if (isset($params['EMPLOYEE_BRANCH_NAME']) && !empty($params['EMPLOYEE_BRANCH_NAME'])) {
-            $query->andWhere(['like', 'sb.NAME', $params['EMPLOYEE_BRANCH_NAME']]);
+        if (isset($params['EMPLOYEE_BRANCH_NAME'])) {
+            $query->andfilterWhere(['like', 'sb.NAME', $params['EMPLOYEE_BRANCH_NAME']]);
         }
 
         return new ActiveDataProvider(
@@ -221,7 +221,6 @@ class ShopUser extends BaseModel
      */
     public function employeeInfo($id)
     {
-        $this->setAttributes('BRANCH_CODE');
         $info = static::find()->alias('su')
             ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.AGE,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as BRANCH_CODE')
             ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')