Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Console/Commands/CreateWeightStatistic.php

@@ -26,7 +26,7 @@ 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 NULL THEN 1 ELSE 0 END) AS count,
+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
 sql;
         $result = DB::selectOne(DB::raw($sql));

app/Http/Controllers/ControlPanelController.php

@@ -15,7 +15,6 @@ use App\User;
 use Carbon\Carbon;
 use Carbon\CarbonPeriod;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
@@ -190,7 +189,7 @@ 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 NULL THEN 1 ELSE 0 END) AS count,
+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
 sql;
 

app/Http/Controllers/TestController.php

@@ -130,9 +130,11 @@ class TestController extends Controller
 
     public function syncWeight()
     {
-        foreach (CarbonPeriod::create("2020-12-01","2021-01-25") as $date){
-            /** @var $date Carbon */
-            $yesterday = $date->format("Y-m-d");
+        $pack = OrderPackageCountingRecord::query()->get();
+        foreach ($pack as $p){
+            $yesterday = $p->targeted_at;
+            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 NULL THEN 1 ELSE 0 END) AS count,

resources/views/control/panel.blade.php

@@ -913,13 +913,13 @@
                 _setWeightData(title, data){
                     return {
                         title: {
-                            text: '未称重包裹占比',
+                            text: '已称重包裹占比',
                             left: 'left'
                         },
                         tooltip: {
                             trigger: 'item',
                             formatter: function (params) {
-                                return params.data.date+"<br>"+"总量：<span class='text-success font-weight-bold'>"+params.data.total+"</span><br>"+"未称：<span class='text-info font-weight-bold'>"+params.data.count+"</span>";
+                                return params.data.date+"<br>"+"总量：<span class='text-success font-weight-bold'>"+params.data.total+"</span><br>"+"已称：<span class='text-info font-weight-bold'>"+params.data.count+"</span>";
                             }
                         }, xAxis: {
                             data: title
@@ -929,6 +929,7 @@
                                 interval: 'auto',
                                 formatter: '{value} %'
                             },
+                            max:100
                         }, label:{
                             show:true,
                             position: 'top',