|
|
@@ -81,9 +81,6 @@ class GoodsService
|
|
|
'supplier' => function ($query) {
|
|
|
$query->select('supplier_id', 'supplier_name');
|
|
|
},
|
|
|
-// 'component' => function ($query) {
|
|
|
-// $query->select('join_component_master_goods_id', 'join_component_goods_id', 'goods_component_price', 'goods_component_config_json');
|
|
|
-// }
|
|
|
])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes')
|
|
|
->when($goodsName != '', function ($query) use ($goodsName) {
|
|
|
$query->where(function ($q) use ($goodsName) {
|
|
|
@@ -322,7 +319,7 @@ class GoodsService
|
|
|
continue;
|
|
|
}
|
|
|
$ids[] = $item['join_component_goods_id'];
|
|
|
- $configJson = json_decode($item['goods_component_config_json'], true);
|
|
|
+ $configJson = json_decode($item['goods_component_json'], true);
|
|
|
$contentList[] = [
|
|
|
'goods_id' => $item['join_component_goods_id'],
|
|
|
'goods_name' => $configJson['goods_name'] ?? '',
|
|
|
@@ -648,9 +645,11 @@ class GoodsService
|
|
|
'join_component_goods_id' => $item['goods_id'] ?? '',
|
|
|
'goods_component_price' => $item['goods_sales_price'] ?? '',
|
|
|
'goods_component_cover' => $goods->goods_cover,
|
|
|
- 'goods_component_config_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr']]),
|
|
|
+ 'goods_component_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr']]),
|
|
|
'goods_component_addtimes' => time()
|
|
|
];
|
|
|
+
|
|
|
+ dump($data);
|
|
|
}
|
|
|
|
|
|
if ($data) {
|
|
|
@@ -659,7 +658,7 @@ class GoodsService
|
|
|
Db::commit();
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollBack();
|
|
|
- dump($e->getTrace());
|
|
|
+ dump($e->getMessage());
|
|
|
throw new BusinessException("数据写入失败~");
|
|
|
}
|
|
|
}
|
gorden