卡单时，也扣款，允许为负数

application/api/controller/Money.php

@@ -201,14 +201,21 @@ class Money extends Api
         $data['bank']['is_open'] = $withdraw_info['bank'];
 
         if($withdraw_info['usdt']){
+            if(empty($user['usdt_address'])){
+                $this->error(__('出款信息未配置'), '', 402);
+            }
+
             $data['usdt']['address'] = $user['usdt_address'];
         }
 
         if($withdraw_info['bank']){
-            $data['bank']['real_name'] = $data['bank']['bank_name'] = $data['bank']['bank_card'] = '';
+            if(empty($user['bank_info'])){
+                $this->error(__('出款信息未配置'), '', 402);
+            }
+            $data['bank']['account_name'] = $data['bank']['bank_name'] = $data['bank']['bank_card'] = '';
             $bank_info = json_decode($user['bank_info'], true);
             if(!empty($bank_info)){
-                $data['bank']['real_name'] = $bank_info['real_name'];
+                $data['bank']['account_name'] = $bank_info['account_name'];
                 $data['bank']['bank_name'] = $bank_info['bank_name'];
                 $data['bank']['bank_card'] = $bank_info['bank_card'];
             }
@@ -270,9 +277,9 @@ class Money extends Api
                 $this->error(__('参数有误'));
             }
 //            $usdt_address = $this->request->post('usdt');
-//            if(empty($usdt_address)){
-//                $this->error(__('参数有误'));
-//            }
+            if(empty($user['usdt_address'])){
+                $this->error(__('参数有误'));
+            }
 
             $insert_data['order_no']      = 'U' . time() . $user['id'];
             $insert_data['usdt_address']  = $user['usdt_address'];
@@ -280,15 +287,16 @@ class Money extends Api
             if(empty($withdraw_info['bank'])){
                 $this->error(__('参数有误'));
             }
+
+            if(empty($user['bank_info'])){
+                $this->error(__('参数有误'));
+            }
             $bank_info = json_decode($user['bank_info'], true);
 
             $insert_data['bank_name']   = $bank_info['bank_name'];
             $insert_data['bank_card']   = $bank_info['bank_card'];
             $insert_data['account_name']= $bank_info['account_name'];
 
-//            if(empty($insert_data['bank_name']) || empty($insert_data['bank_card']) || empty($insert_data['account_name'])){
-//                $this->error(__('参数有误'));
-//            }
             $insert_data['order_no']    = 'B' . time() . $user['id'];
         }
 

application/api/controller/Order.php

@@ -158,14 +158,16 @@ class Order extends Api
         // 启动事务
         Db::startTrans();
         try {
-            if($freeze){
-                //卡单操作，不扣款，只冻结订单金额
-                $freeze = Users::where('id', $user['id'])->update(['freeze' => -$goods_info['price']]);
-                $order_data['status'] = OrderModel::Default;
-            }else{
-                //正常订单 账变
-                (new MoneyLog())->change($user['id'], -$goods_info['price'], MoneyLog::Pay, '', '');
-            }
+//            if($freeze){
+//                //卡单操作，不扣款，只冻结订单金额
+//                $freeze = Users::where('id', $user['id'])->update(['freeze' => -$goods_info['price']]);
+//                $order_data['status'] = OrderModel::Default;
+//            }else{
+//                //正常订单 账变
+//                (new MoneyLog())->change($user['id'], -$goods_info['price'], MoneyLog::Pay, '', '');
+//            }
+            //正常订单 账变
+            (new MoneyLog())->change($user['id'], -$goods_info['price'], MoneyLog::Pay, '', '');
             // 创建订单
             OrderModel::create($order_data);
 

application/api/lang/zh-cn.php

@@ -16,8 +16,9 @@ return [
     '操作超时'                                          => '操作超时',
     '待支付'                                           => '待支付',
     '待处理'                                           => '待处理',
-    '完成'                                              => '完成',
+    '完成'                                             => '完成',
     '失败'                                             => '失败',
     '取消'                                             => '取消',
     '任务不足'                                          => '今日任务还未完成，不能提现',
+    '出款信息未配置'                                     => '出款信息未配置',
 ];

application/extra/site.php

@@ -37,7 +37,7 @@ return array (
   'recharge_usdt_address' => 'ox5454534cccccccccc',
   'recharge_bank_switch' => '1',
   'recharge_bank_name' => '花旗银行',
-  'withdraw_usdt_switch' => '0',
+  'withdraw_usdt_switch' => '1',
   'withdraw_bank_switch' => '1',
   'withdrawal_time' => '15:04:41',
   'withdrawal_fee' => '0.2',