交易页面报错处理

packages/Longyi/Member/src/DataGrids/Member/MemberDataGrid.php

@@ -20,6 +20,7 @@ class MemberDataGrid extends DataGrid
                 'member_log.id',
                 'member_log.customer_id',
                 'member_log.order_id',
+                'member_log.type',
                 'member_log.amount',
                 'customers.email as customer_email',
                 'customers.first_name',
@@ -31,6 +32,7 @@ class MemberDataGrid extends DataGrid
 
         $this->addFilter('id', 'member_log.id');
         $this->addFilter('order_id', 'member_log.order_id');
+        $this->addFilter('type', 'member_log.type');
         $this->addFilter('amount', 'member_log.amount');
         $this->addFilter('expirationdate', 'member_log.expirationdate');
         $this->addFilter('created_at', 'member_log.created_at');
@@ -77,6 +79,22 @@ class MemberDataGrid extends DataGrid
             'filterable' => false,
             'sortable'   => true
         ]);
+        $this->addColumn([
+            'index'      => 'type',
+            'label'      => '类型',
+            'type'       => 'integer',
+            'filterable' => true,
+            'sortable'   => true,
+            'closure'    => function ($row) {
+                $typeMap = [
+                    1 => '下单购买',
+                    2 => '退款',
+                    3 => '取消订单',
+                ];
+
+                return $typeMap[$row->type] ?? '未知';
+            },
+        ]);
         $this->addColumn([
             'index'      => 'amount',
             'label'      => 'vip amount',

packages/Longyi/Pay/Afterpay/src/Payment/Afterpay.php

@@ -393,6 +393,9 @@ class Afterpay extends Payment
     {
         $description = $this->getConfigData('description');
         $info = $this->getOrder() ?: Cart::getCart();
+        if (! $info) {
+            return $description;
+        }
         $amount = round($info->grand_total / 4, 2);
         $symbol = core()->getCurrentCurrency()->symbol;
         return sprintf($description, $symbol.$amount);

packages/Longyi/Pay/AwxAfterpay/src/Payment/AwxAfterpay.php

@@ -326,6 +326,9 @@ class AwxAfterpay extends Payment
     {
         $description = $this->getConfigData('description');
         $info = $this->getOrder() ?: Cart::getCart();
+        if (! $info) {
+            return $description;
+        }
         $amount = round($info->grand_total / 4, 2);
         $symbol = core()->getCurrentCurrency()->symbol;
         return sprintf($description, $symbol.$amount);

packages/Longyi/Pay/AwxKlarna/src/Payment/AwxKlarna.php

@@ -336,6 +336,9 @@ class AwxKlarna extends Payment
     {
         $description = $this->getConfigData('description');
         $info = $this->getOrder() ?: Cart::getCart();
+        if (! $info) {
+            return $description;
+        }
         $amount = round($info->grand_total / 4, 2);
         $symbol = core()->getCurrentCurrency()->symbol;
         return sprintf($description, $symbol.$amount);

packages/Longyi/Pay/Klarna/src/Payment/Klarna.php

@@ -347,6 +347,9 @@ class Klarna extends Payment
     {
         $description = $this->getConfigData('description');
         $info = $this->getOrder() ?: Cart::getCart();
+        if (! $info) {
+            return $description;
+        }
         $amount = round($info->grand_total / 4, 2);
         $symbol = core()->getCurrentCurrency()->symbol;
         return sprintf($description, $symbol.$amount);