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

backend/controllers/v1/shopuser/ShopUserController.php

@@ -23,11 +23,12 @@ class ShopUserController extends BaseController
      *   description="员工信息列表",
      *   @OA\Parameter(name="page",in="query",@OA\Schema(type="int")),
      *   @OA\Parameter(name="NAME",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="CODE",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="EMPLOYEE_CODE",in="query",@OA\Schema(type="string")),
      *   @OA\Parameter(name="MOBILEPHONE",in="query",@OA\Schema(type="string")),
      *   @OA\Parameter(name="EMPLOYEE_BRANCH_GUID",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                GUID:用户GUID,
+     *                NAME:姓名,
      *                EMPLOYEE_CODE:员工编号,
      *                MOBILE_PHONE:手机号,
      *                EMPLOYEE_BRANCH_GUID:用户所属门店GUID"),
@@ -37,8 +38,14 @@ class ShopUserController extends BaseController
     public function actionEmployeeList()
     {
         $model = new ShopUser();
-        $list = $model->employeeSearch(Yii::$app->request->queryParams);
-        if (!$list) {
+        $params = Yii::$app->request->queryParams;
+        $model->attributes = $params;
+        if (!$model->validate()) {
+            throw new BadRequestHttpException('请求内容有误！');
+        }
+
+        $list = $model->employeeSearch($params);
+        if (!$list->getModels()) {
             throw new BadRequestHttpException('未找到符合条件的数据');
         }
         return $list;
@@ -52,7 +59,8 @@ class ShopUserController extends BaseController
      *   description="某员工的信息详情",
      *   @OA\Parameter(name="id",in="query",required=true,@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
-     *                GUID:用户GUID，
+     *                GUID:用户GUID,
+     *                NAME:姓名,
      *                EMPLOYEE_CODE:员工编号,
      *                MOBILE_PHONE:手机号,
      *                AGE:年龄,
@@ -67,10 +75,15 @@ class ShopUserController extends BaseController
     public function actionEmployeeInfo($id)
     {
         $model = new ShopUser();
+        $model->GUID = $id;
+        if(!$model->validate()){
+            throw new BadRequestHttpException('请求内容有误！');
+        }
+
         $data = $model->employeeInfo($id);
         if (!$data) {
             throw new BadRequestHttpException('请求错误，该员工不存在');
-        } 
+        }
         return $data;
     }
 }

backend/models/v1/shopuser/ShopUser.php

@@ -85,7 +85,7 @@ class ShopUser extends BaseModel
     public function rules()
     {
         return [
-            [['GUID', 'CODE'], 'required'],
+            [['GUID', 'CODE'], 'required','on'=>['creation']],
             [['CREATE_DATE', 'UPDATE_DATE', 'CONTACTBIRTH_DATE', 'PROTECTED_DATE'], 'safe'],
             [['BINDCARD'], 'string'],
             [['SIGNIN_POINT', 'CONSUMPTION_POINT'], 'number'],
@@ -203,7 +203,7 @@ class ShopUser extends BaseModel
             [
                 'query' => $query->asArray(),
                 'pagination' => [
-                    'pageSize' =>  5,
+                    'pageSize' =>  15,
                 ]
             ]
         );