员工信息导入，门店服务评价导入导出。

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

backend/config/urlmanager.php

@@ -61,6 +61,8 @@ return [
                         'PUT,OPTIONS score-info-update'=>'score-info-update',
                         'DELETE,OPTIONS score-info-del'=>'score-info-del',
                         'POST,OPTIONS add-branch-score'=>'add-branch-score',
+                        'GET,OPTIONS score-export' => 'score-export',
+                        'POST,OPTIONS score-import' => 'score-import',
                     ],
                 ],
                 //后台管理员
@@ -106,6 +108,7 @@ return [
                     'extraPatterns'=>[
                         'GET,OPTIONS employee-info' => 'employee-info',
                         'GET,OPTIONS employee-list' => 'employee-list',
+                        'POST,OPTIONS employee-import' => 'employee-import',
                     ],
                 ],
                 //用户评论

backend/controllers/v1/branch/BranchScoreController.php

@@ -8,6 +8,11 @@ use backend\controllers\v1\BaseController;
 use backend\helpers\Func;
 use yii\web\BadRequestHttpException;
 use yii\web\ServerErrorHttpException;
+use app\models\v1\branch\ShopBranch;
+use backend\helpers\UploadFiles;
+use yii\web\UploadedFile;
+use yidas\phpSpreadsheet\Helper;
+use yii\web\HttpException;
 
 class BranchScoreController extends BaseController
 {
@@ -43,12 +48,13 @@ class BranchScoreController extends BaseController
      */
     public function actionBranchScoreList()
     {
-        $model = new ShopBranchScore();
+        $model = new $this->modelClass();
         $params = Yii::$app->request->queryParams;
 
         $model->attributes = $params;
         if (!$model->validate()) {
-            throw new BadRequestHttpException(json_encode($model->errors));
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $data = $model->branchScoreList($params);
@@ -88,11 +94,12 @@ class BranchScoreController extends BaseController
      */
     public function actionScoreInfo($id)
     {
-        $model = new ShopBranchScore();
+        $model = new $this->modelClass();
         $model->GUID = $id;
 
         if (!$model->validate()) {
-            throw new BadRequestHttpException(json_encode($model->errors));
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $info = $model->soreInfo($id);
@@ -161,15 +168,16 @@ class BranchScoreController extends BaseController
         $model->scenario = 'update';
         $model->attributes = $params;
         if (!$model->validate()) {
-            throw new BadRequestHttpException(json_encode($model->errors));
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $model->UPDATE_TIME = date('Y-m-d H:i:s', time());
-        if (!$model->save()) {
+        if (!$model->save(false)) {
             throw new ServerErrorHttpException('更新失败！');
         }
 
-        return ['code' => 200, 'message' => '更新成功！'];
+        throw new HttpException(200, "更新成功！");
     }
 
     /**
@@ -205,7 +213,7 @@ class BranchScoreController extends BaseController
             throw new ServerErrorHttpException('删除失败！');
         }
 
-        return ['code' => 200, 'message' => '删除成功！'];
+        throw new HttpException(200, "删除成功！");
     }
 
     /**
@@ -259,20 +267,160 @@ class BranchScoreController extends BaseController
      */
     public function actionAddBranchScore()
     {
-        $model = new ShopBranchScore();
+        $model = new $this->modelClass();
         $model->scenario = 'creation';
         $model->attributes = Yii::$app->request->post();
-        $model->GUID = Func::create_guid();
 
+        $info = ShopBranch::findOne(['CODE' => $model->BRANCH_CODE]);
+        if (!$info) {
+            throw new BadRequestHttpException('新增失败，该门店不存在');
+        }
+
+        $model->BRANCH_NAME = $info['NAME'];
+        $model->GUID = Func::create_guid();
         if (!$model->validate()) {
-            throw new BadRequestHttpException(json_encode($model->errors));
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $model->UPDATE_TIME = date('Y-m-d H:i:s', time());
-        if (!$model->save()) {
+        if (!$model->save(false)) {
             throw new ServerErrorHttpException('保存失败！');
         }
 
-        return ['code' => 200, 'message' => '保存成功！'];
+        throw new HttpException(200, "保存成功！");
+    }
+
+    /**
+     * @OA\GET(
+     *   path="/backend/web/v1/branch/branch-scores/score-export",
+     *   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="成功导出门店服务打分列表"),
+     *   security={{"Authorization":{}}}
+     * )
+     */
+    public function actionScoreExport()
+    {
+        $model = new $this->modelClass();
+        $params = Yii::$app->request->queryParams;
+
+        $model->attributes = $params;
+        if (!$model->validate()) {
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
+        }
+
+        $list = $model->branchScoreExport($params);
+        if (!$list) {
+            throw new BadRequestHttpException('未找到符合条件的数据');
+        }
+
+        $name = '门店打分记录' . date('Y-m-d', time());
+        return Helper::newSpreadsheet()
+            ->addRow(['门店名称', '门店编号', '基础服务分数', '质量管理分数', '运营管理分数', '门店形象分数', '店务管理分数', '手动干预评价分数', '门店评价原值', '门店评价最终值', '门店配置分数', '导入员工', '导入员工姓名', '更新时间'])
+            ->addRows($list)
+            ->output($name, 'Csv');
+    }
+
+    /**
+     * @OA\Post(
+     *     path="/backend/web/v1/branch/branch-scores/score-import",
+     *     tags={"门店&DC"},
+     *     summary="导入门店评价(侯贺政)",
+     *     description="新建更新都可以",
+     *     @OA\RequestBody(
+     *         description="导入门店评价",
+     *         @OA\MediaType(
+     *             mediaType="multipart/form-data",
+     *             @OA\Schema(
+     *                 type="object",
+     *                 @OA\Property(
+     *                     property="uploadFile",
+     *                     type="string",
+     *                     format="binary"
+     *                 ),
+     *             )
+     *         )
+     *     ),
+     *     @OA\Response(
+     *         response=200,
+     *         description="导入成功",
+     *     ),
+     *     @OA\Response(
+     *         response=422,
+     *         description="导入失败，数据验证错误，返回错误数据行号及错误信息（数组）。",
+     *     ),
+     *     security={{"Authorization":{}}}
+     * )
+     */
+    public function actionScoreImport()
+    {
+        $upload_file = new UploadFiles(['xlsx', 'xls']);
+        $upload_file->uploadFiles = UploadedFile::getInstance($upload_file, 'uploadFile');
+        $fileInfo = $upload_file->upload();
+        if ($fileInfo['CODE'] != '200') {
+            Yii::$app->response->statusCode = 422;
+            return $fileInfo;
+        }
+
+        $arr = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(false, ['rowOffset' => 1, 'columns' => 10]);
+        $model = new $this->modelClass();
+        $model->scenario = 'update';
+        $transaction = $model->getDb()->beginTransaction();
+
+        if (is_array($arr) && !empty($arr)) {
+            try {
+                foreach ($arr as $key => $value) {
+                    //判断是否存在该门店
+                    $branchMolde = ShopBranch::findOne(['CODE' => $value[0]]);
+                    if (!$branchMolde) {
+                        $returnInfo = [
+                            ($key + 1) => ['error' => '不存在该门店，检查并更正门店编码，或删除此条数据']
+                        ];
+                        @unlink($fileInfo['INFO'][0]);
+                        Yii::$app->response->statusCode = 422;
+                        return $returnInfo;
+                    }
+                    $_model = $model::findOne(['BRANCH_CODE' => $value[0]]);
+                    if ($_model === null) {
+                        $_model = clone $model;
+                        $_model->GUID = Func::create_guid();
+                    }
+                    $_model->BRANCH_CODE = $value[0];
+                    $_model->BASIC_SERVICES = $value[1];
+                    $_model->QUALITY_ASSURANCE = $value[2];
+                    $_model->OPERATION_MANAGEMENT = $value[3];
+                    $_model->STORE_IMAGE = $value[4];
+                    $_model->ELECTRICITY_MANAGEMENT = $value[5];
+                    $_model->CUSTOMERE_VALUATION = $value[6];
+                    $_model->STORE_CONFIGURATION = $value[7];
+                    $_model->ARTIFICIAL_NUMBER = (string) $value[8];
+                    $_model->ARTIFICIAL_NAME = $value[9];
+                    $_model->UPDATE_TIME = date('Y-m-d H:i:s', time());
+                    $_model->BRANCH_NAME = $branchMolde['NAME'];
+                    if (!$_model->save()) {
+                        $transaction->rollBack();
+                        $returnInfo = [
+                            ($key + 1) => $_model->errors
+                        ];
+                        @unlink($fileInfo['INFO'][0]);
+                        Yii::$app->response->statusCode = 422;
+                        return $returnInfo;
+                    }
+                }
+                $transaction->commit();
+                @unlink($fileInfo['INFO'][0]);
+                throw new HttpException("200", '导入成功');
+            } catch (\Throwable $th) {
+                $transaction->rollBack();
+                @unlink($fileInfo['INFO'][0]);
+                throw $th;
+            }
+        }
+        throw new BadRequestHttpException('导入失败!');
     }
 }

backend/controllers/v1/shopuser/ShopUserController.php

@@ -2,10 +2,15 @@
 
 namespace backend\controllers\v1\shopuser;
 
+use app\models\v1\branch\ShopBranch;
 use Yii;
 use backend\controllers\v1\BaseController;
-use app\models\v1\shopuser\ShopUser;
+use backend\helpers\Func;
+use backend\helpers\UploadFiles;
+use yidas\phpSpreadsheet\Helper;
+use yii\web\UploadedFile;
 use yii\web\BadRequestHttpException;
+use yii\web\HttpException;
 
 class ShopUserController extends BaseController
 {
@@ -33,11 +38,12 @@ class ShopUserController extends BaseController
      */
     public function actionEmployeeList()
     {
-        $model = new ShopUser();
+        $model = new $this->modelClass();
         $params = Yii::$app->request->queryParams;
         $model->attributes = $params;
         if (!$model->validate()) {
-            throw new BadRequestHttpException(json_encode($model->errors));
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $list = $model->employeeSearch($params);
@@ -70,10 +76,11 @@ class ShopUserController extends BaseController
      */
     public function actionEmployeeInfo($id)
     {
-        $model = new ShopUser();
+        $model = new $this->modelClass();
         $model->GUID = $id;
-        if(!$model->validate()){
-            throw new BadRequestHttpException(json_encode($model->errors));
+        if (!$model->validate()) {
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
         }
 
         $data = $model->employeeInfo($id);
@@ -82,4 +89,110 @@ class ShopUserController extends BaseController
         }
         return $data;
     }
+
+    /**
+     * @OA\Post(
+     *   path="/backend/web/v1/shopuser/shop-users/employee-import",
+     *   tags={"用户&员工接口"},
+     *   summary="导入员工信息(侯贺政)",
+     *   description="导入员工的信息,员工已存在为更新，不存在则新建",
+     *     @OA\RequestBody(
+     *         description="导入员工信息",
+     *         @OA\MediaType(
+     *             mediaType="multipart/form-data",
+     *             @OA\Schema(
+     *                 type="object",
+     *                 @OA\Property(
+     *                     property="uploadFile",
+     *                     type="string",
+     *                     format="binary"
+     *                 ),
+     *             )
+     *         )
+     *     ),
+     *     @OA\Response(
+     *         response=200,
+     *         description="导入成功",
+     *     ),
+     *    @OA\Response(
+     *         response=422,
+     *         description="导入失败，数据验证错误，返回错误数据行号及错误信息（数组）。",
+     *     ),
+     *     security={{"Authorization":{}}}
+     * )
+     */
+
+    public function actionEmployeeImport()
+    {
+        $upload_file = new UploadFiles(['xlsx', 'xls']);
+        $upload_file->uploadFiles = UploadedFile::getInstance($upload_file, 'uploadFile');
+        $fileInfo = $upload_file->upload();
+        if ($fileInfo['CODE'] != '200') {
+            Yii::$app->response->statusCode = 422;
+            return $fileInfo;
+        }
+
+        $arr = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(true, ['rowOffset' => 2, 'columns' => 9]);
+        $model = new $this->modelClass();
+        $model->scenario = 'import';
+        $transcation = $model->getDb()->beginTransaction();
+
+        if (is_array($arr) && !empty($arr)) {
+            try {
+                foreach ($arr as $key => $value) {
+                    $branch_info = ShopBranch::findOne(['CODE' => $value[8]]);
+                    if (!$branch_info) {
+                        $returnInfo = [
+                            ($key + 1) => ['error' => '不存在该门店，检查并更正所属门店编码，或删除此条数据']
+                        ];
+                        @unlink($fileInfo['INFO'][0]);
+                        Yii::$app->response->statusCode = 422;
+                        return $returnInfo;
+                    }
+                    $_model = $model::findOne(['EMPLOYEE_CODE' => $value[1]]);
+                    if ($_model === null) {
+                        $_model = clone $model;
+                        $_model->GUID = Func::create_guid();
+                        $_model->CODE = $value[2];
+                        $_model->CREATE_DATE = date('Y-m-d H:i:s', time());
+                    }
+                    //性别
+                    if ($value[4] == '男') {
+                        $value[4] = '1';
+                    } elseif ($value[4] == '女') {
+                        $value[4] = '0';
+                    } elseif (!in_array($value[4], ['1', '0', ''])) {
+                        $value[4] = '';
+                    }
+
+                    $_model->NAME = $value[0];
+                    $_model->EMPLOYEE_CODE = $value[1];
+                    $_model->MEMBER_NO = $value[3];
+                    $_model->CONTACT_SEX = $value[4];
+                    $_model->CONTACTBIRTH_DATE = $value[5];
+                    $_model->EMPLOYEE_IS_MANAGER  = $value[6];
+                    $_model->IS_DISTRIBUTOR = $value[7];
+                    $_model->EMPLOYEE_BRANCH_GUID = $branch_info['GUID'];  
+                    $_model->UPDATE_DATE = date('Y-m-d H:i:s', time());
+                    if (!$_model->save()) {
+                        $transcation->rollBack();
+                        $returnInfo = [
+                            ($key + 1) => $_model->errors
+                        ];
+                        @unlink($fileInfo['INFO'][0]);
+                        Yii::$app->response->statusCode = 422;
+                        return $returnInfo;
+                    }
+                }
+                $transcation->commit();
+                @unlink($fileInfo['INFO'][0]);
+                throw new HttpException(200,"导入成功！");
+            } catch (\Throwable $th) {
+                $transcation->rollBack();
+                @unlink($fileInfo['INFO'][0]);
+                throw $th;
+            }
+        }
+        throw new BadRequestHttpException('导入失败!');
+    }
 }

backend/models/v1/branch/ShopBranchScore.php

@@ -4,6 +4,7 @@ namespace app\models\v1\branch;
 
 use Yii;
 use app\models\v1\BaseModel;
+use backend\helpers\Func;
 use yii\data\ActiveDataProvider;
 
 /**
@@ -25,6 +26,8 @@ use yii\data\ActiveDataProvider;
  */
 class ShopBranchScore extends BaseModel
 {
+    public $SCORE;    //门店评分
+
     /**
      * {@inheritdoc}
      */
@@ -68,17 +71,17 @@ class ShopBranchScore extends BaseModel
     {
         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',
+            'BRANCH_CODE' => '门店CODE',
+            'BRANCH_NAME' => '门店名称',
+            'BASIC_SERVICES' => '基础服务分数',
+            'QUALITY_ASSURANCE' => '质量管理分数',
+            'OPERATION_MANAGEMENT' => '运营管理分数',
+            'STORE_IMAGE' => '门店形象分数',
+            'ELECTRICITY_MANAGEMENT' => '店务管理分数',
+            'CUSTOMERE_VALUATION' => '顾客评价分数（手动干预值）',
+            'STORE_CONFIGURATION' => '门店配置分数',
+            'ARTIFICIAL_NUMBER' => '导入人工号',
+            'ARTIFICIAL_NAME' => '导入人姓名',
             'UPDATE_TIME' => 'Update Time',
         ];
     }
@@ -110,7 +113,7 @@ class ShopBranchScore extends BaseModel
             ],
             'sort' => [
                 'attributes' => [
-                    'BRANCH_CODE' => SORT_DESC
+                    'BRANCH_CODE' => SORT_ASC
                 ]
             ]
         ]);
@@ -131,4 +134,66 @@ class ShopBranchScore extends BaseModel
 
         return $info;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function extraFields()
+    {
+        return [
+            //门店评价最终值
+            'REAL_SCORE' => function () {
+                return $this->SCORE + $this->CUSTOMERE_VALUATION;
+            },
+            'SCORE',  //门店评价原值
+        ];
+    }
+
+    /**
+     * 门店评价列表导出
+     * 
+     * @params array $params 查询参数数组
+     * @return array|null 返回查询结果
+     */
+    public function branchScoreExport($params)
+    {
+        $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]);
+
+        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']]);
+        }
+
+        $list = [];
+        foreach ($query->all() as $request) {
+            $list[] = $request->toArray([], ['REAL_SCORE', 'SCORE']); //输出额外所需字段
+        }
+
+        foreach ($list as $key => $value) {
+            $row_list[] = [
+                $value['BRANCH_NAME'], //门店名称
+                $value['BRANCH_CODE'], //门店CODE
+                $value['BASIC_SERVICES'], //基础服务分数
+                $value['QUALITY_ASSURANCE'], //质量管理分数
+                $value['OPERATION_MANAGEMENT'], //运营管理分数
+                $value['STORE_IMAGE'], //门店形象分数
+                $value['ELECTRICITY_MANAGEMENT'], //店务管理分数
+                $value['CUSTOMERE_VALUATION'], //手动干预评价分数
+                $value['SCORE'], //门店评价原值
+                $value['REAL_SCORE'], //门店评价最终值
+                $value['STORE_CONFIGURATION'], //门店配置分数
+                $value['ARTIFICIAL_NUMBER'], //导入员工号
+                $value['ARTIFICIAL_NAME'], //导入员工姓名
+                $value['UPDATE_TIME'], //更新时间
+            ];
+        }
+        return $row_list;
+    }
+
 }

backend/models/v1/shopuser/ShopUser.php

@@ -72,6 +72,7 @@ use yii\data\ActiveDataProvider;
 class ShopUser extends BaseModel
 {
     public $branch_code; //别名（所属门店别名）
+    public $birthday;  //出生日期
 
     /**
      * {@inheritdoc}
@@ -87,7 +88,7 @@ class ShopUser extends BaseModel
     public function rules()
     {
         return [
-            [['GUID', 'CODE'], 'required','on'=>['creation']],
+            [['GUID', 'CODE'], 'required', 'on' => ['creation']],
             [['CREATE_DATE', 'UPDATE_DATE', 'CONTACTBIRTH_DATE', 'PROTECTED_DATE'], 'safe'],
             [['BINDCARD'], 'string'],
             [['SIGNIN_POINT', 'CONSUMPTION_POINT'], 'number'],
@@ -101,8 +102,9 @@ class ShopUser extends BaseModel
             [['IS_FOCUSON', 'CRM_CUSTOMER_ID', 'USER_REGION_NUMBER', 'USER_SELF_NUMBER'], 'string', 'max' => 20],
             [['LABEL', 'SHARE_QRPATH', 'HS_SHAREQR_PATH', 'HSDIS_PARENT_GUID'], 'string', 'max' => 200],
             [['ALIPAYAC_COUNT'], 'string', 'max' => 30],
-            [['CODE'], 'unique','on'=>['creation']],
-            [['GUID'], 'unique','on'=>['creation']],
+            [['CODE'], 'unique', 'on' => ['creation','update']],
+            [['GUID'], 'unique', 'on' => ['creation']],
+            [['EMPLOYEE_CODE'],'required','on'=>['import']],
         ];
     }
 
@@ -114,8 +116,8 @@ class ShopUser extends BaseModel
         return [
             'GUID' => 'Guid',
             'USER_GROUP_GUID' => 'User Group Guid',
-            'CODE' => 'Code',
-            'NAME' => 'Name',
+            'CODE' => '用户名（手机号）',
+            'NAME' => '姓名',
             'PASSWORD' => 'Password',
             'ORG_GUID' => 'Org Guid',
             'EMPLOYEE_GUID' => 'Employee Guid',
@@ -127,8 +129,8 @@ class ShopUser extends BaseModel
             'UPDATE_NAME' => 'Update Name',
             'UPDATE_DATE' => 'Update Date',
             'IS_FORBID' => 'Is Forbid',
-            'MOBILE_PHONE' => 'Mobile Phone',
-            'CONTACT_SEX' => 'Contact Sex',
+            'MOBILE_PHONE' => '手机号',
+            'CONTACT_SEX' => '性别',
             'DESCRIPTION' => 'Description',
             'USER_GUID' => 'User Guid',
             'SHARE_NO' => 'Share No',
@@ -138,21 +140,21 @@ class ShopUser extends BaseModel
             'PROMOTEUID' => 'Promoteuid',
             'IS_UPLOADHX' => 'Is Uploadhx',
             'PROMOTE_CODE' => 'Promote Code',
-            'MEMBER_NO' => 'Member No',
+            'MEMBER_NO' => '会员卡号',
             'BELONG' => 'Belong',
             'REMARK' => 'Remark',
             'ALIPAYU_ID' => 'Alipayu ID',
             'UNION_ID' => 'Union ID',
             'WXOPEN_ID' => 'Wxopen ID',
-            'IS_DISTRIBUTOR' => 'Is Distributor',
+            'IS_DISTRIBUTOR' => '是否是分销商',
             'AGE' => 'Age',
             'IS_FOCUSON' => 'Is Focuson',
             'IS_FROM' => 'Is From',
-            'CONTACTBIRTH_DATE' => 'Contactbirth Date',
+            'CONTACTBIRTH_DATE' => '出生日期',
             'LABEL' => 'Label',
-            'EMPLOYEE_CODE' => 'Employee Code',
-            'EMPLOYEE_BRANCH_GUID' => 'Employee Branch Guid',
-            'EMPLOYEE_IS_MANAGER' => 'Employee Is Manager',
+            'EMPLOYEE_CODE' => '员工工号',
+            'EMPLOYEE_BRANCH_GUID' => '员工所属门店guid',
+            'EMPLOYEE_IS_MANAGER' => '否是门店店长',
             'MEMBER_GRADE_GUID' => 'Member Grade Guid',
             'PROTECTED_DATE' => 'Protected Date',
             'NICK_NAME' => 'Nick Name',
@@ -184,7 +186,7 @@ class ShopUser extends BaseModel
     {
         $query = static::find()->alias('su')
             ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,sb.NAME as SHOP_BRANCH_NAME')
-            ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')
+            ->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
             ->where(['su.BELONG' => 1]);
 
         if (isset($params['NAME'])) {
@@ -220,6 +222,15 @@ class ShopUser extends BaseModel
     {
         $fields = parent::fields();
         $fields['BRANCH_CODE'] = 'branch_code';  //增加（所属门店别名）属性
+        $fields['AGE'] = function () {  //根据生日计算年龄
+            list($year, $month, $day) = explode("-", date('Y-m-d',strtotime($this->birthday)));
+            $year_diff = date("Y") - $year;
+            $month_diff = date("m") - $month;
+            $day_diff  = date("d") - $day;
+            if ($day_diff < 0 || $month_diff < 0)
+                $year_diff--;
+            return $year_diff;
+        };
         return $fields;
     }
 
@@ -232,8 +243,8 @@ class ShopUser extends BaseModel
     public function employeeInfo($id)
     {
         $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')
+            ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.CONTACTBIRTH_DATE as birthday,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')
             ->where(['su.GUID' => $id, 'su.BELONG' => 1])
             ->one();
         return $info;