yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-11-30 22:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-文案调整

Browse Source
This commit is contained in:
杨建炊 2024-08-23 15:33:10 +08:00
parent 16b93f1619
commit 2c974cfbc0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Goods/GoodsCombinationController.php
View File

@ -120,7 +120,7 @@ class GoodsCombinationController extends Controller
$stock = []; $stock = [];
$saleStock = []; $saleStock = [];
foreach ($combinationGoods as $item) { foreach ($combinationGoods as $item) {
if(!empty($skus[$item['item_id']])){ if (!empty($skus[$item['item_id']])) {
$stock[] = (int)($skus[$item['item_id']]['stock'] / $item['item_num']); $stock[] = (int)($skus[$item['item_id']]['stock'] / $item['item_num']);
$saleStock[] = (int)($skus[$item['item_id']]['sale_stock'] / $item['item_num']); $saleStock[] = (int)($skus[$item['item_id']]['sale_stock'] / $item['item_num']);
} }
@ -200,7 +200,7 @@ class GoodsCombinationController extends Controller
->with('goods:id,title') ->with('goods:id,title')
->get(['id', 'title', 'goods_id']); ->get(['id', 'title', 'goods_id']);
foreach ($skus as &$sku) { foreach ($skus as &$sku) {
$sku['title'] = $sku['goods']['title'] . $sku['title']; $sku['title'] = ($sku['goods']['title'] ?? "") . $sku['title'];
} }
return GoodsSkuResource::collection($skus); return GoodsSkuResource::collection($skus);

4
app/Http/Controllers/Goods/GoodsSkusController.php
View File

@ -200,7 +200,9 @@ class GoodsSkusController extends Controller
$this->setBeforeUpdateForLog($sku->toArray()); $this->setBeforeUpdateForLog($sku->toArray());
$skuInfo = $request->sku; $skuInfo = $request->sku;
$goodService = new GoodService(); $goodService = new GoodService();
$skuInfo['name'] = $goodService->getTypeFormatName($request->goods['type_id']) . $request->sku['title']; $goods = $goodService->saveDefaultGoodsByGoodType($request->goods['type_id']);
$skuInfo['goods_id'] = $goods->id;
$skuInfo['name'] =$goods->title. $request->sku['title'];
$sku->update($skuInfo); $sku->update($skuInfo);
$this->setAfterUpdateForLog($sku->toArray()); $this->setAfterUpdateForLog($sku->toArray());
$this->addLog($id, 'update'); $this->addLog($id, 'update');