采购单优化
This commit is contained in:
@@ -4,11 +4,9 @@ namespace App\Http\Controllers\Order;
|
||||
|
||||
use App\Exceptions\RepositoryException;
|
||||
use App\Models\NoticeModel;
|
||||
use App\Models\ProductModel;
|
||||
use App\Models\ProductPriceModel;
|
||||
use App\Models\StoreOrderItemModel;
|
||||
use App\Models\StoreOrderModel;
|
||||
use App\Models\UserModel;
|
||||
use App\Services\ItemImageResolver;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -17,7 +15,6 @@ use Modules\AnnoRoute\Attribute\GetRoute;
|
||||
use Modules\AnnoRoute\Attribute\PutRoute;
|
||||
use Modules\AnnoRoute\Attribute\RequestAttribute;
|
||||
use Modules\Common\Http\Controllers\BaseController;
|
||||
use Modules\SystemTool\Models\SysFileModel;
|
||||
|
||||
/**
|
||||
* 门店订单管理(订单只读 + 状态管理 + 明细修改/同步;创建/取消在小程序端)
|
||||
@@ -25,24 +22,6 @@ use Modules\SystemTool\Models\SysFileModel;
|
||||
#[RequestAttribute('/order/store', 'order.store')]
|
||||
class StoreOrderController extends BaseController
|
||||
{
|
||||
/** 状态中文名(通知文案用) */
|
||||
private const array STATUS_NAMES = [
|
||||
StoreOrderModel::STATUS_PENDING => '待接单',
|
||||
StoreOrderModel::STATUS_SUMMARIZED => '已接单',
|
||||
StoreOrderModel::STATUS_DELIVERING => '采购中',
|
||||
StoreOrderModel::STATUS_DISTRIBUTION => '配送中',
|
||||
StoreOrderModel::STATUS_COMPLETED => '已完成',
|
||||
StoreOrderModel::STATUS_CANCELLED => '已取消',
|
||||
];
|
||||
|
||||
/** 明细可编辑状态:待接单、已接单、采购中、配送中(已完成/已取消锁定) */
|
||||
private const array ITEM_EDITABLE_STATUS = [
|
||||
StoreOrderModel::STATUS_PENDING,
|
||||
StoreOrderModel::STATUS_SUMMARIZED,
|
||||
StoreOrderModel::STATUS_DELIVERING,
|
||||
StoreOrderModel::STATUS_DISTRIBUTION,
|
||||
];
|
||||
|
||||
protected array $searchField = [
|
||||
'store_id' => '=',
|
||||
'status' => '=',
|
||||
@@ -84,7 +63,7 @@ class StoreOrderController extends BaseController
|
||||
|
||||
// 明细封面图:从快照 image_ids 批量解析(不再关联商品档案表)
|
||||
foreach ($data['data'] as &$order) {
|
||||
$this->resolveItemImages($order['items']);
|
||||
app(ItemImageResolver::class)->resolve($order['items']);
|
||||
}
|
||||
unset($order);
|
||||
|
||||
@@ -99,48 +78,7 @@ class StoreOrderController extends BaseController
|
||||
return $this->success($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 已接单预览:聚合所有已接单订单明细(按商品分组),
|
||||
* 供生成采购单前确认(C1 前置);单位取明细快照
|
||||
*/
|
||||
#[GetRoute('/summary', 'query')]
|
||||
public function summary(): JsonResponse
|
||||
{
|
||||
$rows = StoreOrderItemModel::query()
|
||||
->select('product_id')
|
||||
->selectRaw('MAX(product_name) as product_name')
|
||||
->selectRaw('MAX(product_spec) as product_spec')
|
||||
->selectRaw('MAX(unit) as unit')
|
||||
->selectRaw('SUM(quantity) as total_quantity')
|
||||
->selectRaw('COUNT(DISTINCT store_id) as store_count')
|
||||
->whereHas('order', function ($query) {
|
||||
$query->where('status', StoreOrderModel::STATUS_SUMMARIZED);
|
||||
})
|
||||
->groupBy('product_id')
|
||||
->orderBy('product_id')
|
||||
->get()
|
||||
->toArray();
|
||||
|
||||
// 快照无单位的历史明细兜底:从商品档案(含已下架/软删除)补齐
|
||||
$emptyUnitProductIds = array_column(array_filter(
|
||||
$rows,
|
||||
static fn (array $row) => ($row['unit'] ?? '') === ''
|
||||
), 'product_id');
|
||||
if ($emptyUnitProductIds !== []) {
|
||||
$units = ProductModel::withTrashed()
|
||||
->whereIn('id', $emptyUnitProductIds)
|
||||
->pluck('unit', 'id');
|
||||
foreach ($rows as &$row) {
|
||||
if (($row['unit'] ?? '') === '') {
|
||||
$row['unit'] = $units[$row['product_id']] ?? '';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $this->success($rows);
|
||||
}
|
||||
|
||||
/** 订单详情:订单头 + 明细(含商品快照、首图;后台侧成本价可见、附供应商名) */
|
||||
/** 订单详情 */
|
||||
#[GetRoute(route: '/{id}', authorize: 'query', where: ['id' => '[0-9]+'])]
|
||||
public function detail(int $id): JsonResponse
|
||||
{
|
||||
@@ -158,7 +96,7 @@ class StoreOrderController extends BaseController
|
||||
$data = $order->toArray();
|
||||
|
||||
// 明细首图 + 附加金额(与列表接口一致)
|
||||
$this->resolveItemImages($data['items']);
|
||||
app(ItemImageResolver::class)->resolve($data['items']);
|
||||
$boxAmount = site_config('services.box_amount');
|
||||
$trayAmount = site_config('services.tray_amount');
|
||||
$data['box_price'] = number_format($boxAmount, 2);
|
||||
@@ -170,160 +108,7 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 明细首图解析:从快照 image_ids 批量解析文件 URL,未找到时置空字符串(列表/详情共用)
|
||||
*
|
||||
* @param array<int, array<string, mixed>> $items 订单明细数组(引用修改)
|
||||
*/
|
||||
private function resolveItemImages(array &$items): void
|
||||
{
|
||||
$fileIds = [];
|
||||
foreach ($items as $line) {
|
||||
foreach ((array) ($line['image_ids'] ?? []) as $fileId) {
|
||||
if ($fileId !== '' && $fileId !== null) {
|
||||
$fileIds[] = (int) $fileId;
|
||||
}
|
||||
}
|
||||
}
|
||||
$fileUrls = [];
|
||||
if ($fileIds !== []) {
|
||||
foreach (SysFileModel::query()->whereIn('id', array_unique($fileIds))->get() as $file) {
|
||||
$fileUrls[$file->id] = $file->preview_url;
|
||||
}
|
||||
}
|
||||
foreach ($items as &$product) {
|
||||
$product['image'] = '';
|
||||
foreach ((array) ($product['image_ids'] ?? []) as $fileId) {
|
||||
if ($fileId !== '' && $fileId !== null && isset($fileUrls[(int) $fileId])) {
|
||||
$product['image'] = $fileUrls[(int) $fileId];
|
||||
break;
|
||||
}
|
||||
}
|
||||
unset($product['image_ids']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改订单明细(商品快照 + 订货量/重量),事务内重算单品金额与订单总价。
|
||||
* 可改字段:供应商、品名、规格、单位、单价、成本价、订货量、重量
|
||||
*/
|
||||
#[PutRoute(route: '/item/{id}', authorize: 'update', where: ['id' => '[0-9]+'])]
|
||||
public function updateItem(int $id, Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'supplier_id' => 'required|integer|min:0',
|
||||
'product_name' => 'required|string|max:100',
|
||||
'product_spec' => 'nullable|string|max:100',
|
||||
'unit' => 'required|string|max:20',
|
||||
'price' => 'required|numeric|min:0',
|
||||
'cost_price' => 'required|numeric|min:0',
|
||||
'quantity' => 'required|integer|min:1',
|
||||
'weight' => 'required|numeric|min:0',
|
||||
'remark' => 'nullable|string'
|
||||
], [
|
||||
'supplier_id.required' => '供应商不能为空',
|
||||
'supplier_id.integer' => '供应商ID必须为整数',
|
||||
'supplier_id.min' => '供应商ID不正确',
|
||||
'product_name.required' => '品名不能为空',
|
||||
'product_name.max' => '品名最长 100 个字符',
|
||||
'product_spec.max' => '规格最长 100 个字符',
|
||||
'unit.required' => '计价单位不能为空',
|
||||
'unit.max' => '计价单位最长 20 个字符',
|
||||
'price.required' => '单价不能为空',
|
||||
'price.numeric' => '单价必须为数字',
|
||||
'price.min' => '单价不能小于 0',
|
||||
'cost_price.required' => '成本价不能为空',
|
||||
'cost_price.numeric' => '成本价必须为数字',
|
||||
'cost_price.min' => '成本价不能小于 0',
|
||||
'quantity.required' => '订货量不能为空',
|
||||
'quantity.integer' => '订货量必须为整数',
|
||||
'quantity.min' => '订货量必须大于 0',
|
||||
'weight.required' => '重量不能为空',
|
||||
'weight.numeric' => '重量必须为数字',
|
||||
'weight.min' => '重量不能小于 0',
|
||||
]);
|
||||
|
||||
return DB::transaction(function () use ($id, $data) {
|
||||
$item = StoreOrderItemModel::query()->lockForUpdate()->find($id);
|
||||
if (empty($item)) {
|
||||
throw new RepositoryException('订单明细不存在');
|
||||
}
|
||||
$order = StoreOrderModel::query()->lockForUpdate()->find($item->order_id);
|
||||
if (empty($order)) {
|
||||
throw new RepositoryException('订单不存在');
|
||||
}
|
||||
$this->assertItemEditable($order);
|
||||
|
||||
$item->fill($data);
|
||||
$item->product_spec = (string) ($data['product_spec'] ?? '');
|
||||
$item->amount = bcmul(
|
||||
bcadd((string) $data['price'], '0', 2),
|
||||
(string) $data['quantity'],
|
||||
2
|
||||
);
|
||||
$item->save();
|
||||
|
||||
$this->recalculateOrderTotals($order);
|
||||
|
||||
return $this->success($item->load('supplier:id,name')->makeVisible('cost_price')->toArray());
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 一键同步明细商品快照:按商品ID同步最新商品档案的
|
||||
* 供应商、品名、规格、单位、成本价;单价按门店当前等级价重算
|
||||
* (未设置等级价时保留原单价),并重算订单总价
|
||||
*/
|
||||
#[PutRoute(route: '/item/{id}/sync', authorize: 'update', where: ['id' => '[0-9]+'])]
|
||||
public function syncItem(int $id): JsonResponse
|
||||
{
|
||||
return DB::transaction(function () use ($id) {
|
||||
$item = StoreOrderItemModel::query()->lockForUpdate()->find($id);
|
||||
if (empty($item)) {
|
||||
throw new RepositoryException('订单明细不存在');
|
||||
}
|
||||
$order = StoreOrderModel::query()->lockForUpdate()->find($item->order_id);
|
||||
if (empty($order)) {
|
||||
throw new RepositoryException('订单不存在');
|
||||
}
|
||||
$this->assertItemEditable($order);
|
||||
|
||||
// 软删除商品无法同步(下架商品仍可同步最新档案)
|
||||
$product = ProductModel::find($item->product_id);
|
||||
if (empty($product)) {
|
||||
throw new RepositoryException('商品不存在或已被删除,无法同步');
|
||||
}
|
||||
|
||||
$item->supplier_id = (int) $product->supplier_id;
|
||||
$item->product_name = $product->name;
|
||||
$item->product_spec = (string) $product->spec;
|
||||
$item->unit = (string) $product->unit;
|
||||
$item->cost_price = $product->cost_price;
|
||||
|
||||
// 单价:按订货门店当前客户等级价重算(百分比计价按最新成本价换算)
|
||||
$levelId = (int) ($order->store->level_id ?? 0);
|
||||
$priceRow = ProductPriceModel::query()
|
||||
->forProductLevel((int) $item->product_id, $levelId)
|
||||
->first(['price', 'price_type', 'percent']);
|
||||
if ($priceRow !== null) {
|
||||
$item->price = ProductPriceModel::calcActualPrice(
|
||||
(int) $priceRow->price_type,
|
||||
$priceRow->price,
|
||||
$priceRow->percent,
|
||||
$product->cost_price,
|
||||
);
|
||||
}
|
||||
|
||||
$item->amount = bcmul((string) $item->price, (string) $item->quantity, 2);
|
||||
$item->save();
|
||||
|
||||
$this->recalculateOrderTotals($order);
|
||||
|
||||
return $this->success($item->load('supplier:id,name')->makeVisible('cost_price')->toArray());
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态流转:待接单→已接单/已取消;采购中→配送中/已完成;配送中→已完成
|
||||
* 状态流转
|
||||
*/
|
||||
#[PutRoute(route: '/{id}/status', authorize: 'update', where: ['id' => '[0-9]+'])]
|
||||
public function status(int $id, Request $request): JsonResponse
|
||||
@@ -343,7 +128,7 @@ class StoreOrderController extends BaseController
|
||||
$target = (int) $data['status'];
|
||||
if (! in_array($target, $this->allowedTransitions($order->status), true)) {
|
||||
throw new RepositoryException(
|
||||
'订单当前状态为「' . (self::STATUS_NAMES[$order->status] ?? $order->status) . '」,不允许该操作'
|
||||
'订单当前状态为「' . (StoreOrderModel::STATUS_NAMES[$order->status] ?? $order->status) . '」,不允许该操作'
|
||||
);
|
||||
}
|
||||
|
||||
@@ -356,8 +141,7 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量状态流转:先全量校验流转路径,任一订单不允许则整批中止;
|
||||
* 全部合法时在事务内流转并逐单通知门店
|
||||
* 批量状态流转
|
||||
*/
|
||||
#[PutRoute(route: '/batchStatus', authorize: 'update')]
|
||||
public function batchStatus(Request $request): JsonResponse
|
||||
@@ -381,12 +165,12 @@ class StoreOrderController extends BaseController
|
||||
$blocked = [];
|
||||
foreach ($orders as $order) {
|
||||
if (! in_array($target, $this->allowedTransitions($order->status), true)) {
|
||||
$blocked[] = $order->order_no . '(' . (self::STATUS_NAMES[$order->status] ?? $order->status) . ')';
|
||||
$blocked[] = $order->order_no . '(' . (StoreOrderModel::STATUS_NAMES[$order->status] ?? $order->status) . ')';
|
||||
}
|
||||
}
|
||||
if (! empty($blocked)) {
|
||||
throw new RepositoryException(
|
||||
'以下订单不允许流转为「' . (self::STATUS_NAMES[$target] ?? $target) . '」,批量操作已中止:' . implode('、', $blocked)
|
||||
'以下订单不允许流转为「' . (StoreOrderModel::STATUS_NAMES[$target] ?? $target) . '」,批量操作已中止:' . implode('、', $blocked)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -402,7 +186,7 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除订单(软删除):仅已取消订单允许删除;删除后后台列表/详情、小程序端均不可见
|
||||
* 删除订单(软删除)
|
||||
*/
|
||||
#[DeleteRoute(route: '/{id}', authorize: 'delete', where: ['id' => '[0-9]+'])]
|
||||
public function delete(int $id): JsonResponse
|
||||
@@ -413,7 +197,7 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
if ($order->status !== StoreOrderModel::STATUS_CANCELLED) {
|
||||
throw new RepositoryException(
|
||||
'订单当前状态为「' . (self::STATUS_NAMES[$order->status] ?? $order->status) . '」,仅已取消订单可删除'
|
||||
'订单当前状态为「' . (StoreOrderModel::STATUS_NAMES[$order->status] ?? $order->status) . '」,仅已取消订单可删除'
|
||||
);
|
||||
}
|
||||
|
||||
@@ -423,31 +207,7 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态流转合法路径(与迁移状态定义一致):
|
||||
* 待接单→已接单/已取消;采购中→配送中/已完成;配送中→已完成
|
||||
* (已接单→采购中 只能经「生成采购单」完成,不在本流转内)
|
||||
*
|
||||
* @return int[]
|
||||
*/
|
||||
private function allowedTransitions(int $status): array
|
||||
{
|
||||
return match ($status) {
|
||||
StoreOrderModel::STATUS_PENDING => [
|
||||
StoreOrderModel::STATUS_SUMMARIZED,
|
||||
StoreOrderModel::STATUS_CANCELLED,
|
||||
],
|
||||
StoreOrderModel::STATUS_DELIVERING => [
|
||||
StoreOrderModel::STATUS_DISTRIBUTION,
|
||||
StoreOrderModel::STATUS_COMPLETED,
|
||||
],
|
||||
StoreOrderModel::STATUS_DISTRIBUTION => [StoreOrderModel::STATUS_COMPLETED],
|
||||
default => [],
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改周转框/周转托盘数量(仅已接单、采购中、配送中可改),
|
||||
* 自动重算附加金额与订单总金额
|
||||
* 修改周转框/周转托盘数量
|
||||
*/
|
||||
#[PutRoute(route: '/{id}/container', authorize: 'update', where: ['id' => '[0-9]+'])]
|
||||
public function container(int $id, Request $request): JsonResponse
|
||||
@@ -476,7 +236,7 @@ class StoreOrderController extends BaseController
|
||||
];
|
||||
if (! in_array($order->status, $editable, true)) {
|
||||
throw new RepositoryException(
|
||||
'订单当前状态为「' . (self::STATUS_NAMES[$order->status] ?? $order->status) . '」,不允许修改周转框/托盘数量'
|
||||
'订单当前状态为「' . (StoreOrderModel::STATUS_NAMES[$order->status] ?? $order->status) . '」,不允许修改周转框/托盘数量'
|
||||
);
|
||||
}
|
||||
|
||||
@@ -501,36 +261,24 @@ class StoreOrderController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* 明细编辑状态校验:已完成/已取消订单锁定
|
||||
* 状态流转合法路径
|
||||
*
|
||||
* @return int[]
|
||||
*/
|
||||
private function assertItemEditable(StoreOrderModel $order): void
|
||||
private function allowedTransitions(int $status): array
|
||||
{
|
||||
if (! in_array($order->status, self::ITEM_EDITABLE_STATUS, true)) {
|
||||
throw new RepositoryException(
|
||||
'订单当前状态为「' . (self::STATUS_NAMES[$order->status] ?? $order->status) . '」,不允许修改商品明细'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 重算订单汇总:明细金额合计 → 商品总金额;订货量/重量合计 → 订货总量/总重量;
|
||||
* 订单总金额 = 商品总金额 + 附加金额(恒成立)
|
||||
*/
|
||||
private function recalculateOrderTotals(StoreOrderModel $order): void
|
||||
{
|
||||
$totals = StoreOrderItemModel::query()
|
||||
->where('order_id', $order->id)
|
||||
->selectRaw('COALESCE(SUM(quantity), 0) as total_quantity')
|
||||
->selectRaw('COALESCE(SUM(weight), 0) as total_weight')
|
||||
->selectRaw('COALESCE(SUM(amount), 0) as product_amount')
|
||||
->first();
|
||||
|
||||
$productAmount = bcadd((string) $totals->product_amount, '0', 2);
|
||||
$order->total_quantity = (int) $totals->total_quantity;
|
||||
$order->total_weight = bcadd((string) $totals->total_weight, '0', 3);
|
||||
$order->product_amount = $productAmount;
|
||||
$order->total_amount = bcadd($productAmount, (string) $order->added_amount, 2);
|
||||
$order->save();
|
||||
return match ($status) {
|
||||
StoreOrderModel::STATUS_PENDING => [
|
||||
StoreOrderModel::STATUS_SUMMARIZED,
|
||||
StoreOrderModel::STATUS_CANCELLED,
|
||||
],
|
||||
StoreOrderModel::STATUS_DELIVERING => [
|
||||
StoreOrderModel::STATUS_DISTRIBUTION,
|
||||
StoreOrderModel::STATUS_COMPLETED,
|
||||
],
|
||||
StoreOrderModel::STATUS_DISTRIBUTION => [StoreOrderModel::STATUS_COMPLETED],
|
||||
default => [],
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -543,7 +291,7 @@ class StoreOrderController extends BaseController
|
||||
->where('status', UserModel::STATUS_NORMAL)
|
||||
->pluck('id');
|
||||
|
||||
$statusName = self::STATUS_NAMES[$order->status] ?? (string) $order->status;
|
||||
$statusName = StoreOrderModel::STATUS_NAMES[$order->status] ?? (string) $order->status;
|
||||
foreach ($userIds as $userId) {
|
||||
NoticeModel::create([
|
||||
'user_id' => $userId,
|
||||
|
||||
Reference in New Issue
Block a user