称重统计-不统计取消订单

app/Console/Commands/CreateWeightStatistic.php

@@ -25,9 +25,10 @@ class CreateWeightStatistic extends Command
     {
         $yesterday = date("Y-m-d",strtotime("-1 day"));
         $sql = <<<sql
-SELECT DATE_FORMAT(created_at,'%Y-%m-%d') date,
-SUM(CASE WHEN weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
-COUNT(1) total FROM order_packages WHERE created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
+SELECT DATE_FORMAT(order_packages.created_at,'%Y-%m-%d') date,
+SUM(CASE WHEN order_packages.weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
+COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id WHERE orders.wms_status != '订单取消' 
+AND order_packages.created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
 sql;
         $result = DB::selectOne(DB::raw($sql));
         if (!$result)$obj = [

app/Http/Controllers/ControlPanelController.php

@@ -188,9 +188,10 @@ class ControlPanelController extends Controller
     {
         if ($date == date("Y-m-d")){
             $sql = <<<sql
-SELECT DATE_FORMAT(created_at,'%Y-%m-%d') date,
-SUM(CASE WHEN weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
-COUNT(1) total FROM order_packages WHERE created_at >= '{$date} 00:00:00' GROUP BY date
+SELECT DATE_FORMAT(order_packages.created_at,'%Y-%m-%d') date,
+SUM(CASE WHEN order_packages.weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
+COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id WHERE orders.wms_status != '订单取消' 
+AND order_packages.created_at >= '{$date} 00:00:00' GROUP BY date
 sql;
 
             $pack = DB::selectOne(DB::raw($sql));

app/Http/Controllers/TestController.php

@@ -135,8 +135,7 @@ class TestController extends Controller
     }
 
     public function zzd(){
-        $order = Order::query()->where("code","SO210202003353")->first();
-        return app(OrderService::class)->createInstantBill($order);
+
     }
 
     public function syncWeight()
@@ -147,9 +146,10 @@ class TestController extends Controller
             Cache::pull("weight.".$yesterday);
             OrderPackageCountingRecord::query()->where("targeted_at",$yesterday)->delete();
             $sql = <<<sql
-SELECT DATE_FORMAT(created_at,'%Y-%m-%d') date,
-SUM(CASE WHEN weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
-COUNT(1) total FROM order_packages WHERE created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
+SELECT DATE_FORMAT(order_packages.created_at,'%Y-%m-%d') date,
+SUM(CASE WHEN order_packages.weighed_at IS NOT NULL THEN 1 ELSE 0 END) AS count,
+COUNT(1) total FROM order_packages LEFT JOIN orders ON order_packages.order_id=orders.id WHERE orders.wms_status != '订单取消' 
+AND order_packages.created_at BETWEEN '{$yesterday} 00:00:00' AND '{$yesterday} 23:59:59' GROUP BY date
 sql;
             $result = DB::selectOne(DB::raw($sql));
             if (!$result)$obj = [