feat: UN-71: 会员-奖金列表调整

common/models/ShopGoods.php

@@ -46,24 +46,6 @@ class ShopGoods extends \common\components\ActiveRecord
 //            'name' => '兑换点数',
 //            'label' => 'exchange',
 //        ],
-        4 => [
-            'id' => 4,
-            'name' => 'Travel Bonus',
-            'label' => 'tourism_points',
-            'language' => 'shopListPayTravelBonus',
-        ],
-        5 => [
-            'id' => 5,
-            'name' => 'Car Fund',
-            'label' => 'garage_points',
-            'language' => 'shopListPayCarFund',
-        ],
-        6 => [
-            'id' => 6,
-            'name' => 'Villa Fund',
-            'label' => 'villa_points',
-            'language' => 'shopListPayVillaFund',
-        ],
         7 => [
             'id' => 7,
             'name' => 'PayStack',
@@ -118,27 +100,6 @@ class ShopGoods extends \common\components\ActiveRecord
                 self::SALE_TYPE[7],
             ]
         ],
-//        [
-//            'id' => 4,
-//            'name' => 'Travel bonus products',//旅游积分商品
-//            'sell_type' => [
-//                self::SALE_TYPE[4]
-//            ]
-//        ],
-//        [
-//            'id' => 5,
-//            'name' => 'Car Fund Products',
-//            'sell_type' => [
-//                self::SALE_TYPE[5]
-//            ]
-//        ],
-//        [
-//            'id' => 6,
-//            'name' => 'Villa Fund Products',
-//            'sell_type' => [
-//                self::SALE_TYPE[6]
-//            ]
-//        ],
     ];
     /**
      * @inheritdoc
@@ -204,7 +165,6 @@ class ShopGoods extends \common\components\ActiveRecord
      */
     public static function chkAuditStatus($nowStatus, $toStatus) {
         $statusName = self::STATUS_NAME;
-        // $msg = 'The current product status is【' . $statusName[$nowStatus] . '】，cannot be set to【' . $statusName[$toStatus] . '】';// 当前商品状态为    无法设置为
         $msg = \Yii::t('ctx', 'shopSetProductStatusErrorNotice', [
             'nowStatus' => $statusName[$nowStatus],
             'newStatus' => $statusName[$toStatus]

frontendApi/modules/v1/controllers/UserController.php

@@ -482,13 +482,16 @@ class UserController extends BaseController {
         // 支付方式
         $payList = ShopGoods::payTypes();
         unset($payList['prp']);
+        // 售卖方式
+        $sellType = ShopGoods::getCategoryType();
+        unset($sellType[0]['sell_type'][8]);
 
         return static::notice([
             'allDecPackage' => $allDecPackage,
             'allGoods' => $allGoods,
             'decUserName'=>$decUserName,
             'payList' => $payList,
-            'sellType' => ShopGoods::getCategoryType(),
+            'sellType' => $sellType,
             'categoryType' => ShopGoods::getCategoryType()[0]['id'],
             'userBalance' => $userBalance,
             'decUserCurrencyRate' => $decUserCurrencyRate,
@@ -708,6 +711,9 @@ SQL;
         // 支付方式
         $payList = ShopGoods::payTypes();
         unset($payList['prp']);
+        // 售卖方式
+        $sellType = ShopGoods::getCategoryType();
+        unset($sellType[0]['sell_type'][8]);
 
         return static::notice([
             'allDecPackage' => $allDecPackage,
@@ -715,7 +721,7 @@ SQL;
             'allOpenBank' => $allOpenBank,
             'userName' => $userName,
             'payList' => $payList,
-            'sellType' => ShopGoods::getCategoryType(),
+            'sellType' => $sellType,
             'categoryType' => ShopGoods::getCategoryType()[0]['id'],
             'userBalance' => $userBalance,
             'isDec' => $isDec,