Skip to content

G
goods
Commit 0ac5a084 authored by pengfei's avatar pengfei
Browse files
Options

Merge branch 'pindan_activity_list_optimize' into test 

# Conflicts:
#	composer.json
#	composer.lock
#	vendor/composer/installed.json
#	vendor/composer/installed.php
parents 4c911a1a cfcea5ce
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
application/services/goods/GoodsService.php
View file @ 0ac5a084
......@@ -1998,7 +1998,7 @@ class GoodsService
$goodsSkuData = [];
foreach ($goodsSkuList as $goodsInfo) {
if (!empty($goodsSpuList[$goodsInfo['goods_spu_id']])) {
$goodsSpuInfo = $goodsSpuList[$goodsInfo['goods_spu_id']];
$goodsSpuInfo = $goodsSpuList[$goodsInfo['goods_spu_id']] ?? [];
$goodsSkuData[] = [
'goods_sku_id' => $goodsInfo['goods_sku_id'],
'goods_spu_id' => $goodsInfo['goods_spu_id'],
......@@ -2008,11 +2008,11 @@ class GoodsService
'rule_limit' => $goodsInfo['rule_limit'],
'online_status' => $goodsInfo['online_status'],
'inventory_rest' => $goodsInfo['inventory_rest'],
'rule_refund' => $goodsSpuInfo['rule_refund'],
'goods_sale_type' => $goodsSpuInfo['goods_sale_type'],
'goods_type' => $goodsSpuInfo['goods_type'],
'shop_id' => $goodsSpuInfo['shop_id'],
'life_account_id' => $goodsSpuInfo['life_account_id']
'rule_refund' => $goodsSpuInfo['rule_refund'] ?? 0,
'goods_sale_type' => $goodsSpuInfo['goods_sale_type'] ?? 0,
'goods_type' => $goodsSpuInfo['goods_type'] ?? 0,
'shop_id' => $goodsSpuInfo['shop_id'] ?? 0,
'life_account_id' => $goodsSpuInfo['life_account_id'] ?? 0
];
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment