Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/FinanceController.class.php

@@ -815,7 +815,7 @@ class FinanceController extends ThinkController
         } else {
             $row = 10;
         }
-        $map['pay_status'] = 1;
+        $map['pay_game_status'] = 1;
         if (!empty(I("game_id"))) {
             $map['game_id'] = I("game_id");
         }
@@ -829,12 +829,14 @@ class FinanceController extends ThinkController
         $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
         $group = "";
         $order = "pay_time DESC";
+
         $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
         foreach($data as $key => $value) {
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
         }
 
         $totalData = D('spend')->totalGameStatistics($map, false);
+
         $sumCash = $totalData['cash_count'] ?? 0;
         $sumBalance = $totalData['balance_coin_count'] ?? 0;
         $sumInside = $totalData['inside_cash_count'] ?? 0;

Application/Admin/Controller/MendController.class.php

@@ -187,7 +187,7 @@ class MendController extends ThinkController {
     private function checkPromote($order_time,$account)
     {
         $res = M("Spend","tab_")->field("promote_id")->where(["pay_time"=>array("EGT",$order_time),"user_account"=>$account])->group("promote_id")->select();
-        if(count($res)>0) return true;
+        if(count($res)>1) return true;
         return false;
     }
     //补链详情

Application/Admin/Model/SpendModel.class.php

@@ -873,6 +873,7 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count");
         $data = $query->where(['s.pay_status' => 1, 'pay_game_status' => 1])
             ->where($map)
             ->find();
+//        dd($query->_sql());
         return $data;
     }
 

Application/Admin/View/Finance/gameStatistics.html

@@ -72,7 +72,7 @@
   <div class="cf main-place top_nav_list navtab_list">
 
     <h3 class="page_title">{$_REQUEST['count_date']}游戏统计</h3>
-    <p class="description_text"></p>
+    <p class="description_text">说明：仅统计通知成功</p>
   </div>
 
   <div class="cf top_nav_list">

Application/Base/Service/PromoteService.class.php

@@ -357,7 +357,7 @@ class PromoteService {
                 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
                 'order_time' => $orderTime,
                 'create_time' => time(),
-                'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0,
+                'pay_amount' => isset($payAmountRows[$item['id']]) ? intval($payAmountRows[$item['id']]['payAmount']) : 0,
                 'op_id' => $creator ? $creator['id'] : 0,
                 'op_account' => $opAccount,
                 'op_type' => $task['creator_type'],