添加礼品卡功能

packages/Longyi/Gift/src/Listeners/Gift.php

@@ -6,7 +6,7 @@ use Webkul\Paypal\Payment\SmartButton;
 use Webkul\Sales\Repositories\OrderTransactionRepository;
 use Longyi\Gift\Models\GiftCards;
 
-class Gift
+class GiftHandler
 {
     /**
      * Create a new listener instance.

packages/Longyi/Gift/src/Listeners/OrderCancelHandler.php

@@ -59,11 +59,11 @@ class OrderCancelHandler
             'status' => 'completed',
             'notes' => "订单 #{$order->increment_id} 取消，礼品卡余额已恢复",
         ]);
-        Log::channel('giftcard')->info('订单已取消，礼品卡余额已恢复', [
-            'order_id' => $order->id,
-            'giftcard_number' => $giftCardNumber,
-            'refunded_amount' => $refundAmount,
-            'remaining_amount' => $giftCard->remaining_giftcard_amount,
-        ]);
+//        Log::channel('giftcard')->info('订单已取消，礼品卡余额已恢复', [
+//            'order_id' => $order->id,
+//            'giftcard_number' => $giftCardNumber,
+//            'refunded_amount' => $refundAmount,
+//            'remaining_amount' => $giftCard->remaining_giftcard_amount,
+//        ]);
     }
 }

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

@@ -59,11 +59,11 @@ class OrderPlacedHandler
             'status' => 'completed',
             'notes' => "订单 #{$order->increment_id} 使用礼品卡",
         ]);
-        \Log::channel('giftcard')->info('订单创建成功，礼品卡余额已扣除', [
-            'order_id' => $order->id,
-            'giftcard_number' => $giftCardNumber,
-            'used_amount' => $usedAmount,
-            'remaining_amount' => $giftCard->remaining_giftcard_amount,
-        ]);
+//        \Log::channel('giftcard')->info('订单创建成功，礼品卡余额已扣除', [
+//            'order_id' => $order->id,
+//            'giftcard_number' => $giftCardNumber,
+//            'used_amount' => $usedAmount,
+//            'remaining_amount' => $giftCard->remaining_giftcard_amount,
+//        ]);
     }
 }

packages/Longyi/Gift/src/Models/GiftCards.php

@@ -41,10 +41,8 @@ class GiftCards extends Model implements GiftCardsContract
         $cart->giftcard_number = $giftcard->giftcard_number;
         // 计算可以使用的礼品卡金额
         if ($cart->grand_total <= $giftcard->remaining_giftcard_amount) {
-            // 礼品卡余额充足，使用全部订单金额
             $cart->giftcard_amount = $cart->grand_total;
         } else {
-            // 礼品卡余额不足，使用全部余额
             $cart->giftcard_amount = $giftcard->remaining_giftcard_amount;
         }
         // 更新购物车总额

packages/Longyi/Gift/src/Providers/EventServiceProvider.php

@@ -14,7 +14,7 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Event::listen('checkout.cart.collect.totals.after', 'Longyi\Gift\Listeners\Gift@applyGiftCard');
+        Event::listen('checkout.cart.collect.totals.after', 'Longyi\Gift\Listeners\GiftHandler@applyGiftCard');
         Event::listen('checkout.cart.delete.after', 'Longyi\Gift\Listeners\CartClearHandler@afterDeleteItem');
         Event::listen('checkout.order.save.after', 'Longyi\Gift\Listeners\OrderPlacedHandler@afterPlaceOrder');
         Event::listen('bagisto.shop.checkout.onepage.summary.coupon.after', function($viewRenderEventManager) {