补字段

app/admin/controller/order/WholeController.php

@@ -150,10 +150,10 @@ class WholeController extends Curd
         } elseif (!empty($orderIds)) {
             $where['order_id'] = ['in', implode(',', $orderIds)];
         }
-        if (empty($where['order_category'])) {
-            // 充值订单不显示
-            $where['order_category'] = ['<>', 'RECHARGE'];
-        }
+//        if (empty($where['order_category'])) {
+//            // 充值订单不显示
+//            $where['order_category'] = ['<>', 'RECHARGE'];
+//        }
         // 自提订单        
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP') {
             $where['order_is_complete'] = 'N';

app/admin/service/goods/GoodsService.php

@@ -187,7 +187,7 @@ class GoodsService
                 $query->select('user_id', 'user_name');
             },
         ])->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
-            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
+            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%');
@@ -202,7 +202,7 @@ class GoodsService
                 if ($classify == 'GOODS' && empty($categoryId)) {
                     $query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
                 } else if ($classify == 'RECHARGE' && empty($categoryId)) {
-                    $query->where('goods_status','ON');
+                    $query->where('goods_status', 'ON');
                     $query->where('goods_classify', $classify);
                 } else if ($classify != 'GOODS' && empty($categoryId)) {
                     $query->where('goods_classify', $classify);
@@ -293,7 +293,7 @@ class GoodsService
             'updateUser' => function ($query) {
                 $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%');
@@ -360,7 +360,7 @@ class GoodsService
             'updateUser' => function ($query) {
                 $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%')
@@ -413,7 +413,7 @@ class GoodsService
             'updateUser' => function ($query) {
                 $query->select('user_id', 'user_name');
             }
-        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id','updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'updator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
             ->when($goodsName != '', function ($query) use ($goodsName) {
                 $query->where(function ($q) use ($goodsName) {
                     $q->where('goods_name', 'like', '%' . $goodsName . '%')
@@ -588,8 +588,8 @@ class GoodsService
             $goodsCategoryIds = array_column($data, 'id');
         }
         $goods = Goods::with([
-            'sku' => function($query){
-                $query->where('goods_sku_status','ON');
+            'sku' => function ($query) {
+                $query->where('goods_sku_status', 'ON');
             }
         ])
             ->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
@@ -667,14 +667,14 @@ class GoodsService
                                     if (!isset($cascader4['goods_id'])) {
                                         unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
                                     }
-                                    if (isset($cascader4['goods_id']) && empty($cascader4['sku'])){
+                                    if (isset($cascader4['goods_id']) && empty($cascader4['sku'])) {
                                         unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
                                     }
                                 }
                             } else if (!isset($cascader3['goods_id'])) {
                                 unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
                             }
-                            if (isset($cascader3['goods_id']) && empty($cascader3['sku'])){
+                            if (isset($cascader3['goods_id']) && empty($cascader3['sku'])) {
                                 unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
                                 continue;
                             }
@@ -688,7 +688,7 @@ class GoodsService
                     } else if (!isset($cascader2['goods_id'])) {
                         unset($cascaderData[$key1]['children'][$key2]);
                     }
-                    if (isset($cascader2['goods_id']) && empty($cascader2['sku'])){
+                    if (isset($cascader2['goods_id']) && empty($cascader2['sku'])) {
                         unset($cascaderData[$key1]['children'][$key2]);
                         continue;
                     }
@@ -702,7 +702,7 @@ class GoodsService
             } else if (!isset($cascader1['goods_id'])) {
                 unset($cascaderData[$key1]);
             }
-            if (isset($cascader1['goods_id']) && empty($cascader1['sku'])){
+            if (isset($cascader1['goods_id']) && empty($cascader1['sku'])) {
                 unset($cascaderData[$key1]);
                 continue;
             }
@@ -774,7 +774,7 @@ class GoodsService
                 $running = [];
             }
             // Sku表
-            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status','ON')->get();
+            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status', 'ON')->get();
             if (!empty($skus)) {
                 $skus = $skus->toArray();
                 $submitList = [];
@@ -1065,7 +1065,7 @@ class GoodsService
                 $running = [];
             }
             // Sku表
-            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status','ON')->get();
+            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status', 'ON')->get();
             if (!empty($skus)) {
                 $skus = $skus->toArray();
                 $submitList = [];
@@ -1229,10 +1229,15 @@ class GoodsService
                     if (empty($item['join_component_goods_id'])) {
                         continue;
                     }
-                    $skus = GoodsSku::where('join_sku_goods_id', $item['join_component_goods_id'])->where('goods_sku_status','ON')
+                    $skus = GoodsSku::with([
+                        'goods' => function ($query) {
+                            $query->select('goods_id', 'goods_cover');
+                        }
+                    ])->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();
+                    $goodsCover = '';
                     foreach ($skus as $key => $sku2) {
                         if (!empty($sku2['goods_sku_specs_json'])) {
                             $skus[$key]['goods_sku_specs_json'] = json_decode($sku2['goods_sku_specs_json'], true);
@@ -1240,12 +1245,15 @@ class GoodsService
                             $skuName = '';
                             foreach ($skus[$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
                                 if (is_array($skuSpecs)) {
-                                    $skuName = $skuName . ' ' . $specsKey . ' ' . implode(' ', $skuSpecs);
+                                    $skuName = $skuName . implode(' ', $skuSpecs) . ',';
                                 } else {
-                                    $skuName = $skuName . ' ' . $specsKey . ' ' . $skuSpecs;
+                                    $skuName = $skuName . $skuSpecs . ',';
                                 }
                             }
-                            $skus[$key]['sku_name'] = $skuName;
+                            $skus[$key]['sku_name'] = rtrim($skuName, ',');
+                        }
+                        if (!empty($sku2['goods'])) {
+                            $goodsCover = getenv('STORAGE_DOMAIN') . $sku2['goods']['goods_cover'];
                         }
                     }
                     $ids[] = $item['join_component_goods_id'];
@@ -1256,7 +1264,9 @@ class GoodsService
                         'goods_sales_price' => $item['goods_component_price'],
                         'nbr' => $configJson['nbr'] ?? 0,
                         'sku_id' => $configJson['sku_id'] ?? '',
-                        'skus' => $skus
+                        'sku_name' => !empty($skuName) ? rtrim($skuName, ',') : '',
+                        'skus' => $skus,
+                        'goods_cover' => $goodsCover
                     ];
                 }
 
@@ -1415,7 +1425,7 @@ class GoodsService
                 $goods->goods_attribute_json = json_encode($attributeJson);
             }
             $goods->save();
-            $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->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'];
@@ -2640,14 +2650,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'])->where('goods_sku_status','ON')->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_status','ON')->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/model/GoodsSku.php

@@ -13,4 +13,9 @@ class GoodsSku extends Model
     const CREATED_AT = null;
 
     const UPDATED_AT = null;
+
+    public function goods()
+    {
+        return $this->hasOne(Goods::class,'goods_id','join_sku_goods_id');
+    }
 }