Merge branch 'master' of ssh://119.23.72.7:22611/mushishixian/ic_server_welfare

app/Http/Controllers/ExchangesTask.php

@@ -82,10 +82,10 @@ class ExchangesTask extends Task
         if(!$result)
         if(!$result)
             throw new \Exception('手机号与金额无法充值');
             throw new \Exception('手机号与金额无法充值');
 
 
-
+        return true;
         //开始充值
         //开始充值
         $time = date('Ymd');
         $time = date('Ymd');
-        $OrderId = $this->data['user_id'].$time.'2';//用户ID拼接时间
+        $OrderId = $this->data['user_id'].$time;//用户ID拼接时间
         $result = $RechargeModel->Recharge($UserInfo['mobile'] , $this->Exchange['amount'] , $OrderId);
         $result = $RechargeModel->Recharge($UserInfo['mobile'] , $this->Exchange['amount'] , $OrderId);
         if(!$result)
         if(!$result)
             throw new \Exception('充值失败#'.$this->data['id']);
             throw new \Exception('充值失败#'.$this->data['id']);