修复BUG

app/Http/Controllers/Mini/OrderController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Mini;
 
 use App\Exceptions\RepositoryException;
 use App\Http\Requests\Mini\MiniOrderRequest;
+use App\Models\CartModel;
 use App\Models\CustomerLevelModel;
 use App\Models\ProductModel;
 use App\Models\StoreOrderItemModel;
@@ -104,6 +105,12 @@ class OrderController extends BaseMiniController
             }
             StoreOrderItemModel::insert($rows);
 
+            // 下单成功后自动清空购物车中已下单的商品
+            CartModel::query()
+                ->where('store_id', $store->id)
+                ->whereIn('product_id', $productIds)
+                ->delete();
+
             return $order;
         });
 

app/Http/Controllers/Order/StoreOrderController.php

@@ -52,6 +52,15 @@ class StoreOrderController extends BaseController
             });
         }
 
+        // 按采购单号模糊搜索（关联采购单）
+        $purchaseNo = trim((string) ($params['purchase_no'] ?? ''));
+        if ($purchaseNo !== '') {
+            $keyword = '%' . str_replace('%', '\%', $purchaseNo) . '%';
+            $query->whereHas('purchase', static function ($purchaseQuery) use ($keyword) {
+                $purchaseQuery->where('purchase_no', 'like', $keyword);
+            });
+        }
+
         $data = $this->buildSearch($params, $query)
             ->orderBy('order_date', 'desc')
             ->orderBy('id', 'desc')

app/Http/Controllers/Purchase/PurchaseOrderController.php

@@ -105,7 +105,7 @@ class PurchaseOrderController extends BaseController
             $quantity = 0;
             // 采购总重量
             $weight = '0';
-            // 采购总金额（Σ明细 amount，参考零售价按 金额÷数量 加权）
+            // 采购总金额（Σ明细 amount，单价按 金额÷数量 加权）
             $amount = '0';
             // 门店明细
             $cellsMap  = [];

app/Http/Requests/Product/ProductFormRequest.php

@@ -26,6 +26,7 @@ class ProductFormRequest extends BaseFormRequest
             'name' => 'required|string|max:100',
             'spec' => 'nullable|string|max:100',
             'unit' => 'nullable|string|max:20',
+            'price_unit' => 'nullable|string|max:20',
             'image_ids' => 'nullable|array|max:255',
             'image_ids.*' => ['integer', new Exists(SysFileModel::class, 'id')],
             'content' => 'nullable|string',

app/Http/Requests/Purchase/PurchaseBillGenerateRequest.php

@@ -5,7 +5,7 @@ namespace App\Http\Requests\Purchase;
 use Modules\Common\Http\Requests\BaseFormRequest;
 
 /**
- * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量，金额由系统汇总不可修改；
+ * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量与售后/备注，金额由系统汇总不可修改；
  * 筐/托盘数量正数=压筐附加金额，负数=回筐抵扣金额）
  */
 class PurchaseBillGenerateRequest extends BaseFormRequest
@@ -20,6 +20,8 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores.*.delivery_fee' => 'required|numeric|min:0',
             'stores.*.box_num' => 'required|integer',
             'stores.*.tray_num' => 'required|integer',
+            'stores.*.after_sale' => 'nullable|string|max:255',
+            'stores.*.remark' => 'nullable|string|max:255',
         ];
     }
 
@@ -39,6 +41,8 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores.*.box_num.integer' => '周转筐数量必须为整数（正数=压筐，负数=回筐）',
             'stores.*.tray_num.required' => '周转托盘数量不能为空',
             'stores.*.tray_num.integer' => '周转托盘数量必须为整数（正数=压筐，负数=回筐）',
+            'stores.*.after_sale.max' => '售后说明最长 255 个字符',
+            'stores.*.remark.max' => '备注最长 255 个字符',
         ];
     }
 }