回筐、账单完成

2026-08-14 01:19:47 +08:00
parent e35c951a59
commit bf8ac68391
39 changed files with 1392 additions and 963 deletions
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\BillModel;
+use App\Models\ProductModel;
+use App\Models\StoreOrderItemModel;
+
+/**
+ * 账单详情数据组装（后台门店账单页与小程序账单详情共用）
+ */
+class BillDetailService
+{
+    /**
+     * 合并后的商品明细：按商品聚合账单关联的全部订单明细
+     * 单价为加权平均口径（Σ金额÷Σ数量），保证 单价×数量=金额
+     *
+     * @return array<int, array{product_id: int, product_name: string, product_spec: string, unit: string, price: string, quantity: int, weight: string, amount: string}>
+     */
+    public function mergedItems(BillModel $bill): array
+    {
+        $items = StoreOrderItemModel::query()
+            ->where('bill_id', $bill->id)
+            ->orderBy('id')
+            ->get();
+
+        // 排序键：分类 sort → 商品 sort（与采购单明细矩阵同序）
+        $products = ProductModel::withTrashed()
+            ->with('category:id,sort')
+            ->whereIn('id', $items->pluck('product_id')->unique())
+            ->get()
+            ->keyBy('id');
+
+        $rows = [];
+        foreach ($items->groupBy('product_id') as $productId => $group) {
+            $product = $products->get((int) $productId);
+            $first = $group->first();
+            $quantity = 0;
+            $weight = '0';
+            $amount = '0';
+            foreach ($group as $item) {
+                $quantity += (int) $item->quantity;
+                $weight = bcadd($weight, (string) $item->weight, 3);
+                $amount = bcadd($amount, (string) $item->amount, 2);
+            }
+
+            $rows[] = [
+                'product_id' => (int) $productId,
+                'product_name' => $first->product_name,
+                'product_spec' => $first->product_spec,
+                'unit' => $first->unit,
+                'price' => $quantity > 0
+                    ? bcdiv($amount, (string) $quantity, 2)
+                    : (string) $first->price,
+                'quantity' => $quantity,
+                'weight' => $weight,
+                'amount' => $amount,
+                'category_sort' => (int) ($product->category->sort ?? 9999),
+                'product_sort' => (int) ($product->sort ?? 9999),
+            ];
+        }
+        usort($rows, static fn (array $a, array $b): int =>
+            [$a['category_sort'], $a['product_sort'], $a['product_id']]
+            <=> [$b['category_sort'], $b['product_sort'], $b['product_id']]);
+
+        return array_map(static function (array $row): array {
+            unset($row['category_sort'], $row['product_sort']);
+            return $row;
+        }, $rows);
+    }
+}
@@ -4,8 +4,10 @@ namespace App\Services;

 use App\Exceptions\RepositoryException;
 use App\Models\BillModel;
+use App\Models\ContainerReturnModel;
 use App\Models\PurchaseOrderModel;
 use App\Models\StoreModel;
+use App\Models\StoreOrderItemModel;
 use App\Models\StoreOrderModel;
 use Illuminate\Support\Facades\DB;
 use Throwable;
@@ -109,10 +111,30 @@ readonly class BillGenerateService
                    'operator_id' => $operatorId,
                ]);

-                // 关联该门店在采购单中的全部订单到账单
+                // 关联该门店在采购单中的全部订单与订单明细到账单
                StoreOrderModel::query()
                    ->whereIn('id', $storeOrders->pluck('id'))
                    ->update(['bill_id' => $bill->id]);
+                StoreOrderItemModel::query()
+                    ->whereIn('order_id', $storeOrders->pluck('id'))
+                    ->update(['bill_id' => $bill->id]);
+
+                // 压筐：累加门店待回筐/托盘（行锁防并发），并写入压筐记录
+                $store = StoreModel::query()->lockForUpdate()->find((int) $storeId);
+                if ($store !== null) {
+                    $store->pending_box_num = (int) $store->pending_box_num + (int) $row['box_num'];
+                    $store->pending_tray_num = (int) $store->pending_tray_num + (int) $row['tray_num'];
+                    $store->save();
+                }
+                ContainerReturnModel::create([
+                    'store_id' => (int) $storeId,
+                    'bill_id' => $bill->id,
+                    'type' => ContainerReturnModel::TYPE_PRESS,
+                    'box_num' => (int) $row['box_num'],
+                    'tray_num' => (int) $row['tray_num'],
+                    'return_date' => $billDate,
+                    'operator_id' => $operatorId,
+                ]);

                $bills[] = $bill;
            }
@@ -25,7 +25,6 @@ class BillNumberService
        'PO' => ['purchase_order', 'purchase_no'],
        'SO' => ['store_order', 'order_no'],
        'RC' => ['reconciliation', 'recon_no'],
-        'ST' => ['statement', 'statement_no'],
        'JS' => ['settlement', 'settlement_no'],
        'ZD' => ['bill', 'bill_no'],
    ];
@@ -33,7 +32,7 @@ class BillNumberService
    /**
     * 生成业务单号
     *
-     * @param string $prefix 业务前缀：PO 采购单 / SO 订货单 / RC 对账 / ST 对账单 / JS 结算 / ZD 账单
+     * @param string $prefix 业务前缀：PO 采购单 / SO 订货单 / RC 对账 / JS 结算 / ZD 账单
     * @return string 如 PO202607230001
     */
    public function make(string $prefix): string
@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Exceptions\RepositoryException;
-use App\Models\StatementItemModel;
-use App\Models\StatementModel;
-use App\Models\StoreModel;
-use App\Models\StoreOrderItemModel;
-use App\Models\StoreOrderModel;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
-
-/**
- * 门店对账单生成（小程序端自助生成）
- *
- * 流程（事务内）：
- * 1. 拉取门店周期内的订单明细（排除已取消订单，按 order_item 去重防止重复入账）
- * 2. 快照当前 payment_cycle_days，settlement_date = period_end + cycle 天
- * 3. 明细快照商品名/单价/数量/重量/金额，statement_no = ST…
- */
-class StatementGenerateService
-{
-    public function __construct(private readonly BillNumberService $billNumberService)
-    {
-    }
-
-    /**
-     * @param StoreModel $store 门店（回款周期从此快照）
-     * @param string $periodStart 周期开始（Y-m-d）
-     * @param string $periodEnd 周期结束（Y-m-d）
-     */
-    public function generate(StoreModel $store, string $periodStart, string $periodEnd): StatementModel
-    {
-        return DB::transaction(function () use ($store, $periodStart, $periodEnd) {
-            $orderItems = StoreOrderItemModel::query()
-                ->join('store_order', 'store_order.id', '=', 'store_order_item.order_id')
-                ->where('store_order_item.store_id', $store->id)
-                ->whereDate('store_order.order_date', '>=', $periodStart)
-                ->whereDate('store_order.order_date', '<=', $periodEnd)
-                ->where('store_order.status', '<>', StoreOrderModel::STATUS_CANCELLED)
-                ->whereNull('store_order.deleted_at')
-                ->select('store_order_item.*')
-                ->get();
-
-            if ($orderItems->isEmpty()) {
-                throw new RepositoryException('周期内本店无订单数据，无法生成对账单');
-            }
-
-            // 防重复入账：剔除已计入过对账单的订单明细
-            $usedItemIds = StatementItemModel::query()
-                ->whereIn('statement_id', StatementModel::where('store_id', $store->id)->pluck('id'))
-                ->pluck('order_item_id');
-            $orderItems = $orderItems->reject(fn ($item) => $usedItemIds->contains($item->id));
-            if ($orderItems->isEmpty()) {
-                throw new RepositoryException('周期内的订单明细均已生成过对账单');
-            }
-
-            // 快照回款周期 → 应结算日期
-            $cycleDays = (int) $store->payment_cycle_days;
-            $totalAmount = $orderItems->reduce(
-                static fn (string $carry, $item): string => bcadd($carry, (string) $item->amount, 2),
-                '0'
-            );
-
-            $statement = StatementModel::create([
-                'statement_no' => $this->billNumberService->make('ST'),
-                'store_id' => $store->id,
-                'period_start' => $periodStart,
-                'period_end' => $periodEnd,
-                'total_amount' => $totalAmount,
-                'payment_cycle_days' => $cycleDays,
-                'settlement_date' => Carbon::parse($periodEnd)->addDays($cycleDays)->toDateString(),
-                'status' => StatementModel::STATUS_PENDING,
-            ]);
-
-            $rows = [];
-            $now = now();
-            foreach ($orderItems as $item) {
-                $rows[] = [
-                    'statement_id' => $statement->id,
-                    'order_id' => $item->order_id,
-                    'order_item_id' => $item->id,
-                    'product_id' => $item->product_id,
-                    'product_name' => $item->product_name,
-                    'price' => $item->price,
-                    'quantity' => $item->quantity,
-                    'weight' => $item->weight,
-                    'amount' => $item->amount,
-                    'is_reconciled' => StatementItemModel::NOT_RECONCILED,
-                    'store_remark' => '',
-                    'created_at' => $now,
-                    'updated_at' => $now,
-                ];
-            }
-            StatementItemModel::insert($rows);
-
-            return $statement;
-        });
-    }
-}