|
|
@@ -225,11 +225,17 @@ class Info
|
|
|
if ($data) {
|
|
|
foreach ($data as $k => $v) {
|
|
|
$data[$k] = Dever::load('goods/lib/info')->getPayInfo($v, $v['sku_id']);
|
|
|
+ if ($data[$k]['total'] <= 0) {
|
|
|
+ if (!isset($zero[$v['id']])) {
|
|
|
+ $zero[$v['id']] = $v;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (!isset($result[$v['id']])) {
|
|
|
+ $result[$v['id']] = $v;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (isset($data[$k]['attr']) && $data[$k]['attr']) {
|
|
|
if ($data[$k]['total'] <= 0) {
|
|
|
- if (!isset($zero[$v['id']])) {
|
|
|
- $zero[$v['id']] = $v;
|
|
|
- }
|
|
|
$zero[$v['id']]['price_array'][] = array
|
|
|
(
|
|
|
'name' => $data[$k]['sku_name'],
|
|
|
@@ -238,9 +244,6 @@ class Info
|
|
|
's_price' => $data[$k]['s_price'],
|
|
|
);
|
|
|
} else {
|
|
|
- if (!isset($result[$v['id']])) {
|
|
|
- $result[$v['id']] = $v;
|
|
|
- }
|
|
|
$result[$v['id']]['price_array'][] = array
|
|
|
(
|
|
|
'name' => $data[$k]['sku_name'],
|
rabin