商品规格

app/admin/controller/member/RuleAddedComponentController.php

@@ -44,7 +44,7 @@ class RuleAddedComponentController extends Curd
                     $goodsInfo = [];
                     if (isset($item2['goods_id'])) {
                         $goodsInfo['goods_name'] = $item2['goods_name'];
-                        $sku = GoodsSku::where('goods_sku_id', $item2['goods_sku_id'])->select('goods_sku_id', 'goods_sku_sales_price', 'goods_sku_specs_json')->first();
+                        $sku = GoodsSku::where('goods_sku_id', $item2['goods_sku_id'])->where('goods_sku_status','ON')->select('goods_sku_id', 'goods_sku_sales_price', 'goods_sku_specs_json')->first();
                         if (!empty($sku->goods_sku_specs_json)) {
                             $specsJson = json_decode($sku->goods_sku_specs_json, true);
                             $skuTitle = '';

app/admin/controller/member/RuleAddedController.php

@@ -66,7 +66,7 @@ class RuleAddedController extends Curd
                     if (isset($item['goods_id'])) {
                         $goodsInfo['goods_name'] = $item['goods_name'];
 //                        $goods = Goods::where('goods_id',$item['goods_id'])->select('goods_name');
-                        $sku = GoodsSku::where('goods_sku_id', $item['goods_sku_id'])->select('goods_sku_specs_json')->first();
+                        $sku = GoodsSku::where('goods_sku_id', $item['goods_sku_id'])->where('goods_sku_status','ON')->select('goods_sku_specs_json')->first();
                         if (!empty($sku->goods_sku_specs_json)) {
                             $specsJson = json_decode($sku->goods_sku_specs_json, true);
                             $skuTitle = '';

app/admin/service/goods/GoodsService.php

@@ -740,7 +740,7 @@ class GoodsService
                 $running = [];
             }
             // Sku表
-            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->get();
+            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status','ON')->get();
             if (!empty($skus)) {
                 $skus = $skus->toArray();
                 $submitList = [];
@@ -1026,7 +1026,7 @@ class GoodsService
                     if (empty($item['join_component_goods_id'])) {
                         continue;
                     }
-                    $skus = GoodsSku::where('join_sku_goods_id', $item['join_component_goods_id'])
+                    $skus = GoodsSku::where('join_sku_goods_id', $item['join_component_goods_id'])->where('goods_sku_status','ON')
                         ->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price')
                         ->get()
                         ->toArray();
@@ -1210,7 +1210,7 @@ class GoodsService
                 $goods->goods_attribute_json = json_encode($attributeJson);
             }
             $goods->save();
-            $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
+            $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->first();
             $sku->goods_sku_status = $params['goods_status'];
             $sku->goods_sku_specs_json = json_encode(['规格' => $params['goods_sales_price'] . '元']);
             $sku->goods_sku_market_price = $params['goods_sales_price'];
@@ -2432,14 +2432,14 @@ class GoodsService
                     $specsJson = json_encode($skuArr);
                     $skuTitle = str_replace('-', ',', $item['sku']) . $params['goods_name'];
                     if ($operation == 'update' && !empty($item['sku_id'])) {
-                        $model = GoodsSku::where('goods_sku_id', $item['sku_id'])->first();
+                        $model = GoodsSku::where('goods_sku_id', $item['sku_id'])->where('goods_sku_status','ON')->first();
                         if (!$model) {
                             $model = new GoodsSku();
                         } else {
                             unset($skusOldIds[$model->goods_sku_id]);
                         }
                     } else {
-                        $model = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_title', $skuTitle)->first();
+                        $model = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->where('goods_sku_title', $skuTitle)->first();
                         if (!$model) {
                             $model = new GoodsSku();
                         } else {

app/admin/service/order/AppointmentService.php

@@ -106,7 +106,7 @@ class AppointmentService
                 $row->appointment_times = $applyJson['times'] ?? '';
             }
 
-            $skus = GoodsSku::where('join_sku_goods_id',$row->join_appointment_goods_id)
+            $skus = GoodsSku::where('join_sku_goods_id',$row->join_appointment_goods_id)->where('goods_sku_status','ON')
                 ->where('goods_sku_id',$row->join_appointment_goods_sku_id)
                 ->select('goods_sku_id','goods_sku_specs_json','goods_sku_sales_price')
                 ->get();
@@ -207,7 +207,7 @@ class AppointmentService
             }
             $applyJson = json_decode($appointment->appointment_apply_json,true);
             $goods = Goods::where('goods_id',$appointment->join_appointment_goods_id)->first();
-            $sku = GoodsSku::where('goods_sku_id',$appointment->join_appointment_goods_sku_id)->first();
+            $sku = GoodsSku::where('goods_sku_id',$appointment->join_appointment_goods_sku_id)->where('goods_sku_status','ON')->first();
             $orderId = 'OD' . date('YmdHis') . random_string(6, 'up');
             $groupBy = 'OD' . date('YmdHis') . random_string(6, 'up');
             $order = [