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

app/Models/IntegralBill.php

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

storage/laravels.pid

-19880
\ No newline at end of file
+6340
\ No newline at end of file