checkredis

addons/unishop/controller/Product.php

@@ -113,7 +113,7 @@ class Product extends Base
         }
 
         $result = $productModel
-            ->where(['switch' => productModel::SWITCH_ON])
+            ->where(['switch' => productModel::SWITCH_ON,'stock'=>[">=",0]])
             ->page($page, $pagesize)
             ->order($by, $desc)
             ->field('id,title,image,sales_price,sales,real_sales')

application/admin/controller/unishop/Order.php

@@ -531,15 +531,15 @@ class Order extends Backend
                     user.floor,
                     user.email,
                     unishop_order_product.title,
-                    unishop_order_product.price,
                     unishop_order_product.number as number,
+                    unishop_order_product.price,
                     FROM_UNIXTIME(o.createtime,\'%Y-%m-%d %H:%i:%S\'),
                     o.remark')
             ->group("unishop_order_product.id")
             ->order("o.createtime","desc")
             ->select();
         $list = collection($list)->toArray();
-        $title = ['订单号','工号','姓名','楼层','邮箱','商品','金额','购买数量','下单时间','备注'];
+        $title = ['订单号','工号','姓名','楼层','邮箱','商品','购买数量','总金额','下单时间','备注'];
         // Create new Spreadsheet object
         $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();