'加上通知判断以及修改bug

app/Http/Controllers/UserExchangesController.php

@@ -77,7 +77,7 @@ class UserExchangesController extends Controller
             '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, $data);
+        $res = $userExchange->auditUserExchange($request->get('id'), $data);
         if ($res) {
         if ($res) {
             return $this->Export(0, 'ok');
             return $this->Export(0, 'ok');
         } else {
         } else {

app/Models/Assist.php

@@ -146,7 +146,7 @@ class Assist extends Model
         $user = $redis->hget('ic_user', $userId);
         $user = $redis->hget('ic_user', $userId);
         if ($user) {
         if ($user) {
             //发送通知
             //发送通知
-            $task = new SendNoticeTask('IC_Code_Exchange', $user, $userId);
+            $task = new SendNoticeTask('IC_EXCHANGE_ASSIST', $user, $userId);
             Task::deliver($task);
             Task::deliver($task);
         }
         }
     }
     }

app/Models/IntegralBill.php

@@ -91,7 +91,7 @@ class IntegralBill extends Model
         $totalAmount = DB::table('integral_bills')
         $totalAmount = DB::table('integral_bills')
             ->leftJoin('integrals', 'integral_bills.integral_id', 'integrals.id')
             ->leftJoin('integrals', 'integral_bills.integral_id', 'integrals.id')
             ->where('user_id', $userId)
             ->where('user_id', $userId)
-            ->sum('integrals.amount');
+            ->sum('integral_bills.amount');
         //已经兑换的金额
         //已经兑换的金额
         $exchangedAmount = DB::table('user_exchanges')
         $exchangedAmount = DB::table('user_exchanges')
             ->leftJoin('exchange_settings', 'user_exchanges.exchange_id', 'exchange_settings.id')
             ->leftJoin('exchange_settings', 'user_exchanges.exchange_id', 'exchange_settings.id')

app/Models/UserExchange.php

@@ -93,8 +93,6 @@ class UserExchange extends Model
                     ->update($data);
                     ->update($data);
                 if (!$result) {
                 if (!$result) {
                     return false;
                     return false;
-                } else {
-                    return true;
                 }
                 }
             }
             }
             //无论是审核通过还是拒绝都要去通知用户
             //无论是审核通过还是拒绝都要去通知用户

app/Tasks/SendNoticeTask.php

@@ -35,10 +35,13 @@ class SendNoticeTask extends Task
         }
         }
 
 
         try {
         try {
-            $Url = config('website.IC_AUTH_API') . '/hprose/HttpSendMsg';
+            $Url = config('system.IC_AUTH_API') . '/hprose/HttpSendMsg';
             $res = json_decode(reportCurl($Url, $this->data, true, ['MsgToken:fg368hjk4567wtbk8']), true);
             $res = json_decode(reportCurl($Url, $this->data, true, ['MsgToken:fg368hjk4567wtbk8']), true);
+            Log::error($Url);
+            Log::error(json_encode($this->data));
             if (!isset($res['errcode']) || $res['errcode'] !== 0) {
             if (!isset($res['errcode']) || $res['errcode'] !== 0) {
                 ErrorLog(ErrorCode(001, 9), '消息系统消息发送失败');
                 ErrorLog(ErrorCode(001, 9), '消息系统消息发送失败');
+                Log::error(json_encode($res));
                 $this->PushTask = true;
                 $this->PushTask = true;
             }
             }
 
 

storage/laravels.pid

-18312
+19560
\ No newline at end of file