修复BUG
This commit is contained in:
@@ -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;
|
||||
});
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -105,7 +105,7 @@ class PurchaseOrderController extends BaseController
|
||||
$quantity = 0;
|
||||
// 采购总重量
|
||||
$weight = '0';
|
||||
// 采购总金额(Σ明细 amount,参考零售价按 金额÷数量 加权)
|
||||
// 采购总金额(Σ明细 amount,单价按 金额÷数量 加权)
|
||||
$amount = '0';
|
||||
// 门店明细
|
||||
$cellsMap = [];
|
||||
|
||||
Reference in New Issue
Block a user