花材撤回

app-ghs/controllers/ProductController.php

@@ -57,7 +57,6 @@ class ProductController extends BaseController
 
         $itemInfoData = ProductClass::getAllByCondition($where, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC], "*");
         $itemInfoData = ProductClass::groupProductInfo($itemInfoData);
-
         //常用的itemIds
         $oftenItemIds = ProductClass::getOftenItemIds($shopId);
         //获取供应商下所有花材ID （itemIds）
@@ -67,15 +66,7 @@ class ProductController extends BaseController
         //组装数据： [{classId:'','className:'',child:[{itemInfoData}]}]
         $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type);
 
-        //shish
-        $classInfo = array_column($classIds,null,'id');
-        foreach($itemInfoData as $key => $val){
-            $currentClassId = $val['classId'] ?? 0;
-            $className = $classInfo[$currentClassId]['name'] ?? '';
-            $itemInfoData[$key]['className'] = $className;
-        }
-
-        util::success(['list' => $data, 'product' => $itemInfoData]);
+        util::success($data);
     }