修改会员plus

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

@@ -88,8 +88,8 @@ class MemberDataGrid extends DataGrid
             'closure'    => function ($row) {
                 $typeMap = [
                     1 => '下单购买',
-                    2 => '退款',
-                    3 => '取消订单',
+                    2 => '取消订单',
+                    3 => '退款',
                     4 => '后台导入',
                 ];
 

packages/Longyi/Member/src/Database/Migrations/2026_04_15_233955_add_member_fields_to_cart_table.php

@@ -25,7 +25,7 @@ return new class extends Migration
     public function down(): void
     {
         Schema::table('cart', function (Blueprint $table) {
-            $table->dropColumn(['vip_plus_amount','base_vip_plus_amount', 'vip_discount_amount', 'vip_discount_amount']);
+            $table->dropColumn(['vip_plus_amount','base_vip_plus_amount', 'vip_discount_amount', 'base_vip_discount_amount']);
         });
     }
 };

packages/Longyi/Member/src/Listeners/OrderPlacedHandler.php

@@ -37,7 +37,7 @@ class OrderPlacedHandler
         }
 
         // 防止重复激活：检查是否已为该订单激活过 VIP
-        $existingLog = MemberLog::where('order_id', $order->increment_id)
+        $existingLog = MemberLog::where('order_id', $order->id)
             ->where('type', 1)
             ->first();
 
@@ -68,7 +68,7 @@ class OrderPlacedHandler
         // 记录购买日志（含购买前的过期时间，用于退款时回退）
         MemberLog::create([
             'customer_id'          => $order->customer_id,
-            'order_id'             => $order->increment_id,
+            'order_id'             => $order->id,
             'amount'               => self::MEMBER_DISCOUNT_AMOUNT,
             'type'                 => 1,
             'previous_expire_date' => $previousExpireDate,

packages/Longyi/Member/src/Listeners/VipRevokeHandler.php

@@ -66,7 +66,7 @@ class VipRevokeHandler
         }
 
         // 防止重复撤销
-        $existingRevokeLog = MemberLog::where('order_id', $order->increment_id)
+        $existingRevokeLog = MemberLog::where('order_id', $order->id)
             ->whereIn('type', [2, 3])
             ->first();
 
@@ -75,7 +75,7 @@ class VipRevokeHandler
         }
 
         // 查找该订单的激活记录
-        $activationLog = MemberLog::where('order_id', $order->increment_id)
+        $activationLog = MemberLog::where('order_id', $order->id)
             ->where('type', 1)
             ->first();
 
@@ -97,7 +97,7 @@ class VipRevokeHandler
         // 记录撤销日志
         MemberLog::create([
             'customer_id'          => $order->customer_id,
-            'order_id'             => $order->increment_id,
+            'order_id'             => $order->id,
             'amount'               => $activationLog->amount,
             'type'                 => $revokeType,
             'previous_expire_date' => $activationLog->expirationdate,