修复一些错误

This commit is contained in:
liu
2026-08-14 21:28:55 +08:00
parent 398bb98356
commit 228212f8e3
20 changed files with 489 additions and 100 deletions
@@ -101,10 +101,10 @@ class StoreOrderController extends BaseController
public function status(int $id, Request $request): JsonResponse
{
$data = $request->validate([
'status' => 'required|integer|in:1,3,4,9',
'status' => 'required|integer|in:1,9',
], [
'status.required' => '目标状态不能为空',
'status.in' => '目标状态值不正确',
'status.in' => '目标状态仅支持接单或取消订单',
]);
$order = StoreOrderModel::find($id);
@@ -136,13 +136,13 @@ class StoreOrderController extends BaseController
$data = $request->validate([
'ids' => 'required|array|min:1',
'ids.*' => 'integer|exists:store_order,id',
'status' => 'required|integer|in:1,3,4,9',
'status' => 'required|integer|in:1,9',
], [
'ids.required' => '请选择要流转的订单',
'ids.min' => '请选择要流转的订单',
'ids.*.exists' => '订单不存在',
'status.required' => '目标状态不能为空',
'status.in' => '目标状态值不正确',
'status.in' => '目标状态仅支持接单或取消订单',
]);
$target = (int) $data['status'];
@@ -196,6 +196,9 @@ class StoreOrderController extends BaseController
/**
* 状态流转合法路径
*
* 手动流转仅保留「接单」「取消订单」;后续状态由业务链路自动推进:
* 生成采购单 → 采购中;采购单完成 → 配送中;生成账单 → 已完成
*
* @return int[]
*/
private function allowedTransitions(int $status): array
@@ -205,11 +208,6 @@ class StoreOrderController extends BaseController
StoreOrderModel::STATUS_SUMMARIZED,
StoreOrderModel::STATUS_CANCELLED,
],
StoreOrderModel::STATUS_DELIVERING => [
StoreOrderModel::STATUS_DISTRIBUTION,
StoreOrderModel::STATUS_COMPLETED,
],
StoreOrderModel::STATUS_DISTRIBUTION => [StoreOrderModel::STATUS_COMPLETED],
default => [],
};
}