价格增加百分比上浮

app/Http/Controllers/Mini/OrderController.php

@@ -47,10 +47,11 @@ class OrderController extends BaseMiniController
                 ->get()
                 ->keyBy('id');
 
-            $prices = ProductPriceModel::query()
+            $priceRows = ProductPriceModel::query()
                 ->where('level_id', $store->level_id)
                 ->whereIn('product_id', $productIds)
-                ->pluck('price', 'product_id');
+                ->get(['product_id', 'price', 'price_type', 'percent'])
+                ->keyBy('product_id');
 
             $totalQuantity = '0';
             $totalAmount = '0';
@@ -62,11 +63,18 @@ class OrderController extends BaseMiniController
                 if ($product === null) {
                     throw new RepositoryException('存在已下架或不存在的商品，请刷新后重试');
                 }
-                if (! isset($prices[$productId])) {
+                if (! isset($priceRows[$productId])) {
                     throw new RepositoryException('商品「' . $product->name . '」未设置您所在等级的价格，无法下单');
                 }
 
-                $price = (string) $prices[$productId];
+                // 实际价（百分比计价行按成本价上浮换算，$products 已含 cost_price）
+                $priceRow = $priceRows[$productId];
+                $price = ProductPriceModel::calcActualPrice(
+                    (int) $priceRow->price_type,
+                    $priceRow->price,
+                    $priceRow->percent,
+                    $product->cost_price,
+                );
                 $quantity = (string) $row['quantity'];
                 $amount = bcmul($price, $quantity, 2);
                 $totalQuantity = bcadd($totalQuantity, $quantity, 2);