feat(admin): 重构服务管理模块新增增值服务功能

- 新增增值服务管理模块,支持按类目筛选绑定
- 新增工项服务定价和规格独立定价功能
- 优化前端订单页增值服务展示逻辑
- 升级版本号至1.0.19
这个提交包含在:
YuanWen
2026-11-04 16:14:44 +08:00
父节点 78d45eea74
当前提交 127b606e75
共有 50 个文件被更改,包括 4149 次插入 和 197 次删除

查看文件

@@ -43,10 +43,153 @@ class Master extends Backend
->where($where)
->order($sort, $order)
->paginate($limit);
$result = ['total' => $list->total(), 'rows' => $list->items()];
// 合并查出当前页每个师傅拥有的技能
$items = $list->items();
$masterIds = array_column($items, 'id');
$skillsGroup = [];
if (!empty($masterIds)) {
$allSkills = \think\Db::name('master_skill')
->where('master_id', 'in', $masterIds)
->where('status', 'normal')
->select();
foreach ($allSkills as $sk) {
$name = !empty($sk['skill_name']) ? $sk['skill_name'] : '';
if ($name) {
$skillsGroup[$sk['master_id']][] = $name;
}
}
}
foreach ($items as &$it) {
$it['skills_list'] = $skillsGroup[$it['id']] ?? [];
}
$result = ['total' => $list->total(), 'rows' => $items];
return json($result);
}
/**
* 师傅服务技能管理(内置于师傅列表)
*/
public function skills($ids = null)
{
$row = $this->model->find($ids);
if (!$row) {
$this->error(__('No Results were found'));
}
if ($this->request->isPost()) {
$selectedSkills = (array)$this->request->post('skills/a', []);
$customText = trim((string)$this->request->post('custom_text', ''));
// 1. 处理自定义输入的技能
$customNames = [];
if (!empty($customText)) {
$parts = preg_split('/[,,\s]+/u', $customText);
foreach ($parts as $p) {
$p = trim($p);
if (!empty($p) && !in_array($p, $customNames) && !in_array($p, $selectedSkills)) {
$customNames[] = $p;
}
}
}
// 2. 清理当前师傅原有的技能
\think\Db::name('master_skill')->where('master_id', $row['id'])->delete();
// 3. 写入选中的技能
$dictRows = \think\Db::name('skill_dict')->where('name', 'in', $selectedSkills)->select();
$dictMap = [];
foreach ($dictRows as $dr) {
$dictMap[$dr['name']] = $dr;
}
$now = time();
foreach ($selectedSkills as $sName) {
$dict = $dictMap[$sName] ?? null;
\think\Db::name('master_skill')->insert([
'master_id' => $row['id'],
'cat_id' => 0,
'skill_id' => $dict ? $dict['id'] : 0,
'skill_name' => $sName,
'category' => $dict ? $dict['category'] : '服务技能',
'is_custom' => 0,
'cert_image' => '',
'status' => 'normal',
'createtime' => $now
]);
}
// 4. 处理自定义输入的技能(沉淀入库)
foreach ($customNames as $cName) {
$exist = \think\Db::name('skill_dict')->where('name', $cName)->find();
if (!$exist) {
$skillDictId = \think\Db::name('skill_dict')->insertGetId([
'category_id'=> 0,
'category' => '其他技能',
'name' => $cName,
'source' => 'custom',
'master_id' => $row['id'],
'weigh' => 0,
'status' => 'normal',
'createtime' => $now,
'updatetime' => $now
]);
} else {
$skillDictId = $exist['id'];
}
\think\Db::name('master_skill')->insert([
'master_id' => $row['id'],
'cat_id' => 0,
'skill_id' => $skillDictId,
'skill_name' => $cName,
'category' => '其他技能',
'is_custom' => 1,
'cert_image' => '',
'status' => 'normal',
'createtime' => $now
]);
}
$this->success('技能配置更新成功');
}
// 读取技能字典全部分类与技能
$categories = \think\Db::name('skill_category')->where('status', 'normal')->order('weigh desc')->select();
$allDictSkills = \think\Db::name('skill_dict')->where('status', 'normal')->order('weigh desc')->select();
$catTree = [];
foreach ($categories as $cat) {
$catTree[$cat['name']] = [];
}
foreach ($allDictSkills as $item) {
$cName = $item['category'];
if (!isset($catTree[$cName])) {
$catTree[$cName] = [];
}
$catTree[$cName][] = $item;
}
// 读取当前师傅已拥有的技能
$mySkills = \think\Db::name('master_skill')->where('master_id', $row['id'])->select();
$selectedSkills = [];
$customArr = [];
foreach ($mySkills as $ms) {
if ($ms['is_custom'] == 1) {
$customArr[] = $ms['skill_name'];
} else {
$selectedSkills[] = $ms['skill_name'];
}
}
$this->view->assign('row', $row);
$this->view->assign('catTree', $catTree);
$this->view->assign('selectedSkills', $selectedSkills);
$this->view->assign('customText', implode(' ', $customArr));
return $this->view->fetch();
}
/**
* 师傅全景档案画像
*/
@@ -78,10 +221,19 @@ class Master extends Backend
->limit(5)
->select();
// 4. 服务技能与认证证书
$skills = \think\Db::name('master_skill')
->alias('s')
->join('service_cat c', 'c.id = s.cat_id', 'LEFT')
->where('s.master_id', $row['id'])
->field('s.*, c.name as cat_name')
->select();
$this->view->assign('row', $row);
$this->view->assign('recentOrders', $recentOrders);
$this->view->assign('recentWithdraws', $recentWithdraws);
$this->view->assign('recentReviews', $recentReviews);
$this->view->assign('skills', $skills);
return $this->view->fetch();
}

查看文件

@@ -0,0 +1,51 @@
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
/**
* 师傅服务技能管理
*
* @icon fa fa-certificate
*/
class MasterSkill extends Backend
{
/**
* MasterSkill模型对象
* @var \app\admin\model\MasterSkill
*/
protected $model = null;
protected $relationSearch = true;
protected $searchFields = 'id,master.realname,master.mobile,cat.name';
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\MasterSkill;
$this->view->assign("statusList", $this->model->getStatusList());
}
/**
* 查看
*/
public function index()
{
$this->request->filter(['strip_tags', 'trim']);
if (false === $this->request->isAjax()) {
return $this->view->fetch();
}
if ($this->request->request('keyField')) {
return $this->selectpage();
}
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
$list = $this->model
->with(['master', 'cat'])
->where($where)
->order($sort, $order)
->paginate($limit);
$result = ['total' => $list->total(), 'rows' => $list->items()];
return json($result);
}
}

查看文件

@@ -29,10 +29,13 @@ class Service extends Backend
$this->view->assign("priceTypeList", $this->model->getPriceTypeList());
$this->view->assign("statusList", $this->model->getStatusList());
// 获取全部可用的公共增项服务列表
// 获取全部可用的公共增项服务列表并关联所属品类
$addonsPool = Db::name('service_addon')
->where('status', 'normal')
->order('weigh desc, id asc')
->alias('a')
->leftJoin('service_cat c', 'a.cat_id = c.id')
->field('a.*, COALESCE(c.name, "全平台通用") as cat_name')
->where('a.status', 'normal')
->order('a.cat_id asc, a.weigh desc, a.id asc')
->select();
$this->view->assign("addonsPool", $addonsPool);
}

查看文件

@@ -0,0 +1,50 @@
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
/**
* 技能分类管理
*
* @icon fa fa-th-large
*/
class SkillCategory extends Backend
{
/**
* SkillCategory模型对象
* @var \app\admin\model\SkillCategory
*/
protected $model = null;
protected $searchFields = 'id,name';
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\SkillCategory;
$this->view->assign("statusList", $this->model->getStatusList());
}
/**
* 查看分类列表
*/
public function index()
{
$this->request->filter(['strip_tags', 'trim']);
if (false === $this->request->isAjax()) {
return $this->view->fetch();
}
if ($this->request->request('keyField')) {
return $this->selectpage();
}
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
$list = $this->model
->withCount('skills')
->where($where)
->order($sort, $order)
->paginate($limit);
$result = ['total' => $list->total(), 'rows' => $list->items()];
return json($result);
}
}

查看文件

@@ -0,0 +1,117 @@
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
use think\Db;
/**
* 技能列表管理
*
* @icon fa fa-tags
*/
class SkillDict extends Backend
{
/**
* SkillDict模型对象
* @var \app\admin\model\SkillDict
*/
protected $model = null;
protected $searchFields = 'id,name,category';
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\SkillDict;
// 从真实技能分类表中拉取分类列表
$categoryList = Db::name('skill_category')
->where('status', 'normal')
->order('weigh desc, id asc')
->column('name', 'id');
$this->view->assign("categoryList", $categoryList);
$this->view->assign("sourceList", $this->model->getSourceList());
$this->view->assign("statusList", $this->model->getStatusList());
}
/**
* 查看技能列表
*/
public function index()
{
$this->request->filter(['strip_tags', 'trim']);
if (false === $this->request->isAjax()) {
return $this->view->fetch();
}
if ($this->request->request('keyField')) {
return $this->selectpage();
}
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
$list = $this->model
->with(['master'])
->where($where)
->order($sort, $order)
->paginate($limit);
$result = ['total' => $list->total(), 'rows' => $list->items()];
return json($result);
}
/**
* 添加技能
*/
public function add()
{
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
if ($params) {
if (!empty($params['category_id'])) {
$cat = Db::name('skill_category')->where('id', $params['category_id'])->find();
if ($cat) {
$params['category'] = $cat['name'];
}
}
$result = $this->model->allowField(true)->save($params);
if ($result !== false) {
$this->success();
} else {
$this->error($this->model->getError());
}
}
$this->error(__('Parameter %s can not be empty', ''));
}
return $this->view->fetch();
}
/**
* 编辑技能
*/
public function edit($ids = null)
{
$row = $this->model->get($ids);
if (!$row) {
$this->error(__('No Results were found'));
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
if ($params) {
if (!empty($params['category_id'])) {
$cat = Db::name('skill_category')->where('id', $params['category_id'])->find();
if ($cat) {
$params['category'] = $cat['name'];
}
}
$result = $row->allowField(true)->save($params);
if ($result !== false) {
$this->success();
} else {
$this->error($row->getError());
}
}
$this->error(__('Parameter %s can not be empty', ''));
}
$this->view->assign("row", $row);
return $this->view->fetch();
}
}