|
@@ -204,8 +204,6 @@ class Info
|
|
} else {
|
|
} else {
|
|
$method = 'getAllData';
|
|
$method = 'getAllData';
|
|
}
|
|
}
|
|
-
|
|
|
|
- //$method = 'getAllData';
|
|
|
|
|
|
|
|
$name = Dever::input('name');
|
|
$name = Dever::input('name');
|
|
if ($name) {
|
|
if ($name) {
|
|
@@ -221,28 +219,25 @@ class Info
|
|
$data = Dever::db($table)->$method($where);
|
|
$data = Dever::db($table)->$method($where);
|
|
|
|
|
|
$result = array();
|
|
$result = array();
|
|
- $zero = array();
|
|
|
|
if ($data) {
|
|
if ($data) {
|
|
foreach ($data as $k => $v) {
|
|
foreach ($data as $k => $v) {
|
|
$data[$k] = Dever::load('goods/lib/info')->getPayInfo($v, $v['sku_id']);
|
|
$data[$k] = Dever::load('goods/lib/info')->getPayInfo($v, $v['sku_id']);
|
|
if (!isset($result[$v['id']])) {
|
|
if (!isset($result[$v['id']])) {
|
|
- $result[$v['id']] = $v;
|
|
|
|
- }
|
|
|
|
|
|
+ $result[$v['id']] = $v;
|
|
|
|
+ }
|
|
if (isset($data[$k]['attr']) && $data[$k]['attr']) {
|
|
if (isset($data[$k]['attr']) && $data[$k]['attr']) {
|
|
$result[$v['id']]['price_array'][] = array
|
|
$result[$v['id']]['price_array'][] = array
|
|
- (
|
|
|
|
- 'name' => $data[$k]['sku_name'],
|
|
|
|
- 'total' => $data[$k]['total'],
|
|
|
|
- 'price' => $data[$k]['price'],
|
|
|
|
- 's_price' => $data[$k]['s_price'],
|
|
|
|
- );
|
|
|
|
|
|
+ (
|
|
|
|
+ 'name' => $data[$k]['sku_name'],
|
|
|
|
+ 'total' => $data[$k]['total'] <= 0 ? '0.00' : $data[$k]['total'],
|
|
|
|
+ 'price' => $data[$k]['price'],
|
|
|
|
+ 's_price' => $data[$k]['s_price'],
|
|
|
|
+ );
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- //$result = array_merge($result, $zero);
|
|
|
|
-
|
|
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
|
|
|