调整合并用户

app/Http/Controllers/CronController.php

@@ -171,8 +171,8 @@ class CronController extends Controller
 
 
         foreach ($amount_1 as $k1=>&$v1) {
         foreach ($amount_1 as $k1=>&$v1) {
             if (in_array($k1, $keys)) {
             if (in_array($k1, $keys)) {
-                if (isset($v1['rmb'])) $v1['rmb'] = $v1['rmb'] + $amount_2[$k1]['rmb'];
-                if (isset($v1['usd'])) $v1['usd'] = $v1['usd'] + $amount_2[$k1]['usd'];
+                if (isset($v1['rmb']) && isset($amount_2[$k1]['rmb'])) $v1['rmb'] = $v1['rmb'] + $amount_2[$k1]['rmb'];
+                if (isset($v1['usd']) && isset($amount_2[$k1]['usd'])) $v1['usd'] = $v1['usd'] + $amount_2[$k1]['usd'];
 
 
                 unset($amount_2[$k1]); // 删除amount_2中已合并金额的用户
                 unset($amount_2[$k1]); // 删除amount_2中已合并金额的用户
             }
             }