Merge branch 'master' of 47.76.126.2:seven/bot-28

app/Models/Rebate.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class Rebate extends BaseModel
 {
@@ -21,12 +22,17 @@ class Rebate extends BaseModel
     static function updateProfit($data)
     {
         $data['date'] = Carbon::now('America/New_York')->format('Y-m-d');
+        Log::error('错误测试');
+        Log::error(json_encode($data));
         $rebate = static::where('date', $data['date'])
             ->where('member_id', $data['member_id'])->first();
+        if(!$rebate){
+            $profit = bcadd($rebate->profit, $data['profit'], 2);
+            $rebate->profit = $profit;
+            $rebate->save();
+        }
+
 
-        $profit = bcadd($rebate->profit, $data['profit'], 2);
-        $rebate->profit = $profit;
-        $rebate->save();
         return $rebate;
     }
 

app/Services/IssueService.php

@@ -388,7 +388,6 @@ class IssueService extends BaseService
 
 
             DB::commit();
-            return ['code' => self::YES, 'msg' => '开奖成功'];
         } catch (\Exception $e) {
             DB::rollBack();
             $message = "开奖失败:\n{$info->issue_no}\n";
@@ -398,6 +397,7 @@ class IssueService extends BaseService
             Log::error($message);
             return ['code' => self::NOT, 'msg' => '开奖失败', 'error' => $e->getMessage()];
         }
+        return ['code' => self::YES, 'msg' => '开奖成功'];
     }