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

backend/config/main.php

@@ -47,7 +47,12 @@ return [
             'rules' => [
                 [
                     'class'=>'yii\rest\UrlRule',
-                    'controller'=>['swagger','v1/shop/branch/branch','v1/user/user'],
+                    'controller'=>[
+                        'swagger',
+                        'v1/shop/branch/branch',
+                        'v1/shop/user/shop-user-membergrade',
+                        'v1/user/user'
+                    ],
                     'extraPatterns'=>[
                         'GET,OPTIONS test'=>'test',
                         'GET swagger'=>'swagger',

backend/controllers/v1/BaseController.php

@@ -20,7 +20,7 @@ use backend\components\v1\authorizationFilter;
  * ),
  * @OA\Server(
  *   description="Api server",
- *   url="/guoyongzhi/weiShopNew",
+ *   url="/yaoshuxia/shopback",
  * ),
  * @OA\SecurityScheme(
  *   securityScheme="Authorization",

backend/controllers/v1/shop/user/ShopUserMembergradeController.php

+<?php
+
+namespace backend\controllers\v1\shop\user;
+
+use Yii;
+use backend\controllers\v1\BaseController;
+
+class ShopUserMembergradeController extends BaseController
+{
+    public $modelClass='app\models\v1\shop\user\ShopUserMembergrade';
+    public $serializer = [
+        'class' => 'yii\rest\Serializer',
+        'collectionEnvelope' => 'shop_user_membergrade',
+    ];
+
+    //重定义action方法
+    public function actions()
+    {
+        $actions = parent::actions();
+
+        // 禁用 "delete" 和 "create" 动作
+        //unset($actions['delete'], $actions['create']);
+
+        // 使用 "prepareDataProvider()" 方法自定义数据 provider 
+        // $actions['index']['prepareDataProvider'] = [$this, 'prepareDataProvider'];
+
+        return $actions;
+    }
+
+    /**
+     * @OA\Post(
+     *     path="/backend/web/v1/shop/user/shop-user-membergrades",
+     *     tags={"用户组列表"},
+     *     summary="用户组列表接口",
+     *     description="用户组列表接口",
+     *     @OA\RequestBody(
+     *         @OA\MediaType(
+     *             mediaType="application/json",
+     *             @OA\Schema(
+     *               
+     *             )
+     *         )
+     *     ),
+     *     @OA\Response(response=200,description="成功时返回access-token")
+     * )
+     */
+}

backend/models/v1/shop/user/ShopUserMembergrade.php

+<?php
+
+namespace app\models\v1\shop\user;
+
+use Yii;
+use \yii\db\ActiveRecord;
+
+/**
+ * This is the model class for table "shop_user_membergrade".
+ *
+ * @property string $GUID 会员等级GUID
+ * @property string $ORG_GUID 组织机构号
+ * @property string $NAME 会员等级名称
+ * @property int $IS_DEFAULT 是否默认等级 1：是   0：否
+ * @property string $CREATE_TIME 添加时间
+ * @property string $GRADE_PERCENT 优惠百分比
+ * @property string $USER_POINTS 成为该等级所需积分
+ * @property string $MONEY_POINT_SRATE 购物获得积分比率
+ * @property int $IS_SETRANGE 0:全店通用  1：指定商品 3.指定促销分类
+ */
+class ShopUserMembergrade extends ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return 'shop_user_membergrade';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+            [['GUID', 'CREATE_TIME'], 'required'],
+            [['IS_DEFAULT', 'IS_SETRANGE'], 'integer'],
+            [['CREATE_TIME'], 'safe'],
+            [['GRADE_PERCENT', 'USER_POINTS', 'MONEY_POINT_SRATE'], 'number'],
+            [['GUID', 'ORG_GUID'], 'string', 'max' => 50],
+            [['NAME'], 'string', 'max' => 100],
+            [['GUID'], 'unique'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributeLabels()
+    {
+        // return [
+        //     'GUID' => 'Guid',
+        //     'ORG_GUID' => 'Org Guid',
+        //     'NAME' => 'Name',
+        //     'IS_DEFAULT' => 'Is Default',
+        //     'CREATE_TIME' => 'Create Time',
+        //     'GRADE_PERCENT' => 'Grade Percent',
+        //     'USER_POINTS' => 'User Points',
+        //     'MONEY_POINT_SRATE' => 'Money Point Srate',
+        //     'IS_SETRANGE' => 'Is Setrange',
+        // ];
+    }
+}