Fix 余额充值 完成状态 在前台的错误显示

app/Console/Commands/UpdateUserSpeedLimit.php

@@ -15,7 +15,7 @@ class UpdateUserSpeedLimit extends Command
     {
         $jobStartTime = microtime(true);
 
-        foreach (Order::whereStatus(2)->whereIsExpire(0)->where('goods_id', '>', '0')->oldest()->with(['user', 'goods'])->has('goods')->has('user')->get() as $order) {
+        foreach (Order::whereStatus(2)->whereIsExpire(0)->where('goods_id', '<>', null)->oldest()->with(['user', 'goods'])->has('goods')->has('user')->get() as $order) {
             $order->user->update(['speed_limit' => $order->goods->speed_limit]);
         }
 

app/Models/Order.php

@@ -118,7 +118,7 @@ class Order extends Model
                 $status_label = '<span class="badge badge-info">'.trans('user.status.waiting_confirm').'</span>';
                 break;
             case 2:
-                if ($this->attributes['goods_id'] === 0) {
+                if ($this->attributes['goods_id'] === null) {
                     $status_label = '<span class="badge badge-default">'.trans('user.status.completed').'</span>';
                 } elseif ($this->attributes['is_expire']) {
                     $status_label = '<span class="badge badge-default">'.trans('user.status.expired').'</span>';

app/Services/OrderService.php

@@ -34,7 +34,7 @@ class OrderService
             self::$payment->complete();
 
             // 余额充值
-            if (self::$order->goods_id === 0 || self::$order->goods_id === null) {
+            if (self::$order->goods_id === null) {
                 return $this->chargeCredit();
             }
         }

resources/views/user/invoices.blade.php

@@ -37,7 +37,7 @@
                             <td>{{$order->pay_way === 1 ? trans('user.shop.pay_credit') : trans('user.shop.pay_online')}}</td>
                             <td>¥{{$order->amount}}</td>
                             <td>{{$order->created_at}}</td>
-                            <td>{{empty($order->goods) || $order->goods_id === 0 || $order->status === 3 ? '' : $order->expired_at}}</td>
+                            <td>{{empty($order->goods) || $order->goods_id === null || $order->status === 3 ? '' : $order->expired_at}}</td>
                             <td>{!! $order->status_label !!}</td>
                             <td>
                                 <div class="btn-group">