Merge branch 'variant' of http://gogs.hnwmzp.cn/chengwenliang/nshop into variant

packages/Longyi/Core/src/Helpers/FlexibleVariantOption.php

@@ -160,18 +160,22 @@ class FlexibleVariantOption
             foreach ($option->values as $value) {
                 // Check if this value is used in any saleable variant
                 $isAvailable = $variants->filter(function ($variant) use ($value) {
-                    return $variant->isSaleable() && 
-                           $variant->values->contains('id', $value->id);
+                    return $variant->values->contains('id', $value->id);
+                    // return $variant->isSaleable() && 
+                    //        $variant->values->contains('id', $value->id);
                 })->isNotEmpty();
+                if($isAvailable) {
+                    $optionData['values'][] = [
+                        'id' => $value->id,
+                        'label' => $value->label,
+                        'code' => $value->code,
+                        'position' => $value->position,
+                        'meta' => $value->meta,
+                        'is_available' => $isAvailable,
+                    ];
 
-                $optionData['values'][] = [
-                    'id' => $value->id,
-                    'label' => $value->label,
-                    'code' => $value->code,
-                    'position' => $value->position,
-                    'meta' => $value->meta,
-                    'is_available' => $isAvailable,
-                ];
+                }
+                
             }
 
             $result[] = $optionData;

packages/Longyi/Core/src/Http/Controllers/Admin/FlexibleVariantController.php

@@ -214,13 +214,19 @@ class FlexibleVariantController extends Controller
      */
     public function getProductOptions(int $productId): JsonResponse
     {
-        $this->initProduct($productId);
-        $options = $this->_product->options()
-            ->with('values', function ($query) {
-                $query->whereHas('variants', function ($relation) {
-                    $relation->whereIn($relation->getModel()->getTable().'.id', $this->_product->variants()->pluck('id'));
-                });
-            });
+
+
+        $options=$this->flexibleVariantHelper->getAvailableOptions($productId);
+        // $this->initProduct($productId);
+        // $options = $this->_product->options()
+        //     ->with('values', function ($query) {
+        //         $query->whereHas('variants', function ($relation) {
+        //             // dd($relation->getModel()->getTable());exit;
+        //             $relation->whereIn($relation->getModel()->getTable().'.id', $this->_product->variants()->pluck('id'));
+        //         });
+        //     })->toSql();
+
+
         return response()->json([
             'success' => true,
             'data' => $options,
@@ -407,7 +413,7 @@ class FlexibleVariantController extends Controller
         
         $variantIds=collect($variants)->pluck('id');
         //删除无用的变体
-        $this->_product->variants()->whereNotIn('id', $variantIds)->delete();
+        $this->_product->flexibleVariants()->whereNotIn('id', $variantIds)->delete();
         DB::commit();
         return response()->json([
             'success' => true,