diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php index 2907c23..9623259 100644 --- a/app/Http/Controllers/Goods/GoodsSkusController.php +++ b/app/Http/Controllers/Goods/GoodsSkusController.php @@ -115,7 +115,7 @@ class GoodsSkusController extends Controller ->paginate($request->get('per_page')); $rolesName = $request->user()->getRoleNames()->toArray(); foreach ($goodsSkus as &$sku) { - $lastInventoryTime = $sku['daily']['inventory_time'] ?: date('Y-m-d 07:00:00'); + $lastInventoryTime = !empty($sku['daily']['inventory_time']) ? $sku['daily']['inventory_time'] : date('Y-m-d 07:00:00'); if (isset($externals[$sku['external_sku_id']])) { $sku['order_detail'] = $externals[$sku['external_sku_id']]; $sku['order_goods_num'] = array_sum(array_column($externals[$sku['external_sku_id']], 'number')); @@ -123,7 +123,7 @@ class GoodsSkusController extends Controller $sku['order_detail'] = []; $sku['order_goods_num'] = 0; } - $sku['order_goods_num'] -= $sku['daily']['reissue_num']; + $sku['order_goods_num'] -= $sku['daily']['reissue_num']??0; $sku['inventory_time'] = $lastInventoryTime; if ('销售' === $rolesName[0]) { $sku['cost'] = 0; @@ -221,7 +221,7 @@ class GoodsSkusController extends Controller public function batchUpdate(Request $request) { $appendRules = [ - 'updateType' => ['required', 'string', Rule::in(['newest', 'inventory', 'stock',"stockManage"])], + 'updateType' => ['required', 'string', Rule::in(['newest', 'inventory', 'stock', "stockManage"])], 'skus' => ['required', 'array'], 'skus.*.id' => [ 'required', @@ -252,7 +252,7 @@ class GoodsSkusController extends Controller try { $logs = []; foreach ($request->skus as $sku) { - $costLog = [ + $costLog = [ 'module' => 'goods', 'action' => $request->getMethod(), 'target_type' => 'goods_sku', @@ -285,6 +285,7 @@ class GoodsSkusController extends Controller return response($this->res, $this->res['httpCode']); } + /** * 上新 * diff --git a/app/Services/GoodSku/GoodSkuService.php b/app/Services/GoodSku/GoodSkuService.php index ebe43fa..e3d286c 100644 --- a/app/Services/GoodSku/GoodSkuService.php +++ b/app/Services/GoodSku/GoodSkuService.php @@ -49,8 +49,8 @@ class GoodSkuService public static function computeSkuStock(array $goodsSkuItem, array $v): array { $updateIds = []; - if (!empty($v['is_combination'])) { - GoodsSku::query()->where('external_sku_id', $v['external_sku_id'])->update([ + if (empty($goodsSkuItem['is_combination'])) { + GoodsSku::query()->where('external_sku_id', $goodsSkuItem['external_sku_id'])->update([ 'stock' => $goodsSkuItem['stock'] + $v['num'], 'sale_stock' => $goodsSkuItem['sale_stock'] + $v['num'], 'cost' => number_format(($goodsSkuItem['stock'] * $goodsSkuItem['cost'] + $v['cost'] * $v['num'])