商品查询修改

common/models/ShopGoods.php

@@ -101,7 +101,7 @@ class ShopGoods extends \common\components\ActiveRecord
     const CATEGORY_TYPE = [
         [
             'id' => 1,
-            'name' => 'Common products',//普通商品
+            'name' => 'Standard Products',//普通商品
             'sell_type' => [
                 self::SALE_TYPE[1],
 //                self::SALE_TYPE[3],

frontendApi/modules/v1/controllers/ShopController.php

@@ -114,12 +114,14 @@ class ShopController extends BaseController {
 //            'exchange' => 0,
             'tourism_points' => 0,
             'garage_points' => 0,
+            'villa_points' => 0,
         ];
         if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
 //            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
 //            $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
             $userBalance['tourism_points'] = $userBonusResult['TOURISM_POINTS'];
             $userBalance['garage_points'] = $userBonusResult['GARAGE_POINTS'];
+            $userBalance['villa_points'] = $userBonusResult['VILLA_POINTS'];
         }
         if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['cash'] = $userCashResult['CASH'];
@@ -556,6 +558,7 @@ class ShopController extends BaseController {
             $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::SALE_TYPE, NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
             $data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
             $data['list'][$key]['FULL_ADDRESS'] = trim(implode(', ', [$value['ADDRESS'], $value['CITY_NAME'], $value['LGA_NAME'], Region::getCnName($value['PROVINCE'])]), ', ');
+            $data['list'][$key]['SHOW_BV'] = !in_array($value['PAY_TYPE'], [5, 6]);
 
             unset($data['list'][$key]['ADDRESS'], $data['list'][$key]['CITY_NAME'], $data['list'][$key]['LGA_NAME'], $data['list'][$key]['PROVINCE']);
         }