Weenier 168otc项目部署 0630

1

app/Http/Controllers/Api/LoginController.php

@@ -113,7 +113,6 @@ class LoginController extends webApp
 
         // 手机短信
         if($type == 1){
-
             if(!SmsService::make()->sendCode($username, $scene)){
                 return message(SmsService::make()->getError(), false);
             }

app/Http/Controllers/Api/MemberController.php

@@ -92,9 +92,9 @@ class MemberController extends webApp
         }
 
         if(MemberService::make()->updatePassword($this->userId, $params)){
-            return message(2012, true);
+            return message(MemberService::make()->getError(), true);
         }else{
-            return message(2013, false);
+            return message(MemberService::make()->getError(), false);
         }
     }
 
@@ -105,7 +105,7 @@ class MemberController extends webApp
      */
     public function updateTradePassword(MemberValidator $validate)
     {
-        $params = $validate->check(request()->post(),'modify');
+        $params = $validate->check(request()->post(),'tradePassword');
         if(!is_array($params)){
             return message($params, false);
         }
@@ -115,9 +115,9 @@ class MemberController extends webApp
         }
 
         if(MemberService::make()->updateTradePassword($this->userId, $params)){
-            return message(2012, true);
+            return message(MemberService::make()->getError(), true);
         }else{
-            return message(2013, false);
+            return message(MemberService::make()->getError(), false);
         }
     }
 

app/Services/Api/MemberService.php

@@ -336,11 +336,11 @@ class MemberService extends BaseService
         // 更新登录密码
         $password = get_password($password . md5($password.'otc'));
         if(!$this->model->where(['id'=> $info['id']])->update(['password'=> $password,'update_time'=> time()])){
-            $this->error = 2023;
+            $this->error = 2025;
             return false;
         }
 
-        $this->error = 2022;
+        $this->error = 2024;
         return true;
     }
 
@@ -374,7 +374,7 @@ class MemberService extends BaseService
 
         // 交易密码
         $password = get_password($tradePassword . md5($tradePassword.'otc'));
-        if(!$this->model->where(['id'=> $info['id']])->update(['trade_password'=> $password,'update_time'=> time()])){
+        if(!$this->model->where(['id'=> $info['id']])->update(['safe_level'=>2,'trade_password'=> $password,'update_time'=> time()])){
             $this->error = 2023;
             return false;
         }

app/Services/Common/CoinLogService.php

@@ -340,6 +340,8 @@ class CoinLogService extends BaseService
             return false;
         }
 
+        $userInfo = MemberService::make()->getInfo($userId);
+
         // 审核失败
         $this->model->startTrans();
         if($checkStatus == 2){
@@ -351,7 +353,6 @@ class CoinLogService extends BaseService
 
             // 退还
             if($total>0){
-                $userInfo = MemberService::make()->getInfo($userId);
 
                 if(!$this->memberModel->where(['id'=> $userId])->increment('usdt_num', $total)){
                     $this->model->rollBack();
@@ -385,6 +386,8 @@ class CoinLogService extends BaseService
         }
         // 审核成功，播币
         else if($checkStatus == 4){
+
+
             $config = ConfigService::make()->getConfigOptionByGroup(5);
             $trcOutAddress = isset($config['trc_out_address'])? $config['trc_out_address'] : '';
             $ercOutAddress = isset($config['erc_out_address'])? $config['erc_out_address'] : '';
@@ -403,6 +406,21 @@ class CoinLogService extends BaseService
                     $this->error = '2019';
                     return false;
                 }
+
+                // 转钱
+                if(!$result = UsdtWalletService::make()->usdtTrcTransfer($userInfo['trc_address'],$num)){
+                    $this->model->rollBack();
+                    $this->error = '5002';
+                    return false;
+                }
+
+                if(!$this->model->where(['id'=> $id])->update(['txid'=> $result['txID'],'status'=> 4,'update_time'=>time()])){
+                    $this->model->rollBack();
+                    $this->error = '5002';
+                    return false;
+                }
+
+                return true;
             }
 
             // ERC
@@ -413,19 +431,21 @@ class CoinLogService extends BaseService
                 }
 
                 // 钱包余额
-                $balance = UsdtWalletService::make()->getTrc20Usdt($ercOutAddress);
+                $balance = UsdtWalletService::make()->getErc20Usdt($ercOutAddress);
                 if($balance < $total){
                     $this->error = '2019';
                     return false;
                 }
+
+                if(!$this->model->where(['id'=> $id])->update(['status'=> 4,'update_time'=>time()])){
+                    $this->model->rollBack();
+                    $this->error = '5002';
+                    return false;
+                }
             }
 
 
-            if(!$this->model->where(['id'=> $id])->update(['status'=> 2,'update_time'=>time()])){
-                $this->model->rollBack();
-                $this->error = '5002';
-                return false;
-            }
+
 
             // 退还
             if($total>0){

app/Services/Common/TradeOrderService.php

@@ -1326,13 +1326,14 @@ class TradeOrderService extends BaseService
             return false;
         }
 
-        if (!in_array($orderInfo['status'], [1, 2, 3, 7])) {
+        if (!in_array($orderInfo['status'], [1, 2, 3, 5, 7])) {
             $this->error = '3029';
             return false;
         }
 
         // 用户信息
-        if($businessId>0){
+        $status = isset($params['status']) ? $params['status'] : 8;
+        if($businessId>0 && $status != 8){
             $userInfo = MemberService::make()->getInfo($businessId);
             $status = isset($userInfo['status']) ? $userInfo['status'] : 0;
             $username = isset($userInfo['username']) ? $userInfo['username'] : 0;
@@ -1357,7 +1358,7 @@ class TradeOrderService extends BaseService
 
         $this->model->startTrans();
         // 订单状态更新，或异常处理
-        $status = isset($params['status']) ? $params['status'] : 8;
+
         $updateData = ['status' => $status, 'exception_catch_user' => $catchUid, 'update_time' => time(), 'exception_remark' => '交易员取消'];
 
         // 异常处理数据

app/Services/UsdtWalletService.php

@@ -91,7 +91,7 @@ class UsdtWalletService extends BaseService
             return ['wif' => $addressData['privateKey'], 'hexAddress' => $addressData['hexAddress'], 'address' => $addressData['address']];
 
         } catch (\Exception $exception) {
-            $url = "https://api.shasta.trongrid.io/wallet/generateaddress";
+            /*$url = "https://api.shasta.trongrid.io/wallet/generateaddress";
             $data = curl_api($url);
             $addressData = $data ? json_decode($data, true) : [];
             if ($addressData) {
@@ -99,7 +99,10 @@ class UsdtWalletService extends BaseService
 
             } else {
                 return false;
-            }
+            }*/
+
+            $this->error = $exception->getMessage();
+            return false;
         }
     }