ç身份配置相关

app/common/dao/user/UserIdentityDao.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\dao\user;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\user\UserIdentity;
+use think\db\BaseQuery;
+
+/**
+ * Class UserIdentityDao
+ * @package app\common\dao\user
+ */
+class UserIdentityDao extends BaseDao
+{
+
+    /**
+     * @return BaseModel
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    protected function getModel(): string
+    {
+        return UserIdentity::class;
+    }
+
+
+    /**
+     * @param array $where
+     * @return BaseQuery
+     * @author xaboy
+     * @day 2020-05-06
+     */
+    public function search(array $where = [])
+    {
+        return UserIdentity::getDB();
+    }
+
+}

app/common/model/user/UserIdentity.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\model\user;
+
+
+use app\common\model\BaseModel;
+
+class UserIdentity extends BaseModel
+{
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tablePk(): string
+    {
+        return 'user_group_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020-03-30
+     */
+    public static function tableName(): string
+    {
+        return 'user_identity';
+    }
+}

app/common/repositories/user/UserIdentityRepository.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\repositories\user;
+
+
+use app\common\dao\user\UserIdentityDao;
+use app\common\repositories\BaseRepository;
+use FormBuilder\Exception\FormBuilderException;
+use FormBuilder\Factory\Elm;
+use FormBuilder\Form;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\facade\Route;
+
+/**
+ * Class UserIdentityRepository
+ * @package app\common\repositories\user
+ * @author xaboy
+ * @day 2020-05-07
+ * @mixin UserIdentityDao
+ */
+class UserIdentityRepository extends BaseRepository
+{
+    /**
+     * @var UserIdentityDao
+     */
+    protected $dao;
+
+    /**
+     * UserGroupRepository constructor.
+     * @param UserIdentityDao $dao
+     */
+    public function __construct(UserIdentityDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param array $where
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function getList(array $where, $page, $limit)
+    {
+        $query = $this->dao->search($where);
+        $count = $query->count($this->dao->getPk());
+        $list = $query->page($page, $limit)->select();
+        return compact('count', 'list');
+    }
+
+    /**
+     * @param null $id
+     * @param array $formData
+     * @return Form
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function form($id = null, array $formData = [])
+    {
+        $isCreate = is_null($id);
+        $action = Route::buildUrl($isCreate ? 'systemUserGroupCreate' : 'systemUserGroupUpdate', $isCreate ? [] : compact('id'))->build();
+        return Elm::createForm($action, [
+            Elm::input('group_name', '用户分组名称')->required()
+        ])->setTitle($isCreate ? '添加用户分组' : '编辑用户分组')->formData($formData);
+    }
+
+    /**
+     * @param $id
+     * @return Form
+     * @throws FormBuilderException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function updateForm($id)
+    {
+        return $this->form($id, $this->dao->get($id)->toArray());
+    }
+}

app/controller/admin/system/config/Identity.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-03-24
+ *
+ * 
+ */
+
+namespace app\controller\admin\system\config;
+
+
+use crmeb\basic\BaseController;
+use app\common\repositories\user\UserIdentityRepository;
+use FormBuilder\Exception\FormBuilderException;
+use think\App;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * Class Config
+ * @package app\controller\admin\system\config
+ * @author xaboy
+ * @day 2020-03-27
+ */
+class Identity extends BaseController
+{
+    /**
+     * @var UserIdentityRepository
+     */
+    protected $repository;
+
+    /**
+     * Config constructor.
+     * @param App $app
+     * @param UserIdentityRepository $repository
+     */
+    public function __construct(App $app, UserIdentityRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function lst()
+    {
+        $where = $this->request->params(['keyword']);
+        [$page, $limit] = $this->getPage();
+        $lst = $this->repository->getList($where, $page, $limit);
+
+        return app('json')->success($lst);
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function updateTable($id)
+    {
+        if (!$this->repository->exists($id)) app('json')->fail('数据不存在');
+        $form = $this->repository->updateForm($id);
+        return app('json')->success(formToData($form));
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     * @throws DbException
+     * @author xaboy
+     * @day 2020-03-27
+     */
+    public function update($id)
+    {
+        $data = $this->request->params(['arrive_num_own', 'arrive_num_team']);
+        $this->repository->update($id, $data);
+        return app('json')->success('修改成功');
+    }
+
+}

app/controller/merchant/store/shipping/ShippingTemplate.php

@@ -47,7 +47,9 @@ class ShippingTemplate extends BaseController
      */
     public function getList()
     {
-        return app('json')->success($this->repository->getList($this->request->merId()));
+//        return app('json')->success($this->repository->getList($this->request->merId()));
+        // 目前只包邮
+        return app('json')->success($this->repository->getList(0));
     }
 
     /**

route/admin.php

@@ -86,6 +86,12 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::delete('delete/:id', '/delete')->name('configSettingDelete');
             Route::post('upload_file/:field', '/upload')->name('configUpload');
         })->prefix('admin.system.config.Config');
+        //用户身份升级配置
+        Route::group('config/identity', function () {
+            Route::post('update/:id', '/update')->name('configIdentityUpdate');
+            Route::get('update/table/:id', '/updateTable')->name('configIdentityUpdateForm');
+            Route::get('lst', '/lst')->name('configIdentityLst');
+        })->prefix('admin.system.config.Identity');
 
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');