feat: NG-15: 新会员注册时增加国家与语言选项.

frontendApi/modules/v1/controllers/BonusController.php

@@ -49,6 +49,7 @@ use common\models\Transfer;
 use common\models\Uploads;
 use common\models\UserBonus;
 use common\models\UserInfo;
+use common\models\UserPerformance;
 use common\models\UserWallet;
 use common\models\UserRelation;
 use common\models\Withdraw;
@@ -67,15 +68,10 @@ class BonusController extends BaseController {
      */
     public function actionIndex() {
         $userId = \Yii::$app->user->id;
-        $data = UserBonus::findUseSlaves()->select('BONUS,RECONSUME_POINTS,EXCHANGE_POINTS,TOURISM_POINTS,GARAGE_POINTS,VILLA_POINTS')->where('USER_ID=:USER_ID', [':USER_ID' => $userId])->asArray()->one();
+        $data = UserBonus::findUseSlaves()->select('BONUS')->where('USER_ID=:USER_ID', [':USER_ID' => $userId])->asArray()->one();
         if (!$data) {
             $data = [
                 'BONUS' => 0,
-//                'RECONSUME_POINTS' => 0,
-                'EXCHANGE_POINTS' => 0,
-                'TOURISM_POINTS' => 0,
-                'GARAGE_POINTS' => 0,
-                'VILLA_POINTS' => 0,
             ];
         }
         $data['CASH'] = 0;
@@ -90,7 +86,8 @@ class BonusController extends BaseController {
         $currency = Currency::getById($country['LOCAL_CURRENCY_ID']);
 
         // TODO: PRP账户
-        $data['PRP'] = 0;
+        $userPerformance = UserPerformance::find()->select('SUM(AMOUNTS) AS AMOUNT_SUM')->where('USER_ID=:USER_ID AND STATUS_ID<(:STATUS_ID)', [':USER_ID' => $user['ID'], ':STATUS_ID' => UserPerformance::FINISHED])->asArray()->one();
+        $data['PRP'] = $userPerformance['AMOUNT_SUM'] ?? 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']];//会员余额

frontendApi/modules/v1/controllers/ShopController.php

@@ -152,7 +152,7 @@ class ShopController extends BaseController {
             $userBalance['cash'] = $userCashResult['CASH'];
         }
 
-        if ($userPerformance = UserPerformance::find()->select('SUM(AMOUNT) AS AMOUNT_SUM')->where('STATUS_ID<(:STATUS_ID)', [':STATUS_ID' => UserPerformance::FINISHED])->asArray()->one()) {
+        if ($userPerformance = UserPerformance::find()->select('SUM(AMOUNTS) AS AMOUNT_SUM')->where('USER_ID=:USER_ID AND STATUS_ID<(:STATUS_ID)', [':USER_ID' => $user['ID'], ':STATUS_ID' => UserPerformance::FINISHED])->asArray()->one()) {
             $userBalance['prp'] = $userPerformance['AMOUNT_SUM'];
         }