gorden 9 ヶ月 前
コミット
bc4944b3dd
1 ファイル変更2 行追加3 行削除
  1. 2 3
      app/admin/controller/finance/GoodsSalesController.php

+ 2 - 3
app/admin/controller/finance/GoodsSalesController.php

@@ -79,7 +79,7 @@ class GoodsSalesController
 
         $sql = "select 
             g.join_goods_category_id,di.data_income_classify,g.goods_id,g.goods_name,g.goods_classify, gs.goods_sku_specs_json,gs.goods_sku_id,gs.goods_sku_sales_price,MAX(di.data_income_addtimes) as addtimes,
-            SUM(JSON_EXTRACT(di.join_data_income_object_json,'$.sheet[0].order_sheet_num')) as num,SUM(di.data_income_amount) as amount
+            SUM(JSON_EXTRACT(di.join_data_income_object_json,'$.sheet[0].order_sheet_num')) as num,SUM(di.data_income_amount) as amount,COUNT(*) as count
             from app_data_income_{$month} as di 
                 left join app_goods as g on REPLACE(JSON_EXTRACT(di.join_data_income_object_json,'$.sheet[0].goods_id'),'\"','') = CAST(g.goods_id AS CHAR)
                 left join app_goods_sku as gs on JSON_EXTRACT(di.join_data_income_object_json,'$.sheet[0].goods_sku_id') = gs.goods_sku_id 
@@ -87,7 +87,6 @@ class GoodsSalesController
             group by g.goods_id,gs.goods_sku_id,di.data_income_classify 
             order by addtimes desc 
             limit " . $recordStart . ',' . $pageSize;
-            dump($sql);
         $rows = Db::select($sql);
         $rows = json_decode(json_encode($rows), true);
 
@@ -169,7 +168,7 @@ class GoodsSalesController
 
         $statisticsSql = "
             select 
-                SUM(JSON_EXTRACT(join_data_income_object_json,'$.sheet[0].order_sheet_num')) as num,SUM(data_income_amount) as amount
+                SUM(JSON_EXTRACT(join_data_income_object_json,'$.sheet[0].order_sheet_num')) as num,SUM(data_income_amount) as amount,COUNT(*) as count 
             from app_data_income_{$month} as di
                 left join app_goods as g on REPLACE(JSON_EXTRACT(di.join_data_income_object_json,'$.sheet[0].goods_id'),'\"','') = g.goods_id 
                 {$where}