rabin 3 年之前
父节点
当前提交
c4af219dce
共有 1 个文件被更改,包括 8 次插入13 次删除
  1. 8 13
      app/shop/lib/Info.php

+ 8 - 13
app/shop/lib/Info.php

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