价格增加百分比上浮

app/Http/Controllers/Mini/CartController.php

@@ -45,11 +45,12 @@ class CartController extends BaseMiniController
         if ($product === null) {
             throw new RepositoryException('商品不存在或已下架，请刷新后重试');
         }
-        $price = ProductPriceModel::query()
+        // 存在性校验与计价类型无关（百分比行 price 可能为 0 也能加购）
+        $hasPrice = ProductPriceModel::query()
             ->where('product_id', $productId)
             ->where('level_id', $store->level_id)
-            ->value('price');
-        if ($price === null) {
+            ->exists();
+        if (! $hasPrice) {
             throw new RepositoryException('商品「' . $product->name . '」未设置您所在等级的价格，无法加购');
         }
 
@@ -115,10 +116,11 @@ class CartController extends BaseMiniController
             ->unique()->values()->all();
 
         $products = ProductModel::withTrashed()->whereIn('id', $productIds)->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');
 
         // 图片一次查回（避免 ProductModel::$appends images_arr 的 N+1）。
         // 注意：image_ids 有 imageIds Attribute 访问器（get 返回数组），需取原始值
@@ -140,7 +142,16 @@ class CartController extends BaseMiniController
         foreach ($rows as $row) {
             $product = $products->get($row->product_id);
             $productOn = $product !== null && $product->status === ProductModel::STATUS_ON;
-            $price = $prices->get($row->product_id); // string|null
+            // 实际价（百分比计价行按成本价上浮换算）；未设等级价为 null
+            $priceRow = $priceRows->get($row->product_id);
+            $price = $priceRow === null
+                ? null
+                : ProductPriceModel::calcActualPrice(
+                    (int) $priceRow->price_type,
+                    $priceRow->price,
+                    $priceRow->percent,
+                    (float) ($product?->cost_price ?? 0),
+                );
             $buyable = $productOn && $price !== null;
             $quantity = (string) $row->quantity;
 

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);

app/Http/Controllers/Mini/ProductController.php

@@ -88,9 +88,10 @@ class ProductController extends BaseMiniController
             ->paginate($pageSize)
             ->toArray();
 
-        // 扁平化价格：prices[0].price → price（未设等级价为 null）
+        // 扁平化价格：prices[0].actual_price → price（访问器经 toArray 自动输出换算后实际价；未设等级价为 null）
+        // unset prices 同时移除 price_type/percent，门店端无法反推成本；cost_price 已被 $hidden 过滤
         foreach ($data['data'] as &$row) {
-            $row['price'] = $row['prices'][0]['price'] ?? null;
+            $row['price'] = $row['prices'][0]['actual_price'] ?? null;
             unset($row['prices']);
         }