wesmiler пре 1 година
родитељ
комит
9dd96d60c8

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
addons/admin/dist/static/js/5.js


+ 14 - 2
app/Services/Common/BalanceLogService.php

@@ -248,6 +248,7 @@ class BalanceLogService extends BaseService
         $id = isset($params['id'])? $params['id'] : 0;
         $checkStatus = isset($params['status'])? $params['status'] : 0;
         $remark = isset($params['audit_remark'])? trim($params['audit_remark']) : '';
+        $payMoney = isset($params['actual_money'])? floatval($params['actual_money']) : 0;
         $payImg = isset($params['pay_img'])? trim($params['pay_img']) : '';
         if(!in_array($checkStatus,[2,3])){
             $this->error = 1073;
@@ -269,6 +270,17 @@ class BalanceLogService extends BaseService
             return false;
         }
 
+        if($actualMoney<=0 && $payMoney<=0){
+            $this->error = 4010;
+            return false;
+        }
+
+        $payMoney = $payMoney? $payMoney : $actualMoney;
+        if($payMoney > $money){
+            $this->error = 4011;
+            return false;
+        }
+
         if($status != 1){
             $this->error = 4002;
             return false;
@@ -329,7 +341,7 @@ class BalanceLogService extends BaseService
 
             // U盾出账
             $payRemark = $coinType == 1? 'USDT余额提现':'佣金收益提现';
-            $result     = CregisPayService::make()->withdraw($walletUrl, $actualMoney, $orderNo,'1000','',$payRemark);
+            $result     = CregisPayService::make()->withdraw($walletUrl, $payMoney, $orderNo,'1000','',$payRemark);
             // 平台钱包出账
             $data = isset($result['data'])? $result['data'] : [];
             $tradeCid = isset($data['cid']) ? $data['cid'] : '';
@@ -340,7 +352,7 @@ class BalanceLogService extends BaseService
                 return false;
             }
 
-            $updateData = ['status'=>2,'audit_remark'=>$remark,'trade_cid' => $tradeCid, 'update_time' => time()];
+            $updateData = ['status'=>2,'actual_money'=>$payMoney,'audit_remark'=>$remark,'trade_cid' => $tradeCid, 'update_time' => time()];
             if(!$this->model->where(['id'=> $id])->update($updateData)){
                 DB::rollBack();
                 $this->error = 4006;

+ 2 - 0
resources/lang/zh-cn/api.php

@@ -89,6 +89,8 @@ return [
     '4007'=> '链上审核打款失败',
     '4008'=> '数据类型错误',
     '4009'=> '提现用户钱包地址已被修改',
+    '4010'=> '到账金额错误,请核对后操作',
+    '4011'=> '到账金额超出提现金额,请核对后操作',
 
     '4101'=> '自动质押用户参数错误[:uid-:usdt-:status]',
     '4102'=> '该用户自动质押所需USDT不足:money,账户USDT余额:usdt',