合并分支 'heshupeng' 到 'master'

bug修改



查看合并请求 !201

@@ -129,9 +129,7 @@ class User extends Api
             ->select();
             ->select();
         $today_money = 0;
         $today_money = 0;
         foreach ($plus_today as $v) {
         foreach ($plus_today as $v) {
-            if($v['before'] > $v['after']) {
-                $today_money -= $v['money'];
-            } else {
+            if($v['before'] < $v['after']) {
                 $today_money += $v['money'];
                 $today_money += $v['money'];
             }
             }
         }
         }