会员复消

frontendApi/modules/v1/controllers/ShopController.php

@@ -26,6 +26,7 @@ use common\models\BaReceiveAddress;
 use common\models\BaUser;
 use common\models\Countries;
 use common\models\Currency;
+use common\models\CurrencyConversions;
 use common\models\DecOrder;
 use common\models\BaDecOrder;
 use common\models\forms\ApproachOrderForm;
@@ -608,7 +609,10 @@ class ShopController extends BaseController {
      */
     public function actionReconsume() {
         // 会员信息
-        $user = User::getEnCodeInfo(\Yii::$app->user->id);
+        $user = User::findOneAsArray('ID=:ID', [':ID' => \Yii::$app->request->get('userId')]);
+        if (!$user) {
+            return static::notice(Yii::t('app', 'memberDoesNotExist'), 400);
+        }
 
         $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0)';
         $data = ShopGoods::lists($condition, [], [
@@ -632,18 +636,36 @@ class ShopController extends BaseController {
      * @throws HttpException
      */
     public function actionReconsumeCart(){
+        // 收货会员
+        $user = User::findOneAsArray('ID=:ID', [':ID' => \Yii::$app->request->get('userId')]);
+        if (!$user) {
+            return static::notice(Yii::t('app', 'memberDoesNotExist'), 400);
+        }
+        // 汇率
+        $afterCountry = Countries::getById($user['COUNTRY_ID']);
+        $afterCurrency = CurrencyConversions::getToUSDRate($afterCountry['LOCAL_CURRENCY_ID']);
+
+        // 登录会员
         $userId = \Yii::$app->user->id;
+        $userData = User::findOneAsArray('ID=:ID', [':ID' => $userId]);
+        // 汇率
+        $beforeCountry = Countries::getById($userData['COUNTRY_ID']);
+        $beforeCurrency = CurrencyConversions::getToUSDRate($beforeCountry['LOCAL_CURRENCY_ID']);
+
         $payList = ['cash'=>['name'=>'Account Balance'],];//余额支付
         $userBalance = [
             'points' => 0,
             'cash' => 0
         ];
+
         if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
+            $userBalance['points'] = Tool::convertAmount($userBonusResult['RECONSUME_POINTS'], $beforeCurrency, $afterCurrency);
+
         }
         if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['cash'] = $userCashResult['CASH'];
+            $userBalance['cash'] = Tool::convertAmount($userCashResult['CASH'], $beforeCurrency, $afterCurrency);
         }
+
         return static::notice(['payList'=>$payList,'userBalance'=>$userBalance]);
     }
 

frontendApi/modules/v1/controllers/UserController.php

@@ -613,6 +613,7 @@ class UserController extends BaseController {
                     }
                 }
             }
+            $userInfo['userId'] = $userId;
             $userInfo['isLocation'] = '('.implode(',',$isLocation).')';
             return static::notice($userInfo);
         }else{