llp 4 дней назад
Родитель
Сommit
0fb8bbe5ca

+ 3 - 3
packages/Longyi/Gift/src/Models/GiftCards.php

@@ -99,9 +99,9 @@ class GiftCards extends Model implements GiftCardsContract
         $cart->giftcard_amount = null;
         $cart->base_giftcard_amount = null;
 
-        // 恢复购物车总额
-        $cart->grand_total += $giftcardAmount;
-        $cart->base_grand_total += $giftcardAmount;
+//        // 恢复购物车总额
+//        $cart->grand_total += $giftcardAmount;
+//        $cart->base_grand_total += $giftcardAmount;
 
         $cart->save();
 

+ 7 - 10
packages/Longyi/Gift/src/Routes/shop-routes.php

@@ -4,14 +4,11 @@ use Illuminate\Support\Facades\Route;
 use Longyi\Gift\Http\Controllers\Shop\GiftController;
 use Longyi\RewardPoints\Http\Middleware\ApiCustomerAuthenticate;
 
-Route::group(['prefix' => 'api'], function () {
-    Route::group(['middleware' => ['api', ApiCustomerAuthenticate::class], 'prefix' => 'gift'], function () {
-        Route::get('/lists', [GiftController::class, 'lists'])->name('shop.gift.lists');
-        Route::post('/add', [GiftController::class, 'add'])->name('shop.gift.add');
-        Route::get('/my-gift-cards', [GiftController::class, 'getCustomerGiftCards'])->name('shop.api.checkout.cart.giftcard.list');
-        Route::post('/activate', [GiftController::class, 'activateGiftCard'])->name('shop.api.checkout.cart.giftcard.activate');
-        Route::delete('/remove', [GiftController::class, 'destroyGiftCard'])->name('shop.api.checkout.cart.giftcard.remove');
-        Route::post('/auto-apply-expiring', [GiftController::class, 'autoApplyExpiringGiftCard'])->name('shop.api.checkout.cart.giftcard.auto-apply');
-    });
+Route::group(['prefix' => 'api', 'middleware' => ['api','web']], function () {
+    Route::get('/lists', [GiftController::class, 'lists'])->name('shop.api.gift.lists');
+    Route::post('/add', [GiftController::class, 'add'])->name('shop.api.gift.add');
+    Route::get('/my-gift-cards', [GiftController::class, 'getCustomerGiftCards'])->name('shop.api.checkout.cart.giftcard.list');
+    Route::post('/activate', [GiftController::class, 'activateGiftCard'])->name('shop.api.checkout.cart.giftcard.activate');
+    Route::delete('/remove', [GiftController::class, 'destroyGiftCard'])->name('shop.api.checkout.cart.giftcard.remove');
+    Route::post('/auto-apply-expiring', [GiftController::class, 'autoApplyExpiringGiftCard'])->name('shop.api.checkout.cart.giftcard.auto-apply');
 });
-

+ 1 - 1
packages/Longyi/Member/src/Routes/shop-routes.php

@@ -8,7 +8,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency'], 'prefix' =
     Route::get('', [MemberController::class, 'index'])->name('shop.member.index');
 });
 
-Route::group(['middleware' => ['web', 'theme', 'locale', 'currency'], 'prefix' => 'api/checkout/cart/member'], function () {
+Route::group(['middleware' => ['api','web'], 'prefix' => 'api/checkout/cart/member'], function () {
     Route::post('apply', [MemberDiscountController::class, 'apply'])->name('shop.api.checkout.cart.member.apply');
     Route::post('remove', [MemberDiscountController::class, 'remove'])->name('shop.api.checkout.cart.member.remove');
 });