审核接入兑现任务

app/Http/Controllers/UserExchangesController.php

@@ -74,11 +74,10 @@ class UserExchangesController extends Controller
             'audit_time'   => time(),
             'audit_time'   => time(),
             'update_time'  => time(),
             'update_time'  => time(),
             'audit_id'     => $request->get('audit_id'),
             'audit_id'     => $request->get('audit_id'),
-            'user_id'      => $request->get('user_id'),
             'audit_email'  => $request->get('audit_email'),
             'audit_email'  => $request->get('audit_email'),
             'status'       => $request->get('status'),
             'status'       => $request->get('status'),
         ];
         ];
-        $res = $userExchange->auditUserExchange($request->id, $request->exchange_amount, $data);
+        $res = $userExchange->auditUserExchange($request->id, $data);
         if ($res) {
         if ($res) {
             return $this->Export(0, 'ok');
             return $this->Export(0, 'ok');
         } else {
         } else {

app/Models/UserExchange.php

@@ -73,19 +73,15 @@ class UserExchange extends Model
 
 
 
 
     //审核用户的兑换
     //审核用户的兑换
-    public function auditUserExchange($id, $exchangedAmount, $data = [])
+    public function auditUserExchange($id, $data = [])
     {
     {
-        $result = DB::transaction(function () use ($id, $exchangedAmount, $data) {
+        $result = DB::transaction(function () use ($id,  $data) {
+            //根据id获取userExchange信息
+            $exchange = DB::table('user_exchanges')->where('id',$id)->first();
+            $exchange = (array)$exchange;
             //如果是通过的操作,则直接调用ExchangeTask,否则自己写数据库改变状态
             //如果是通过的操作,则直接调用ExchangeTask,否则自己写数据库改变状态
-            if ($data['status'] == 1) {
-                $exchange['amount'] = $exchangedAmount;
-                if ($exchangedAmount > 100) {
-                    Log::Error('出现大于100的兑换申请!');
-
-                    return false;
-                }
-                $data['id'] = $id;
-                $task = new ExchangesTask($data, $exchange, $data['audit_id']);
+            if ($data['status'] == 1 && $exchange['amount'] <= 200) {
+                $task = new ExchangesTask($exchange, $exchange, $data['audit_id']);
                 $result = Task::deliver($task);
                 $result = Task::deliver($task);
                 if (!$result) {
                 if (!$result) {
                     Log::error('后台审核任务失败');
                     Log::error('后台审核任务失败');
@@ -97,6 +93,7 @@ class UserExchange extends Model
                 if (!$result) {
                 if (!$result) {
                     return false;
                     return false;
                 } else {
                 } else {
+                    return true;
                 }
                 }
             }
             }
             //无论是审核通过还是拒绝都要去通知用户
             //无论是审核通过还是拒绝都要去通知用户

storage/laravels.pid

-23271
+23592
\ No newline at end of file