ryan 1 неделя назад
Родитель
Сommit
0be6db9ccb

+ 7 - 7
frontendApi/modules/v1/controllers/BonusController.php

@@ -88,12 +88,12 @@ class BonusController extends BaseController {
         $currency = Currency::getById($country['LOCAL_CURRENCY_ID']);
 
         // 绩效奖金
-        $userPerformance = UserPerformance::getAmountByUserId($userId);
-        $data['userPerformanceBonus'] = $userPerformance['AMOUNTS'] ?? 0;
+//        $userPerformance = UserPerformance::getAmountByUserId($userId);
+//        $data['userPerformanceBonus'] = $userPerformance['AMOUNTS'] ?? 0;
 
         $wallet[] = ['walletType' => 'bonus', 'walletName' => Yii::t('app', 'memberBonus'), 'amount' => Tool::formatPrice($data['BONUS'])];//会员奖金
         $wallet[] = ['walletType' => 'cash', 'walletName' => Yii::t('app', 'memberEcoin'), 'amount' => Tool::formatPrice($data['CASH']), 'coin' => $currency['CODE']];//会员余额
-        $wallet[] = ['walletType' => 'userPerformanceBonus', 'walletName' => Yii::t('app', 'userPerformanceBonus'), 'amount' => Tool::formatPrice($data['userPerformanceBonus']), 'coin' => $currency['CODE']];//绩效奖金
+//        $wallet[] = ['walletType' => 'userPerformanceBonus', 'walletName' => Yii::t('app', 'userPerformanceBonus'), 'amount' => Tool::formatPrice($data['userPerformanceBonus']), 'coin' => $currency['CODE']];//绩效奖金
 
         $dealSwitch = isset(Cache::getSystemConfig()['dealSwitch']) ? Cache::getSystemConfig()['dealSwitch']['VALUE'] : '';
 
@@ -334,7 +334,7 @@ class BonusController extends BaseController {
             'welcomeBonus' => Tool::formatPrice($data['BONUS_WB']),
             'carBonus' => Tool::formatPrice($data['BONUS_CAR']),
             'totalBonus' => Tool::formatPrice($data['BONUS_TOTAL']),
-            'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
+//            'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
             'userBuilderBonus' => Tool::formatPrice($data['BONUS_BB']),
         ];
 
@@ -370,7 +370,7 @@ class BonusController extends BaseController {
                 'welcomeBonus' => Tool::formatPrice($data['BONUS_WB']),
                 'carBonus' => Tool::formatPrice($data['BONUS_CAR']),
                 'totalBonus' => Tool::formatPrice($data['BONUS_TOTAL']),
-                'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
+//                'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
                 'userBuilderBonus' => Tool::formatPrice($data['BONUS_BB']),
             ];
         }
@@ -397,7 +397,7 @@ class BonusController extends BaseController {
                 'IFNULL(SUM(BONUS_LB), 0.00) AS BONUS_LB',
                 'IFNULL(SUM(BONUS_WB), 0.00) AS BONUS_WB',
                 'IFNULL(SUM(BONUS_CAR), 0.00) AS BONUS_CAR',
-                'IFNULL(SUM(BONUS_PB), 0.00) AS BONUS_PB',
+//                'IFNULL(SUM(BONUS_PB), 0.00) AS BONUS_PB',
                 'IFNULL(SUM(BONUS_BB), 0.00) AS BONUS_BB',
             ])
             ->asArray()
@@ -411,7 +411,7 @@ class BonusController extends BaseController {
             ['name' => 'leaderShipBonus', 'bonus' => $calcBonus['BONUS_LB'] ?? '0'],
             ['name' => 'welcomeBonus', 'bonus' => $calcBonus['BONUS_WB'] ?? '0'],
             ['name' => 'carBonus', 'bonus' => $calcBonus['BONUS_CAR'] ?? '0'],
-            ['name' => 'userPerformanceBonus', 'bonus' => $calcBonus['BONUS_PB'] ?? '0'],
+//            ['name' => 'userPerformanceBonus', 'bonus' => $calcBonus['BONUS_PB'] ?? '0'],
             ['name' => 'userBuilderBonus', 'bonus' => $calcBonus['BONUS_BB'] ?? '0'],
         ];
 

+ 5 - 5
frontendApi/modules/v1/controllers/ShopController.php

@@ -157,7 +157,7 @@ class ShopController extends BaseController {
 
         $userBalance = [
             'cash' => 0,
-            'prp' => 0,
+//            'prp' => 0,
             'localCash' => 0,
             'localRrp' => 0,
         ];
@@ -167,10 +167,10 @@ class ShopController extends BaseController {
             $userBalance['localCash'] = Tool::convertAmount($userCashResult['CASH'], $decUserCurrencyRate, $currencyRate);
         }
 
-        if ($userPerformance = UserPerformance::getAmounts($user['ID'])) {
-            $userBalance['prp'] = $userPerformance;
-            $userBalance['localCash'] = Tool::convertAmount($userPerformance, $decUserCurrencyRate, $currencyRate);
-        }
+//        if ($userPerformance = UserPerformance::getAmounts($user['ID'])) {
+//            $userBalance['prp'] = $userPerformance;
+//            $userBalance['localCash'] = Tool::convertAmount($userPerformance, $decUserCurrencyRate, $currencyRate);
+//        }
 
         // 运费模板
         $freeTemplate = FreeTemplate::getByCountryId($user['COUNTRY_ID']);