From 67aacbda60b4c54ea42dfaac7a8bb2df48e020b2 Mon Sep 17 00:00:00 2001 From: heshupeng <hsp@bronet.cn> Date: Sat, 30 Jan 2021 19:17:02 +0800 Subject: [PATCH] 恢复 --- addons/shopro/model/Goods.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/shopro/model/Goods.php b/addons/shopro/model/Goods.php index e5a7624..1fba305 100644 --- a/addons/shopro/model/Goods.php +++ b/addons/shopro/model/Goods.php @@ -438,12 +438,11 @@ class Goods extends Model $activity_goods_sku_price = $activity['activity_goods_sku_price']; $new_sku_price = []; foreach ($sku_price as $s => $k) { -// $new_sku_price[$s] = $k; -// $new_sku_price[$s]['stock'] = 0; -// $new_sku_price[$s]['sales'] = 0; + $new_sku_price[$s] = $k; + $new_sku_price[$s]['stock'] = 0; + $new_sku_price[$s]['sales'] = 0; foreach ($activity_goods_sku_price as $c) { if ($k['id'] == $c['sku_price_id']) { - $new_sku_price[$s] = $k; // 采用活动的 规格内容 $new_sku_price[$s]['stock'] = $c['stock']; $new_sku_price[$s]['sales'] = $c['sales']; @@ -466,13 +465,12 @@ class Goods extends Model $activity_goods_sku_price = $activity['activity_goods_sku_price']; $new_sku_price = []; foreach ($sku_price as $s => $k) { -// $new_sku_price[$s] = $k; -// $new_sku_price[$s]['stock'] = 0; -// $new_sku_price[$s]['sales'] = 0; -// $new_sku_price[$s]['groupon_price'] = $k['price']; + $new_sku_price[$s] = $k; + $new_sku_price[$s]['stock'] = 0; + $new_sku_price[$s]['sales'] = 0; + $new_sku_price[$s]['groupon_price'] = $k['price']; foreach ($activity_goods_sku_price as $c) { if ($k['id'] == $c['sku_price_id']) { - $new_sku_price[$s] = $k; // 采用活动的 规格内容 $new_sku_price[$s]['stock'] = $c['stock']; $new_sku_price[$s]['sales'] = $c['sales']; -- libgit2 0.24.0