更改表字段

backend/config/urlmanager.php

@@ -292,6 +292,7 @@ return [
                         'POST,OPTIONS assign-authority-role' => 'assign-authority-role',
                     ],
                 ],
+<<<<<<< Updated upstream
                 //权限节点
                 [
                     'class' => 'yii\rest\UrlRule',
@@ -305,6 +306,17 @@ return [
                         'POST,OPTIONS node-add' => 'node-add',
                         'DELETE,OPTIONS node-del' => 'node-del',
                     ]
+=======
+                //权限-管理员列表
+                [
+                    'class'=>'yii\rest\UrlRule',
+                    'controller'=>[
+                        'v1/authority/manage-list',
+                    ],
+                    'extraPatterns'=>[
+                        'GET,OPTIONS get-manage-list' => 'get-manage-list',
+                    ],
+>>>>>>> Stashed changes
                 ],
             ],    
         ],

backend/controllers/v1/shopuser/ShopUserListController.php

@@ -96,7 +96,7 @@ class ShopUserListController extends BaseController
      *                CONTACT_SEX:性别,
      *                CONTACTBIRTH_DATE：出生日期,
      *                EMPLOYEE_CODE:员工工号,
-     *                EMPLOYEE_GUID:门店代码,
+     *                BRANCH_GUID:门店代码,
      *                MEMBER_NO:会员卡号,
      *                LABEL:会员标签,
      *                IS_HS_DISTRIBUTOR_PARENT:是否为惠氏分销商上级,
@@ -117,7 +117,7 @@ class ShopUserListController extends BaseController
         if ($model->validate()) {
             //获取用户详细信息
             $userColumn = ['GUID','NAME','CODE','CONSUMPTION_POINT','MOBILE_PHONE','CONTACT_SEX','CONTACTBIRTH_DATE','EMPLOYEE_CODE',
-            'EMPLOYEE_GUID','MEMBER_NO','LABEL','IS_HS_DISTRIBUTOR_PARENT'
+            'BRANCH_GUID','MEMBER_NO','LABEL','IS_HS_DISTRIBUTOR_PARENT'
             ];
             $data['userInfo'] = $model::find()->select($userColumn)->where(['GUID'=>$param['GUID']])->asArray()->one();
             //获取所有用户组
@@ -172,7 +172,7 @@ class ShopUserListController extends BaseController
      *              @OA\Property(property="CONTACT_SEX",description="性别",type="string"),
      *              @OA\Property(property="CONTACTBIRTH_DATE",description="出生日期",type="string"),
      *              @OA\Property(property="EMPLOYEE_CODE",description="员工工号",type="string"),
-     *              @OA\Property(property="EMPLOYEE_GUID",description="门店代码",type="string"),
+     *              @OA\Property(property="BRANCH_GUID",description="门店代码",type="string"),
      *              @OA\Property(property="MEMBER_NO",description="会员卡号",type="string"),
      *              @OA\Property(property="LABEL",description="会员标签",type="string"),
      *              @OA\Property(property="IS_HS_DISTRIBUTOR_PARENT",description="是否为惠氏分销商上级",type="string"),
@@ -216,7 +216,7 @@ class ShopUserListController extends BaseController
         $userInfo->CONTACT_SEX = $param['CONTACT_SEX'];
         $userInfo->CONTACTBIRTH_DATE = $param['CONTACTBIRTH_DATE'];
         $userInfo->EMPLOYEE_CODE = $param['EMPLOYEE_CODE'];
-        $userInfo->EMPLOYEE_GUID = $param['EMPLOYEE_GUID'];
+        $userInfo->BRANCH_GUID = $param['BRANCH_GUID'];
         $userInfo->MEMBER_NO = $param['MEMBER_NO'];
         $userInfo->IS_HS_DISTRIBUTOR_PARENT = $param['IS_HS_DISTRIBUTOR_PARENT'];
         if($userInfo->save()){

backend/controllers/v1/transport/TransportMethodController.php

@@ -17,7 +17,6 @@ class TransportMethodController extends BaseController{
      *   tags={"配送管理"},
      *   summary="配送方式列表(张晓林)",
      *   description="配送方式列表",
-     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
      *   @OA\Response(response="200",description="
      *                GUID:配送方式GUID,
      *                CODE:配送方式CODE
@@ -39,22 +38,23 @@ class TransportMethodController extends BaseController{
        $model = new TransportMethod();
        $columnArr = array('GUID','CODE','NAME','DESCRIPTION','STATE','IS_UNDERLINE_PAY','POINTS_STATE','ROMENS_RENT_STATE','DSDINTERVAL','TRANSPOR_TYPE',
         'EXTRA_MONEY','DELIVERY_TIME','ORDER_INDEX');
-       $query = $model::find()->select($columnArr)->where(['ORG_GUIF'=>\Yii::$app->user->identity->ORG_GUID])->orderBy('ORDER_INDEX DESC');
+       $query = $model::find()->select($columnArr)->where(['ORG_GUID'=>\Yii::$app->user->identity->ORG_GUID])->orderBy('ORDER_INDEX DESC')->all();
         // $query = $model::find()->select($columnArr)->orderBy('ORDER_INDEX DESC');
-        return new ActiveDataProvider([
-            'query'=>$query,
-            'pagination' => [
-                'pageSize' => 15,
-            ]
-        ]);
+        // return new ActiveDataProvider([
+        //     'query'=>$query,
+        //     'pagination' => [
+        //         'pageSize' => 15,
+        //     ]
+        // ]);
+        return $query;
     }
 
     /**
      * @OA\GET(
      *   path="/backend/web/v1/transport/transport-methods/make-use",
      *   tags={"配送管理"},
-     *   summary="配送方式列表(张晓林)",
-     *   description="配送方式列表",
+     *   summary="配送方式开启关闭(张晓林)",
+     *   description="配送方式开启关闭",
      *   @OA\Parameter(name="GUID",in="query",description="配送方式GUID",@OA\Schema(type="int")),
      *   @OA\Parameter(name="TYPE",in="query",description="是积分商城还是小程序 1 积分商城 2 小程序",@OA\Schema(type="int")),
      *   @OA\Parameter(name="NUMBER",in="query",description="是启用还是关闭 1 启用 0 关闭",@OA\Schema(type="int")),

backend/models/v1/shopuser/ShopUser.php

@@ -15,7 +15,7 @@ use yii\data\ActiveDataProvider;
  * @property string $NAME 姓名
  * @property string $PASSWORD 密码
  * @property string $ORG_GUID 企业组织机构号
- * @property string $EMPLOYEE_GUID 如果USERGROUPGUID是店长，用来存门店GUID
+ * @property string $BRANCH_GUID 如果USERGROUPGUID是店长，用来存门店GUID 
  * @property string $WX_NO
  * @property string $CREATE_GUID 创建人GUID
  * @property string $CREATE_NAME 创建人姓名
@@ -93,7 +93,7 @@ class ShopUser extends BaseModel
             [['BINDCARD'], 'string'],
             [['SIGNIN_POINT', 'CONSUMPTION_POINT'], 'number'],
             [['BELONG', 'AGE', 'IS_HSDISTRIBUTOR', 'IS_HS_DISTRIBUTOR_PARENT', 'IS_EMPDISTRIBUTOR'], 'integer'],
-            [['GUID', 'USER_GROUP_GUID', 'CODE', 'ORG_GUID', 'EMPLOYEE_GUID', 'WX_NO', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILE_PHONE', 'USER_GUID', 'SHARE_NO', 'PROMOTEUID', 'PROMOTE_CODE', 'MEMBER_NO', 'REMARK', 'ALIPAYU_ID', 'UNION_ID', 'WXOPEN_ID', 'EMPLOYEE_CODE', 'EMPLOYEE_BRANCH_GUID', 'MEMBER_GRADE_GUID', 'NICK_NAME', 'POSITION', 'DEPARTMENT', 'HYBRIS_UID', 'MEMBERSHIP_ID'], 'string', 'max' => 50],
+            [['GUID', 'USER_GROUP_GUID', 'CODE', 'ORG_GUID', 'BRANCH_GUID', 'WX_NO', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILE_PHONE', 'USER_GUID', 'SHARE_NO', 'PROMOTEUID', 'PROMOTE_CODE', 'MEMBER_NO', 'REMARK', 'ALIPAYU_ID', 'UNION_ID', 'WXOPEN_ID', 'EMPLOYEE_CODE', 'EMPLOYEE_BRANCH_GUID', 'MEMBER_GRADE_GUID', 'NICK_NAME', 'POSITION', 'DEPARTMENT', 'HYBRIS_UID', 'MEMBERSHIP_ID'], 'string', 'max' => 50],
             [['NAME', 'CREATE_NAME', 'UPDATE_NAME'], 'string', 'max' => 100],
             [['PASSWORD', 'DESCRIPTION'], 'string', 'max' => 255],
             [['IS_FORBID', 'CONTACT_SEX'], 'string', 'max' => 4],
@@ -120,7 +120,7 @@ class ShopUser extends BaseModel
             'NAME' => '姓名',
             'PASSWORD' => 'Password',
             'ORG_GUID' => 'Org Guid',
-            'EMPLOYEE_GUID' => 'Employee Guid',
+            'BRANCH_GUID' => 'Branch Guid',
             'WX_NO' => 'Wx No',
             'CREATE_GUID' => 'Create Guid',
             'CREATE_NAME' => 'Create Name',