合并错误修正

frontendApi/modules/v1/controllers/ShopController.php

@@ -98,16 +98,14 @@ class ShopController extends BaseController {
             'points' => 0,
             'cash' => 0,
             'exchange' => 0,
-            'travel_points' => 0,
-            'car_points' => 0,
-            'house_points' => 0,
+            'tourism_points' => 0,
+            'garage_points' => 0,
         ];
         if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
             $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
-            $userBalance['travel_points'] = $userBonusResult['TRAVEL_POINTS'];
-            $userBalance['car_points'] = $userBonusResult['CAR_POINTS'];
-            $userBalance['house_points'] = $userBonusResult['HOUSE_POINTS'];
+            $userBalance['tourism_points'] = $userBonusResult['TOURISM_POINTS'];
+            $userBalance['garage_points'] = $userBonusResult['GARAGE_POINTS'];
         }
         if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['cash'] = $userCashResult['CASH'];
@@ -343,11 +341,7 @@ class ShopController extends BaseController {
             ],
             [
                 'name' => '5',
-                'label' => 'Car Bonus Products',//名车积分商品
-            ],
-            [
-                'name' => '6',
-                'label' => 'House Bonus Products',//豪宅积分商品
+                'label' => 'Car House Bonus Products',//车房积分商品
             ],
         ];
         return static::notice($data);