正在显示
1 个修改的文件
包含
9 行增加
和
7 行删除
@@ -438,11 +438,12 @@ class Goods extends Model | @@ -438,11 +438,12 @@ class Goods extends Model | ||
438 | $activity_goods_sku_price = $activity['activity_goods_sku_price']; | 438 | $activity_goods_sku_price = $activity['activity_goods_sku_price']; |
439 | $new_sku_price = []; | 439 | $new_sku_price = []; |
440 | foreach ($sku_price as $s => $k) { | 440 | foreach ($sku_price as $s => $k) { |
441 | - $new_sku_price[$s] = $k; | ||
442 | - $new_sku_price[$s]['stock'] = 0; | ||
443 | - $new_sku_price[$s]['sales'] = 0; | 441 | +// $new_sku_price[$s] = $k; |
442 | +// $new_sku_price[$s]['stock'] = 0; | ||
443 | +// $new_sku_price[$s]['sales'] = 0; | ||
444 | foreach ($activity_goods_sku_price as $c) { | 444 | foreach ($activity_goods_sku_price as $c) { |
445 | if ($k['id'] == $c['sku_price_id']) { | 445 | if ($k['id'] == $c['sku_price_id']) { |
446 | + $new_sku_price[$s] = $k; | ||
446 | // 采用活动的 规格内容 | 447 | // 采用活动的 规格内容 |
447 | $new_sku_price[$s]['stock'] = $c['stock']; | 448 | $new_sku_price[$s]['stock'] = $c['stock']; |
448 | $new_sku_price[$s]['sales'] = $c['sales']; | 449 | $new_sku_price[$s]['sales'] = $c['sales']; |
@@ -465,12 +466,13 @@ class Goods extends Model | @@ -465,12 +466,13 @@ class Goods extends Model | ||
465 | $activity_goods_sku_price = $activity['activity_goods_sku_price']; | 466 | $activity_goods_sku_price = $activity['activity_goods_sku_price']; |
466 | $new_sku_price = []; | 467 | $new_sku_price = []; |
467 | foreach ($sku_price as $s => $k) { | 468 | foreach ($sku_price as $s => $k) { |
468 | - $new_sku_price[$s] = $k; | ||
469 | - $new_sku_price[$s]['stock'] = 0; | ||
470 | - $new_sku_price[$s]['sales'] = 0; | ||
471 | - $new_sku_price[$s]['groupon_price'] = $k['price']; | 469 | +// $new_sku_price[$s] = $k; |
470 | +// $new_sku_price[$s]['stock'] = 0; | ||
471 | +// $new_sku_price[$s]['sales'] = 0; | ||
472 | +// $new_sku_price[$s]['groupon_price'] = $k['price']; | ||
472 | foreach ($activity_goods_sku_price as $c) { | 473 | foreach ($activity_goods_sku_price as $c) { |
473 | if ($k['id'] == $c['sku_price_id']) { | 474 | if ($k['id'] == $c['sku_price_id']) { |
475 | + $new_sku_price[$s] = $k; | ||
474 | // 采用活动的 规格内容 | 476 | // 采用活动的 规格内容 |
475 | $new_sku_price[$s]['stock'] = $c['stock']; | 477 | $new_sku_price[$s]['stock'] = $c['stock']; |
476 | $new_sku_price[$s]['sales'] = $c['sales']; | 478 | $new_sku_price[$s]['sales'] = $c['sales']; |
-
请 注册 或 登录 后发表评论