Merge branch 'feature/PlatFormCoinData' of wmtx/platform into release

平台币统计bug修复

Application/Admin/Controller/ExportController.class.php

@@ -2513,7 +2513,12 @@ class ExportController extends Controller
                         $allpromoteCoin = empty($promoteCoin) ? '0.00' : $promoteCoin;
         
                         $map4['create_time'] = $map['create_time'];
-                        $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->limit(1)->select();
+                        if($_REQUEST['user_account']) {
+                            $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->limit(1)->select();
+                        }else {
+                            $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->select();
+                        }
+
                         $banlaceTotal = 0;
                         foreach($banlace as $k222 => $vvv) {
                             $banlaceTotal += $vvv['after_value'];

Application/Admin/Controller/FinanceController.class.php

@@ -1273,7 +1273,11 @@ class FinanceController extends ThinkController
         $allpromoteCoin = empty($promoteCoin) ? '0.00' : number_format($allpromoteCoin,2,'.','');
 
         $map4['create_time'] = $map['create_time'];
-        $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->limit(1)->select();
+        if($_REQUEST['user_account']) {
+            $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->limit(1)->select();
+        }else {
+            $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->select();
+        }
         $banlaceTotal = '0.00';
         foreach($banlace as $k222 => $vvv) {
             $banlaceTotal += $vvv['after_value'];
@@ -1375,7 +1379,7 @@ class FinanceController extends ThinkController
         if($t >= 0 ) {
             $fuhao = '+';
         }else {
-            $fuhao = '-';
+            $fuhao = '';
         }
         $page = set_pagination($counts,$row);
         if($page) {$this->assign('_page', $page);}