| 游戏排序： |
diff --git a/Application/Base/Service/GameService.class.php b/Application/Base/Service/GameService.class.php
index 8b67cc552..07245fa64 100644
--- a/Application/Base/Service/GameService.class.php
+++ b/Application/Base/Service/GameService.class.php
@@ -46,4 +46,17 @@ class GameService {
return M('base_game', 'tab_')->where(['id' => $baseGame['id']])->save($data);
}
}
+
+ public function isUniqueCodeExists($uniqueCode, $exceptId = 0, $exceptType = 'id')
+ {
+ $map = ['unique_code' => $uniqueCode];
+ if ($exceptId > 0) {
+ $map[$exceptType] = ['neq', $exceptId];
+ }
+ $count = M('game', 'tab_')->where($map)->count();
+ if ($count > 0) {
+ return true;
+ }
+ return false;
+ }
}
\ No newline at end of file
diff --git a/Application/Base/Tool/AggregateClient.class.php b/Application/Base/Tool/AggregateClient.class.php
new file mode 100644
index 000000000..7452428b4
--- /dev/null
+++ b/Application/Base/Tool/AggregateClient.class.php
@@ -0,0 +1,52 @@
+ '/index.php?g=api&m=Game&a=rechargeData',
+ ];
+
+ public function __construct()
+ {
+ $this->client = new Client([
+ 'base_uri' => C('AGGREGATE_URL'),
+ 'timeout' => 10.0,
+ ]);
+ }
+
+ public function api($api, array $params = [])
+ {
+ $uri = $this->apis[$api] ?? null;
+ if (is_null($uri)) {
+ throw new \Exception('接口不存在');
+ }
+ $params['api-name'] = $api;
+ $sign = Sign::generate($params);
+ $params[Sign::SIGN_NAME] = $sign;
+
+ try {
+ return $this->post($uri, $params);
+ } catch (\Exception $e) {
+ return ['code' => '1000', 'message' => '接口请求错误：' . $e->getMessage() , 'data' => []];
+ }
+ }
+
+ protected function post($uri, array $params = [])
+ {
+ $response = $this->client->post($uri, [
+ 'verify' => false,
+ 'form_params' => $params,
+ ]);
+ $result = (string)$response->getBody();
+ return json_decode($result, true);
+ }
+}
\ No newline at end of file
diff --git a/Application/Base/Tool/Sign.class.php b/Application/Base/Tool/Sign.class.php
new file mode 100644
index 000000000..716ef1fac
--- /dev/null
+++ b/Application/Base/Tool/Sign.class.php
@@ -0,0 +1,21 @@
+
Date: Tue, 21 Jul 2020 13:53:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Admin/Controller/FinanceController.class.php | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 601adea18..b864b10ca 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -753,12 +753,19 @@ class FinanceController extends ThinkController
}
$endTime = time();
+ $exceptIds = [];
foreach ($data as $key => $value) {
$aggAmount = '0.00';
$deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios';
if ($value['unique_code'] && isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) {
$aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', '');
}
+ if ($aggAmount != '0.00') {
+ $value['cash_count'] = 0;
+ $value['balance_coin_count'] = 0;
+ $value['inside_cash_count'] = 0;
+ $exceptIds[] = $value['game_id'];
+ }
$data[$key]['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.','');
$data[$key]['agg_amount'] = $value['unique_code'] ? $aggAmount : '0.00';
}
@@ -774,6 +781,13 @@ class FinanceController extends ThinkController
$this->checkListOrCountAuthRestMap($map,[]);
//统计合计
+ if (count($exceptIds) > 0) {
+ if (isset($map['_string'])) {
+ $map['_string'] .= " s.game_id not in (" . implode(',', $exceptIds) . ")";
+ } else {
+ $map['_string'] = " s.game_id not in (" . implode(',', $exceptIds) . ")";
+ }
+ }
$totalData = D("spend")->totalGameStatistics($map);
$sumCash = $totalData['cash_count'];
From fbe8d7a3512a6b0fb0331e5b8c5d7209f18a53d2 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 27 Jul 2020 10:12:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/FinanceController.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index b864b10ca..a3ff36ba7 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -783,7 +783,7 @@ class FinanceController extends ThinkController
//统计合计
if (count($exceptIds) > 0) {
if (isset($map['_string'])) {
- $map['_string'] .= " s.game_id not in (" . implode(',', $exceptIds) . ")";
+ $map['_string'] .= " and s.game_id not in (" . implode(',', $exceptIds) . ")";
} else {
$map['_string'] = " s.game_id not in (" . implode(',', $exceptIds) . ")";
}
|