feat: 重构后台服务字典与商品独立定价体系及前后端交互优化
这个提交包含在:
@@ -38,6 +38,8 @@ class Category extends Backend
|
||||
$this->view->assign("flagList", $this->model->getFlagList());
|
||||
$this->view->assign("typeList", $typeList);
|
||||
$this->view->assign("parentList", $categorydata);
|
||||
// 状态单选框数据(分类模型无独立状态枚举方法,此处按通用 normal/hidden 提供)
|
||||
$this->view->assign("statusList", ['normal' => __('Normal'), 'hidden' => __('Hidden')]);
|
||||
$this->assignconfig('typeList', $typeList);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,11 +3,17 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use think\Db;
|
||||
use think\exception\PDOException;
|
||||
|
||||
/**
|
||||
* 开票申请
|
||||
*
|
||||
* @icon fa fa-circle-o
|
||||
* 开票申请仅由用户/商户端发起,后台只负责财务开具处理:
|
||||
* 待开具(wait) → 已开票(issued,必填发票号)/驳回(reject,必填原因)
|
||||
* 驳回后额度自动释放,并通知申请人
|
||||
*
|
||||
* @icon fa fa-file-text-o
|
||||
*/
|
||||
class Invoice extends Backend
|
||||
{
|
||||
@@ -18,6 +24,15 @@ class Invoice extends Backend
|
||||
*/
|
||||
protected $model = null;
|
||||
|
||||
/**
|
||||
* 开票处理状态机:当前状态 => 允许流转到的目标状态
|
||||
* issued/reject 为终态
|
||||
* @var array
|
||||
*/
|
||||
protected $statusFlow = [
|
||||
'wait' => ['issued', 'reject'],
|
||||
];
|
||||
|
||||
public function _initialize()
|
||||
{
|
||||
parent::_initialize();
|
||||
@@ -26,18 +41,9 @@ class Invoice extends Backend
|
||||
$this->view->assign("statusList", $this->model->getStatusList());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
|
||||
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
|
||||
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
|
||||
* 开票申请列表:关联申请人/商户
|
||||
*/
|
||||
|
||||
|
||||
|
||||
protected $relationSearch = true;
|
||||
|
||||
public function index()
|
||||
{
|
||||
$this->request->filter(['strip_tags', 'trim']);
|
||||
@@ -56,4 +62,118 @@ class Invoice extends Backend
|
||||
$result = ['total' => $list->total(), 'rows' => $list->items()];
|
||||
return json($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 财务开票处理:申请信息只读,仅允许填写开票结果
|
||||
* - 开票完成:必须填写发票号,状态置为已开票
|
||||
* - 驳回:必须填写原因,额度自动释放
|
||||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
$row = $this->model->get($ids);
|
||||
if (!$row) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
if (false === $this->request->isPost()) {
|
||||
$this->view->assign('row', $row);
|
||||
$this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
|
||||
$status = (string)$this->request->post('row.status');
|
||||
$invoiceNo = trim((string)$this->request->post('row.invoice_no'));
|
||||
$auditMsg = trim((string)$this->request->post('row.audit_msg'));
|
||||
|
||||
// 状态机校验:终态禁止操作,流转目标必须合法
|
||||
if (!isset($this->statusFlow[$row['status']])) {
|
||||
$this->error('该开票申请已处理完毕,不允许再次变更');
|
||||
}
|
||||
if (!in_array($status, $this->statusFlow[$row['status']], true)) {
|
||||
$this->error('状态流转不合法,请刷新后重试');
|
||||
}
|
||||
if ($status === 'issued' && $invoiceNo === '') {
|
||||
$this->error('标记开票完成必须填写发票号码');
|
||||
}
|
||||
if ($status === 'reject' && $auditMsg === '') {
|
||||
$this->error('驳回时必须填写驳回原因');
|
||||
}
|
||||
|
||||
Db::startTrans();
|
||||
try {
|
||||
// 乐观锁更新状态,防止并发重复处理
|
||||
$affected = Db::name('invoice')
|
||||
->where('id', $row['id'])
|
||||
->where('status', $row['status'])
|
||||
->update([
|
||||
'status' => $status,
|
||||
'invoice_no' => $invoiceNo !== '' ? $invoiceNo : $row['invoice_no'],
|
||||
'audit_msg' => $auditMsg,
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
if (!$affected) {
|
||||
throw new \Exception('开票申请状态已被其他人变更,请刷新后重试');
|
||||
}
|
||||
|
||||
// 通知申请人(商户开票通知绑定账号用户)
|
||||
$this->sendUserMessage(
|
||||
(int)$row['user_id'],
|
||||
$status === 'issued' ? '发票已开具' : '开票申请已驳回',
|
||||
$status === 'issued'
|
||||
? '您申请的开票 ¥' . $row['amount'] . ' 已开具完成,发票号码:' . $invoiceNo . ',电子发票已发送至 ' . $row['email']
|
||||
: '您的开票申请 ¥' . $row['amount'] . ' 未通过审核:' . ($auditMsg !== '' ? $auditMsg : '无')
|
||||
);
|
||||
Db::commit();
|
||||
} catch (PDOException|\Exception $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
}
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 开票申请仅由用户/商户端发起,禁止后台手工添加
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
$this->error('开票申请仅支持用户/商户端发起,后台不可手动添加');
|
||||
}
|
||||
|
||||
/**
|
||||
* 开票记录禁止删除,保障开票额度统计与账务完整
|
||||
*/
|
||||
public function del($ids = null)
|
||||
{
|
||||
$this->error('开票申请记录禁止删除');
|
||||
}
|
||||
|
||||
/**
|
||||
* 禁止批量修改状态,必须逐单填写开票结果
|
||||
*/
|
||||
public function multi($ids = null)
|
||||
{
|
||||
$this->error('开票处理不支持批量操作,请逐单填写发票号后处理');
|
||||
}
|
||||
|
||||
/**
|
||||
* 向申请人发送站内消息
|
||||
* @param int $userId 用户ID
|
||||
* @param string $title 消息标题
|
||||
* @param string $content 消息内容
|
||||
*/
|
||||
protected function sendUserMessage($userId, $title, $content)
|
||||
{
|
||||
if (!$userId) {
|
||||
return;
|
||||
}
|
||||
Db::name('message')->insert([
|
||||
'receive_type' => 'user',
|
||||
'receive_id' => $userId,
|
||||
'type' => 'system',
|
||||
'title' => mb_substr((string)$title, 0, 100),
|
||||
'content' => mb_substr((string)$content, 0, 500),
|
||||
'order_id' => 0,
|
||||
'is_read' => 0,
|
||||
'createtime' => time(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,9 +9,9 @@ use think\exception\ValidateException;
|
||||
use Exception;
|
||||
|
||||
/**
|
||||
* 服务项目与商品管理
|
||||
* 商品管理(商品仅定义施工标的物与细分规格,服务价格统一配置在关联的主服务与增项服务上)
|
||||
*
|
||||
* @icon fa fa-circle-o
|
||||
* @icon fa fa-cubes
|
||||
*/
|
||||
class Service extends Backend
|
||||
{
|
||||
@@ -29,21 +29,23 @@ class Service extends Backend
|
||||
$this->view->assign("priceTypeList", $this->model->getPriceTypeList());
|
||||
$this->view->assign("statusList", $this->model->getStatusList());
|
||||
|
||||
// 获取全部可用的公共增项服务列表并关联所属品类
|
||||
$addonsPool = Db::name('service_addon')
|
||||
->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')
|
||||
// 获取统一服务字典表(fa_service_type,不绑定单一类目,主服务与增项服务同源)
|
||||
$typesPool = Db::name('service_type')
|
||||
->where('status', 'normal')
|
||||
->order('weigh desc, id asc')
|
||||
->select();
|
||||
$this->view->assign("addonsPool", $addonsPool);
|
||||
$this->view->assign("typesPool", $typesPool);
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
$this->request->filter(['strip_tags', 'trim']);
|
||||
if (false === $this->request->isAjax()) {
|
||||
$cats = Db::name('service_cat')
|
||||
->where('status', 'normal')
|
||||
->order('weigh desc, id asc')
|
||||
->select();
|
||||
$this->view->assign('catList', $cats);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
if ($this->request->request('keyField')) {
|
||||
@@ -55,12 +57,53 @@ class Service extends Backend
|
||||
->where($where)
|
||||
->order($sort, $order)
|
||||
->paginate($limit);
|
||||
$result = ['total' => $list->total(), 'rows' => $list->items()];
|
||||
|
||||
$rows = $list->items();
|
||||
if (!empty($rows)) {
|
||||
$serviceIds = [];
|
||||
foreach ($rows as $r) {
|
||||
$serviceIds[] = (int)$r['id'];
|
||||
}
|
||||
// 一次性批量查询当前页商品的细分规格,避免 N+1 查询
|
||||
$allSpecs = Db::name('service_spec')
|
||||
->field('id,service_id,name,description')
|
||||
->where('service_id', 'in', $serviceIds)
|
||||
->where('status', 'normal')
|
||||
->order('weigh desc, id asc')
|
||||
->select();
|
||||
$specMap = [];
|
||||
foreach ($allSpecs as $sp) {
|
||||
$sid = (int)$sp['service_id'];
|
||||
if (!isset($specMap[$sid])) {
|
||||
$specMap[$sid] = [];
|
||||
}
|
||||
$specMap[$sid][] = $sp['name'];
|
||||
}
|
||||
foreach ($rows as &$r) {
|
||||
$sid = (int)$r['id'];
|
||||
$r['specs_list'] = isset($specMap[$sid]) ? $specMap[$sid] : [];
|
||||
|
||||
// 直接在服务端解析为数组返回,防止前端 bootstrap-table escape:true 将 JSON 双引号转义为 " 导致解析失败
|
||||
$stArr = [];
|
||||
if (!empty($r['service_types'])) {
|
||||
$stArr = is_array($r['service_types']) ? $r['service_types'] : (json_decode($r['service_types'], true) ?: []);
|
||||
}
|
||||
$adArr = [];
|
||||
if (!empty($r['addons'])) {
|
||||
$adArr = is_array($r['addons']) ? $r['addons'] : (json_decode($r['addons'], true) ?: []);
|
||||
}
|
||||
$r['service_types_list'] = $stArr;
|
||||
$r['addons_list'] = $adArr;
|
||||
}
|
||||
unset($r);
|
||||
}
|
||||
|
||||
$result = ['total' => $list->total(), 'rows' => $rows];
|
||||
return json($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加服务商品
|
||||
* 添加商品并配置关联服务定价
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
@@ -73,7 +116,6 @@ class Service extends Backend
|
||||
$params[$this->dataLimitField] = $this->auth->id;
|
||||
}
|
||||
|
||||
// 处理工项类型与增项配置
|
||||
$params = $this->formatServiceConfig($params);
|
||||
|
||||
$result = false;
|
||||
@@ -82,8 +124,8 @@ class Service extends Backend
|
||||
$result = $this->model->allowField(true)->save($params);
|
||||
$serviceId = $this->model->id;
|
||||
|
||||
// 处理规格列表
|
||||
$this->syncSpecs($serviceId, $this->request->post('specs/a', []));
|
||||
// 处理商品规格列表
|
||||
$this->syncSpecs($serviceId, $this->request->post('specs/a', []), isset($params['base_price']) ? (float)$params['base_price'] : 0);
|
||||
|
||||
Db::commit();
|
||||
} catch (ValidateException|PDOException|Exception $e) {
|
||||
@@ -102,7 +144,7 @@ class Service extends Backend
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑服务商品(工项价格、规格价格、增项服务绑定)
|
||||
* 编辑商品与关联服务定价
|
||||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
@@ -118,8 +160,6 @@ class Service extends Backend
|
||||
$params = $this->request->post("row/a");
|
||||
if ($params) {
|
||||
$params = $this->preExcludeFields($params);
|
||||
|
||||
// 处理工项类型与增项配置
|
||||
$params = $this->formatServiceConfig($params);
|
||||
|
||||
$result = false;
|
||||
@@ -127,8 +167,8 @@ class Service extends Backend
|
||||
try {
|
||||
$result = $row->allowField(true)->save($params);
|
||||
|
||||
// 同步处理规格列表
|
||||
$this->syncSpecs($row->id, $this->request->post('specs/a', []));
|
||||
// 同步处理商品规格列表
|
||||
$this->syncSpecs($row->id, $this->request->post('specs/a', []), isset($params['base_price']) ? (float)$params['base_price'] : (float)$row->base_price);
|
||||
|
||||
Db::commit();
|
||||
} catch (ValidateException|PDOException|Exception $e) {
|
||||
@@ -144,7 +184,7 @@ class Service extends Backend
|
||||
$this->error(__('Parameter %s can not be empty', ''));
|
||||
}
|
||||
|
||||
// 解析工项与增项配置以供视图回显
|
||||
// 解析当前商品已关联的主服务与增项服务配置
|
||||
$serviceTypes = [];
|
||||
if (!empty($row->service_types)) {
|
||||
$serviceTypes = is_array($row->service_types) ? $row->service_types : json_decode($row->service_types, true);
|
||||
@@ -154,14 +194,17 @@ class Service extends Backend
|
||||
$addons = is_array($row->addons) ? $row->addons : json_decode($row->addons, true);
|
||||
}
|
||||
|
||||
// 获取已有规格
|
||||
// 获取已有商品规格
|
||||
$specs = Db::name('service_spec')
|
||||
->where('service_id', $row->id)
|
||||
->where('status', 'normal')
|
||||
->order('weigh desc, id asc')
|
||||
->select();
|
||||
|
||||
$catName = Db::name('service_cat')->where('id', $row->cat_id)->value('name') ?: '未归类';
|
||||
|
||||
$this->view->assign("row", $row);
|
||||
$this->view->assign("catName", $catName);
|
||||
$this->view->assign("serviceTypes", $serviceTypes ?: []);
|
||||
$this->view->assign("assignedAddons", $addons ?: []);
|
||||
$this->view->assign("specs", $specs ?: []);
|
||||
@@ -169,44 +212,68 @@ class Service extends Backend
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化工项与增项输入数据
|
||||
* 格式化商品关联的主服务与增项服务 JSON,并自动提取默认主服务价格用于底层索引兼容
|
||||
*/
|
||||
protected function formatServiceConfig($params)
|
||||
{
|
||||
// 工项类型 JSON
|
||||
$parsedTypes = [];
|
||||
if (isset($params['service_types_raw'])) {
|
||||
$params['service_types'] = is_string($params['service_types_raw']) ? $params['service_types_raw'] : json_encode($params['service_types_raw'], JSON_UNESCAPED_UNICODE);
|
||||
if (is_string($params['service_types_raw'])) {
|
||||
$parsedTypes = json_decode($params['service_types_raw'], true) ?: [];
|
||||
$params['service_types'] = $params['service_types_raw'];
|
||||
} else {
|
||||
$parsedTypes = is_array($params['service_types_raw']) ? $params['service_types_raw'] : [];
|
||||
$params['service_types'] = json_encode($parsedTypes, JSON_UNESCAPED_UNICODE);
|
||||
}
|
||||
unset($params['service_types_raw']);
|
||||
}
|
||||
// 增项服务 JSON
|
||||
|
||||
if (isset($params['addons_raw'])) {
|
||||
$params['addons'] = is_string($params['addons_raw']) ? $params['addons_raw'] : json_encode($params['addons_raw'], JSON_UNESCAPED_UNICODE);
|
||||
unset($params['addons_raw']);
|
||||
}
|
||||
|
||||
// 自动从关联的主服务(优先默认主服务或“安装”)同步底层 base_price 与 price_type,商品无需单独填价格
|
||||
if (!empty($parsedTypes)) {
|
||||
$defItem = $parsedTypes[0];
|
||||
foreach ($parsedTypes as $pt) {
|
||||
if (!empty($pt['is_default'])) {
|
||||
$defItem = $pt;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$supportFixed = isset($defItem['support_fixed']) ? (int)$defItem['support_fixed'] : 1;
|
||||
$params['price_type'] = $supportFixed === 1 ? 'fixed' : 'quote';
|
||||
$params['base_price'] = $supportFixed === 1 ? (float)$defItem['price'] : 0.00;
|
||||
}
|
||||
|
||||
return $params;
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步商品规格表
|
||||
* 同步商品规格型号表(规格不设独立商品价格,仅标识具体施工标的物型号)
|
||||
*/
|
||||
protected function syncSpecs($serviceId, $specsInput)
|
||||
protected function syncSpecs($serviceId, $specsInput, $defaultBasePrice = 0.00)
|
||||
{
|
||||
if (empty($serviceId)) return;
|
||||
$now = time();
|
||||
$keepIds = [];
|
||||
if (!empty($specsInput) && is_array($specsInput)) {
|
||||
$idx = 0;
|
||||
foreach ($specsInput as $item) {
|
||||
$name = trim(isset($item['name']) ? $item['name'] : '');
|
||||
if ($name === '') continue;
|
||||
$specPrice = isset($item['base_price']) ? (float)$item['base_price'] : 0.00;
|
||||
$specDesc = isset($item['description']) ? trim($item['description']) : '';
|
||||
$specId = isset($item['id']) ? (int)$item['id'] : 0;
|
||||
$weigh = max(0, 100 - $idx * 5);
|
||||
$idx++;
|
||||
|
||||
if ($specId > 0) {
|
||||
Db::name('service_spec')->where('id', $specId)->where('service_id', $serviceId)->update([
|
||||
'name' => $name,
|
||||
'base_price' => $specPrice,
|
||||
'base_price' => $defaultBasePrice,
|
||||
'description' => $specDesc,
|
||||
'weigh' => $weigh,
|
||||
'updatetime' => $now,
|
||||
]);
|
||||
$keepIds[] = $specId;
|
||||
@@ -214,9 +281,9 @@ class Service extends Backend
|
||||
$newId = Db::name('service_spec')->insertGetId([
|
||||
'service_id' => $serviceId,
|
||||
'name' => $name,
|
||||
'base_price' => $specPrice,
|
||||
'base_price' => $defaultBasePrice,
|
||||
'description' => $specDesc,
|
||||
'weigh' => 0,
|
||||
'weigh' => $weigh,
|
||||
'status' => 'normal',
|
||||
'createtime' => $now,
|
||||
'updatetime' => $now,
|
||||
@@ -225,7 +292,6 @@ class Service extends Backend
|
||||
}
|
||||
}
|
||||
}
|
||||
// 将未在列表中的历史规格软下架或删除
|
||||
$delQuery = Db::name('service_spec')->where('service_id', $serviceId);
|
||||
if (!empty($keepIds)) {
|
||||
$delQuery->whereNotIn('id', $keepIds);
|
||||
|
||||
@@ -3,11 +3,17 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use think\Db;
|
||||
use think\exception\PDOException;
|
||||
|
||||
/**
|
||||
* 提现申请
|
||||
*
|
||||
* @icon fa fa-circle-o
|
||||
* 提现单仅由师傅端发起,后台只负责财务审核与打款标记:
|
||||
* 待审核(wait) → 审核通过(pass)/驳回(reject);审核通过(pass) → 打款完成(done)/驳回(reject)
|
||||
* 驳回自动解冻并退回师傅余额,打款完成自动划出冻结资金
|
||||
*
|
||||
* @icon fa fa-rmb
|
||||
*/
|
||||
class Withdraw extends Backend
|
||||
{
|
||||
@@ -18,6 +24,16 @@ class Withdraw extends Backend
|
||||
*/
|
||||
protected $model = null;
|
||||
|
||||
/**
|
||||
* 审核状态机:当前状态 => 允许流转到的目标状态
|
||||
* reject/done 为终态,不允许再变更
|
||||
* @var array
|
||||
*/
|
||||
protected $statusFlow = [
|
||||
'wait' => ['pass', 'reject'],
|
||||
'pass' => ['done', 'reject'],
|
||||
];
|
||||
|
||||
public function _initialize()
|
||||
{
|
||||
parent::_initialize();
|
||||
@@ -26,18 +42,9 @@ class Withdraw extends Backend
|
||||
$this->view->assign("statusList", $this->model->getStatusList());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
|
||||
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
|
||||
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
|
||||
* 提现列表:关联师傅信息,展示联系方式与处理时间
|
||||
*/
|
||||
|
||||
|
||||
|
||||
protected $relationSearch = true;
|
||||
|
||||
public function index()
|
||||
{
|
||||
$this->request->filter(['strip_tags', 'trim']);
|
||||
@@ -56,4 +63,156 @@ class Withdraw extends Backend
|
||||
$result = ['total' => $list->total(), 'rows' => $list->items()];
|
||||
return json($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 财务审核:申请信息只读,仅允许合法状态流转并做资金联动
|
||||
* - 驳回:退回师傅余额并解冻,写入钱包流水,通知师傅
|
||||
* - 通过:仅标记审核通过,等待财务打款
|
||||
* - 打款完成:划出冻结资金,写入钱包流水,通知师傅
|
||||
*/
|
||||
public function edit($ids = null)
|
||||
{
|
||||
$row = $this->model->get($ids);
|
||||
if (!$row) {
|
||||
$this->error(__('No Results were found'));
|
||||
}
|
||||
if (false === $this->request->isPost()) {
|
||||
// 展示师傅当前钱包情况,辅助财务判断
|
||||
$master = Db::name('master')->where('id', (int)$row['master_id'])->field('id,realname,mobile,user_id,money,frozen_money')->find();
|
||||
$this->view->assign('row', $row);
|
||||
$this->view->assign('master', $master ?: []);
|
||||
$this->view->assign('flowOptions', $this->statusFlow[$row['status']] ?? []);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
|
||||
$status = (string)$this->request->post('row.status');
|
||||
$auditMsg = trim((string)$this->request->post('row.audit_msg'));
|
||||
|
||||
// 状态机校验:终态禁止操作,流转目标必须合法
|
||||
if (!isset($this->statusFlow[$row['status']])) {
|
||||
$this->error('该提现单已处于终态(已驳回/已打款),不允许再次审核');
|
||||
}
|
||||
if (!in_array($status, $this->statusFlow[$row['status']], true)) {
|
||||
$this->error('状态流转不合法,请刷新后重试');
|
||||
}
|
||||
if ($status === 'reject' && $auditMsg === '') {
|
||||
$this->error('驳回时必须填写驳回原因');
|
||||
}
|
||||
|
||||
$masterId = (int)$row['master_id'];
|
||||
$amount = round((float)$row['amount'], 2);
|
||||
Db::startTrans();
|
||||
try {
|
||||
// 乐观锁更新状态,防止并发重复审核
|
||||
$affected = Db::name('withdraw')
|
||||
->where('id', $row['id'])
|
||||
->where('status', $row['status'])
|
||||
->update([
|
||||
'status' => $status,
|
||||
'audit_msg' => $auditMsg,
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
if (!$affected) {
|
||||
throw new \Exception('提现单状态已被其他人变更,请刷新后重试');
|
||||
}
|
||||
|
||||
$master = Db::name('master')->where('id', $masterId)->lock(true)->find();
|
||||
if (!$master) {
|
||||
throw new \Exception('提现师傅不存在');
|
||||
}
|
||||
|
||||
if ($status === 'reject') {
|
||||
// 驳回:解冻并退回余额,写入钱包流水
|
||||
$newMoney = round((float)$master['money'] + $amount, 2);
|
||||
Db::name('master')->where('id', $masterId)->update([
|
||||
'money' => $newMoney,
|
||||
'frozen_money' => round((float)$master['frozen_money'] - $amount, 2),
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
Db::name('wallet_log')->insert([
|
||||
'user_type' => 'master',
|
||||
'user_id' => $masterId,
|
||||
'type' => 'refund',
|
||||
'amount' => $amount,
|
||||
'balance' => $newMoney,
|
||||
'order_id' => 0,
|
||||
'remark' => '提现驳回,申请金额退回钱包余额' . ($auditMsg !== '' ? '(原因:' . $auditMsg . ')' : ''),
|
||||
'createtime' => time(),
|
||||
]);
|
||||
$this->sendMasterMessage((int)$master['user_id'], '提现申请已驳回', '您的提现申请 ¥' . $amount . ' 未通过财务审核:' . ($auditMsg !== '' ? $auditMsg : '无') . ',申请金额已退回钱包余额');
|
||||
} elseif ($status === 'pass') {
|
||||
// 审核通过:仅标记,资金保持冻结,等待财务打款
|
||||
$this->sendMasterMessage((int)$master['user_id'], '提现审核通过', '您的提现申请 ¥' . $amount . ' 已通过审核,财务将尽快安排打款到 ' . ($row['channel'] === 'bank' ? '银行卡' : '微信钱包'));
|
||||
} elseif ($status === 'done') {
|
||||
// 打款完成:冻结资金划出
|
||||
Db::name('master')->where('id', $masterId)->update([
|
||||
'frozen_money' => round((float)$master['frozen_money'] - $amount, 2),
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
Db::name('wallet_log')->insert([
|
||||
'user_type' => 'master',
|
||||
'user_id' => $masterId,
|
||||
'type' => 'withdraw',
|
||||
'amount' => 0,
|
||||
'balance' => (float)$master['money'],
|
||||
'order_id' => 0,
|
||||
'remark' => '提现打款完成,冻结资金 ¥' . $amount . ' 划出(' . ($row['channel'] === 'bank' ? '银行储蓄卡' : '微信钱包') . ' ' . $row['account'] . ')',
|
||||
'createtime' => time(),
|
||||
]);
|
||||
$this->sendMasterMessage((int)$master['user_id'], '提现打款完成', '您的提现 ¥' . $amount . ' 已打款成功,请留意到账通知');
|
||||
}
|
||||
Db::commit();
|
||||
} catch (PDOException|\Exception $e) {
|
||||
Db::rollback();
|
||||
$this->error($e->getMessage());
|
||||
}
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 提现单仅由师傅端发起,禁止后台手工添加
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
$this->error('提现申请仅支持师傅端发起,后台不可手动添加');
|
||||
}
|
||||
|
||||
/**
|
||||
* 提现流水记录禁止删除,保障资金对账完整
|
||||
*/
|
||||
public function del($ids = null)
|
||||
{
|
||||
$this->error('提现申请记录禁止删除');
|
||||
}
|
||||
|
||||
/**
|
||||
* 禁止批量修改状态,状态变更必须走审核流程以触发资金联动
|
||||
*/
|
||||
public function multi($ids = null)
|
||||
{
|
||||
$this->error('提现审核不支持批量操作,请逐单审核处理');
|
||||
}
|
||||
|
||||
/**
|
||||
* 向师傅所属用户发送站内消息
|
||||
* @param int $userId 用户ID
|
||||
* @param string $title 消息标题
|
||||
* @param string $content 消息内容
|
||||
*/
|
||||
protected function sendMasterMessage($userId, $title, $content)
|
||||
{
|
||||
if (!$userId) {
|
||||
return;
|
||||
}
|
||||
Db::name('message')->insert([
|
||||
'receive_type' => 'user',
|
||||
'receive_id' => $userId,
|
||||
'type' => 'system',
|
||||
'title' => mb_substr((string)$title, 0, 100),
|
||||
'content' => mb_substr((string)$content, 0, 500),
|
||||
'order_id' => 0,
|
||||
'is_read' => 0,
|
||||
'createtime' => time(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
namespace app\admin\controller\service;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 服务类目
|
||||
*
|
||||
* @icon fa fa-circle-o
|
||||
* @icon fa fa-th-large
|
||||
*/
|
||||
class Cat extends Backend
|
||||
{
|
||||
|
||||
/**
|
||||
* Cat模型对象
|
||||
* @var \app\admin\model\service\Cat
|
||||
@@ -25,13 +25,38 @@ class Cat extends Backend
|
||||
$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
|
||||
->where($where)
|
||||
->order($sort, $order)
|
||||
->paginate($limit);
|
||||
|
||||
$rows = $list->items();
|
||||
if (!empty($rows)) {
|
||||
$catCountRows = Db::name('service')
|
||||
->field('cat_id, count(id) as cnt')
|
||||
->group('cat_id')
|
||||
->select();
|
||||
$catCounts = [];
|
||||
foreach ($catCountRows as $cr) {
|
||||
$catCounts[(int)$cr['cat_id']] = (int)$cr['cnt'];
|
||||
}
|
||||
foreach ($rows as &$r) {
|
||||
$cid = (int)$r['id'];
|
||||
$r['goods_count'] = isset($catCounts[$cid]) ? (int)$catCounts[$cid] : 0;
|
||||
}
|
||||
unset($r);
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
|
||||
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
|
||||
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
|
||||
*/
|
||||
|
||||
|
||||
return json(['total' => $list->total(), 'rows' => $rows]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace app\admin\controller\service;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
|
||||
/**
|
||||
* 统一服务管理(主服务项目与增项服务同源管理,不绑定单一类目)
|
||||
*
|
||||
* @icon fa fa-wrench
|
||||
*/
|
||||
class Type extends Backend
|
||||
{
|
||||
/**
|
||||
* Type模型对象
|
||||
* @var \app\admin\model\service\Type
|
||||
*/
|
||||
protected $model = null;
|
||||
|
||||
public function _initialize()
|
||||
{
|
||||
parent::_initialize();
|
||||
$this->model = new \app\admin\model\service\Type;
|
||||
$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
|
||||
->where($where)
|
||||
->order($sort, $order)
|
||||
->paginate($limit);
|
||||
$result = ['total' => $list->total(), 'rows' => $list->items()];
|
||||
return json($result);
|
||||
}
|
||||
}
|
||||
在新工单中引用
屏蔽一个用户