Merge branch 'ysx-ic助手服务开发-20190824'

app/Models/UserExchange.php

@@ -98,7 +98,7 @@ class UserExchange extends Model
                 }
             }
             //无论是审核通过还是拒绝都要去通知用户
-            $this->sendNotice($data['user_id'], $data['status'], $data['audit_reason']);
+            $this->sendNotice($exchange['user_id'], $data['status'], $data['audit_reason']);
 
             return true;
         });

app/Tasks/IntegralBillTask.php

@@ -62,14 +62,16 @@ class IntegralBillTask extends Task
                     if (!$result) {
                         throw new \Exception("初始化用户红包详情失败,用户id是$userId");
                     }
-                }
-                //判断是否能增加红包金额,如果不能直接返回成功
-                if ($data['status'] != 1) {
-                    return false;
+                }else{
+                    //判断是否能增加红包金额,如果不能直接返回成功
+                    if ($data['status'] != 1) {
+                        return true;
+                    }
                 }
                 //将用户的累计可兑换金额写进redis里面的ic_user里面去
                 $redis = new RedisModel();
                 $user = json_decode($redis->hget('ic_user', $userId), true);
+                $data = (array)$userIntegral->getUserIntegral($userId);
                 $user['integral'] = number_format($data['integral'] + $amount, 2);
                 $result = $redis->hset('ic_user', $userId, json_encode($user));
                 //还要写进user_integrals数据库

storage/laravels.pid

-23592
\ No newline at end of file
+2930
\ No newline at end of file