客户等级设置

app/Http/Controllers/Mini/ProductController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Mini;
 
 use App\Exceptions\RepositoryException;
+use App\Models\CustomerLevelModel;
 use App\Models\ProductCategoryModel;
 use App\Models\ProductModel;
-use App\Models\ProductPriceModel;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Modules\AnnoRoute\Attribute\GetRoute;
@@ -50,30 +50,17 @@ class ProductController extends BaseMiniController
             ->orderBy('id')
             ->paginate($pageSize);
 
-        // 当前门店的等级价格（一次性取出，避免逐行查询）
+        // 当前门店的等级（售价 = 成本价 × (100 + 等级上浮比例) / 100）
         $user = $this->optionalUser($request);
         $store = $user !== null ? $this->boundStore($user) : null;
-        $priceRows = collect();
-        if ($store !== null && $store->level_id > 0) {
-            $priceRows = ProductPriceModel::query()
-                ->where('level_id', $store->level_id)
-                ->whereIn('product_id', $paginator->getCollection()->pluck('id'))
-                ->get(['product_id', 'price', 'price_type', 'percent'])
-                ->keyBy('product_id');
-        }
+        $level = ($store !== null && $store->level_id > 0) ? $store->level : null;
 
         $paginator->getCollection()->transform(
-            static function (ProductModel $product) use ($priceRows): array {
+            static function (ProductModel $product) use ($level): array {
                 $row = $product->toArray();
-                // 实际价（百分比计价行按成本价上浮换算；成本价不随序列化输出）
-                $priceRow = $priceRows->get($product->id);
-                $row['price'] = $priceRow !== null
-                    ? ProductPriceModel::calcActualPrice(
-                        (int) $priceRow->price_type,
-                        (string) $priceRow->price,
-                        (string) $priceRow->percent,
-                        (string) $product->cost_price,
-                    )
+                // 实际价（按等级上浮比例换算；成本价不随序列化输出）
+                $row['price'] = $level !== null
+                    ? CustomerLevelModel::calcLevelPrice($product->cost_price, $level->percent)
                     : null;
                 return $row;
             }
@@ -83,7 +70,7 @@ class ProductController extends BaseMiniController
     }
 
     /**
-     * 商品详情（免登录浏览；登录门店按等级显示换算价，未登录/未绑店/未设等级 price=null）
+     * 商品详情（免登录浏览；登录门店按等级上浮比例显示换算价，未登录/未绑店/未设等级 price=null）
      */
     #[GetRoute('/product/{id}', authorize: false, where: ['id' => '[0-9]+'])]
     public function detail(int $id, Request $request): JsonResponse
@@ -99,18 +86,9 @@ class ProductController extends BaseMiniController
         $price = null;
         $user = $this->optionalUser($request);
         $store = $user !== null ? $this->boundStore($user) : null;
-        if ($store !== null && $store->level_id > 0) {
-            $priceRow = ProductPriceModel::query()
-                ->forProductLevel($product->id, $store->level_id)
-                ->first(['price', 'price_type', 'percent']);
-            if ($priceRow !== null) {
-                $price = ProductPriceModel::calcActualPrice(
-                    (int) $priceRow->price_type,
-                    (string) $priceRow->price,
-                    (string) $priceRow->percent,
-                    (string) $product->cost_price,
-                );
-            }
+        $level = ($store !== null && $store->level_id > 0) ? $store->level : null;
+        if ($level !== null) {
+            $price = CustomerLevelModel::calcLevelPrice($product->cost_price, $level->percent);
         }
 
         $data = $product->toArray();