From 95ce176baeb091d10cfc7981e2f056ec512194f1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 14:03:44 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AD=BE=E4=BB=B7=E6=A0=BC=E4=B8=BA1=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/SsgController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 8acbf792e..1cd0ea95f 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -22,7 +22,7 @@ class SsgController extends BaseController { const CODE_ERROR = -97; //验证码错误 const RETURN_SUCCESS = 1; const RETURN_FALSE = 2; - const signprice = 10; //充值金额 + const signprice = 0.01; //充值金额 public function login() From 1bff70297b100415f976b84f7ad90981586fb542 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 14:13:01 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AD=BE=E4=BB=B7=E6=A0=BC=E4=B8=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobile/Controller/SsgController.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 1cd0ea95f..b15f8296d 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -22,9 +22,13 @@ class SsgController extends BaseController { const CODE_ERROR = -97; //验证码错误 const RETURN_SUCCESS = 1; const RETURN_FALSE = 2; - const signprice = 0.01; //充值金额 - + public $signprice = 10; //充值金额 + public function _initialize() + { + parent::_initialize(); + $this->signprice = C("SIGN_PRICE")?:10; + } public function login() { $promoteId = I("promote_id", 0); @@ -497,7 +501,7 @@ class SsgController extends BaseController { exit(); } - $this->assign("price", self::signprice); + $this->assign("price", $this->signprice); //$this->assign("order_id", $orderId); $this->assign("game_id",$gameId); $this->assign("game_name",$gameInfo['game_name']); @@ -516,7 +520,7 @@ class SsgController extends BaseController { } $gameId = I("game_id", 0); $paytype = I("pay_type", 'ali'); - $price = self::signprice; + $price = $this->signprice; $userId = $user['user_id']; if (!$userId || !$gameId) { //$this->error("参数有误！"); From 3415ef8336c12e22a049e167479b073489845917 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 17 Mar 2020 14:22:07 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkOrder/feedbackProcessLogStore.html | 25 +++++++++++-------- Application/Admin/View/WorkOrder/modify.html | 9 +++++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html b/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html index cc8cb0b32..e46470f92 100644 --- a/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html +++ b/Application/Admin/View/WorkOrder/feedbackProcessLogStore.html @@ -105,17 +105,22 @@
hidden >
工单进度
-
+
$log):?> -

{$index+1}. {$log['title']}

- - -

--

- - -

{$log['detail']}

- - +

{$index+1}. {$log['title']}

+ + +

+ --
+ 旧值：
+
+ 新值：
+ + + +

{$log['detail']}

+ +
diff --git a/Application/Admin/View/WorkOrder/modify.html b/Application/Admin/View/WorkOrder/modify.html index 87087d5a5..cbd3504e1 100644 --- a/Application/Admin/View/WorkOrder/modify.html +++ b/Application/Admin/View/WorkOrder/modify.html @@ -240,12 +240,17 @@
hidden >
工单进度
-
+
$log):?>

{$index+1}. {$log['title']}

-

--

+

+ --
+ 旧值：
+
+ 新值：
+

{$log['detail']}

From bd181dab515bd876c902475c6a2ee9b769024444 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 17 Mar 2020 14:37:59 +0800 Subject: [PATCH 04/16] =?UTF-8?q?ip=E9=99=90=E5=88=B6=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/AmericaIpForbit/index.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index 0d14f0141..e83c74338 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -185,6 +185,10 @@ transition: all 0.1s ease-in; } + a:hover { + color: transparent; + } +
@@ -192,9 +196,9 @@

ip限制白名单

说明：苹果内购白名单，名单中的用户支付成功可通知游戏

-
关 +
开 checked /> - 开 + 关 全游戏苹果内购支付成功通知默认限制
@@ -517,7 +521,15 @@ function setAppleInteriorBuyStatus(status) { - layer.confirm('【警告】是否确认打开全游戏苹果内购支付成功通知', { + var text = '【警告】是否确认打开全游戏苹果内购支付成功通知'; + + if(status == 0) { + + text = '【警告】是否确认关闭全游戏苹果内购支付成功通知'; + + } + + layer.confirm(text, { btn: ['确认','取消'], area: ['380px','120px'], title: false From e6c83927fa760c7c167b0786005b069c3949fc06 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 14:47:59 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AD=BE=E5=94=AE=E7=A9=BA=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobile/Controller/SsgController.class.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index b15f8296d..559f5d764 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -675,15 +675,18 @@ class SsgController extends BaseController { 'limit' => $i, )); // @todo: 并发授权码已分配的情况 $code = $list['data']['list'][$i-1]['code']; - $codeExists = M('game_supersign', 'tab_')->field('id')->where(array( - 'ticket' => $code, - ))->find(); - if (!$codeExists) { - break; + if($code){ + $codeExists = M('game_supersign', 'tab_')->field('id')->where(array( + 'ticket' => $code, + ))->find(); + if (!$codeExists) { + break; + } + }else{ + $this->assign("error","超级签已售罄~"); } $i ++; } - $game = M('game', 'tab_')->where(array( 'id' => $gameId, ))->find(); From 887e7c891e9c264f7879473ac554fabfbaf193d7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 15:03:22 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=94=AE?= =?UTF-8?q?=E7=A9=BA=E6=8F=90=E9=86=922?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/SsgController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 559f5d764..4c9a517b4 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -684,6 +684,8 @@ class SsgController extends BaseController { } }else{ $this->assign("error","超级签已售罄~"); + $this->display('blank'); + exit(); } $i ++; } From a6a177ca0ed7d5183e27a30786623ac73c8a0587 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 17 Mar 2020 15:23:05 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AD=BEcode=E8=8E=B7=E5=8F=96=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/Controller/SsgController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 4c9a517b4..bc0453e85 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -672,8 +672,14 @@ class SsgController extends BaseController { // 获取授权码 $list = $ipa365->ticketList(array( 'token' => $token, + 'status'=>0,//未使用是0 'limit' => $i, )); // @todo: 并发授权码已分配的情况 + if($list['errno'] != 0){ + $this->assign("error","超级签获取失败~{$list['errmsg']}"); + $this->display('blank'); + exit(); + } $code = $list['data']['list'][$i-1]['code']; if($code){ $codeExists = M('game_supersign', 'tab_')->field('id')->where(array( From 6ac97fa7b1b005cb1f1c791f9cbed0a7d0d1dfd2 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 17 Mar 2020 16:47:05 +0800 Subject: [PATCH 08/16] =?UTF-8?q?ip=E9=99=90=E5=88=B6=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=8E=BB=E9=99=A4=E5=86=85=E8=B4=AD?= =?UTF-8?q?=E6=80=BB=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AmericaIpForbitController.class.php | 2 +- Application/Admin/View/AmericaIpForbit/index.html | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/AmericaIpForbitController.class.php b/Application/Admin/Controller/AmericaIpForbitController.class.php index bd0e526c6..0e21ff13d 100644 --- a/Application/Admin/Controller/AmericaIpForbitController.class.php +++ b/Application/Admin/Controller/AmericaIpForbitController.class.php @@ -41,7 +41,7 @@ class AmericaIpForbitController extends ThinkController $appleInteriorBuyStatus = M('tool','tab_')->where(['name'=>'apple_interior_buy'])->getField('status'); - $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?0:1; + $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?1:0; $page = set_pagination($count, $row); diff --git a/Application/Admin/View/AmericaIpForbit/index.html b/Application/Admin/View/AmericaIpForbit/index.html index e83c74338..0b15961f2 100644 --- a/Application/Admin/View/AmericaIpForbit/index.html +++ b/Application/Admin/View/AmericaIpForbit/index.html @@ -195,13 +195,13 @@

ip限制白名单

说明：苹果内购白名单，名单中的用户支付成功可通知游戏

-
-
开 - checked /> - 关 - 全游戏苹果内购支付成功通知默认限制 -
-
+ + + + + + + From 61b5fb48b628e434d6b82c0de83fa535a8581df7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 17 Mar 2020 17:47:02 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/TimingController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 789865f64..a1aae43d4 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -287,11 +287,11 @@ class TimingController extends AdminController { $data = M('spend','tab_') ->field("sum(`pay_amount`) as pay_amount,promote_id,promote_account,tab_spend.game_id,tab_spend.game_name,tab_spend.server_id,tab_spend.server_name,CASE WHEN old_value_ratio is NULL THEN 0 ELSE sum(`pay_amount`) * old_value_ratio END as available_balance") - ->join('left join tab_resource_verify_config as config on tab_spend.game_id = config.game_id') + ->join('left join tab_resource_verify_config as config on tab_spend.game_id = config.game_id and config.status = 1') ->where(['pay_status'=>1,'pay_way'=>['egt',1],'pay_time'=>['between',[$start,$start+86399]]]) ->group('promote_id,game_id,server_id') ->select(); -// var_dump($data);die(); +// dump($data);die(); foreach ($data as $key => $value) { From 7194cd49ae8833b1e699a468458fe1670f447e30 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Mar 2020 17:49:16 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 63 +++++++++++++++++++ .../Controller/ExportController.class.php | 21 ++++--- .../Controller/FinanceController.class.php | 32 ++++++---- .../Controller/RepairController.class.php | 3 +- .../Admin/View/Deposit/lists_secord.html | 2 +- .../Admin/View/Finance/definiteDetaile.html | 6 +- 6 files changed, 103 insertions(+), 24 deletions(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index a92ad24fd..9e21324e3 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -9,6 +9,7 @@ use Base\Tool\Printer; use Base\Tool\TaskClient; use Base\Service\PromoteService; use GuzzleHttp\Client; +use think\Db; class ConsoleController extends Think { @@ -366,4 +367,66 @@ class ConsoleController extends Think { } } } + + + public function coinRecords() { + $deposit = M('deposit', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,create_time as pay_time,2 as record_type')->where(['pay_status'=>1])->select(false); + // $agent = M('agent', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,real_amount as pay_amount,create_time as pay_time,3 as record_type')->where(['pay_status'=>1])->select(false); + // $spend = M('spend', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,pay_time,1 as record_type')->where(['pay_status' => 1,'pay_way'=>0])->select(false); + $query = M('spend', 'tab_')->field('pay_order_number,user_id,user_account,pay_status,pay_way,pay_amount,pay_time,record_type')->where(['pay_status' => 1,'pay_way'=>0])->union($deposit,'pay_time')->select(false); + + $model = new \Think\Model(); + $datas = $model->table('(' . $query . ') a ')->order('pay_time asc')->select(); + foreach ($datas as $key => $data) { + if(empty($data['pay_order_number'])) { + $order = 0; + }else { + $order = $data['pay_order_number']; + } + $data['order_number'] = $order; + $data['user_id'] = $data['user_id']; + $data['value'] = $data['pay_amount']; + $data['before_value'] = 0; + $data['after_value'] = 0; + $data['create_time'] = $data['pay_time']; + if ($data['record_type'] == 1) { + $data['type'] = 'spend'; + $data['remark'] ='历史消费spend'; + $data['pay_type'] = 1; + $data['value'] = -$data['pay_amount']; + } + if ($data['record_type'] == 2) { + $data['type'] = 'deposit'; + $data['remark'] ='历史充值deposit'; + $data['pay_type'] = 2; + $data['value'] = $data['pay_amount']; + } + + + M('value_detail_log', 'tab_')->add($data); + } + echo "success"; + } + + + public function updateValue() { + //$map['type'] = ['neq', '2']; + $valueDetails = M('value_detail_log', 'tab_')->field('user_id')->where($map)->group('user_id')->select(); + foreach ($valueDetails as $key => $valueDetail) { + $user_id = $valueDetail['user_id']; + $map['user_id'] = $user_id; + $userValues = M('value_detail_log', 'tab_')->where($map)->select(); + $currentValue = 0; + foreach ($userValues as $userValue) { + $id = $userValue['id']; + $userValue['before_value'] = $currentValue; + + $userValue['after_value'] = $currentValue + $userValue['value']; + M('value_detail_log', 'tab_')->where(['id' => $id])->save($userValue); + $after_update = M('value_detail_log', 'tab_')->where(['id'=>$id])->find(); + $currentValue = $after_update['after_value']; + } + } + + } } diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 0c474461a..f72412343 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2631,10 +2631,18 @@ class ExportController extends Controller $map['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); } $total = 0; + $t = M('value_detail_log', 'tab_')->where($map)->sum('value'); // $valueDetailDatas = M('value_detail_log', 'tab_')->field('order_number, user_id, before_value, value, after_value, create_time, type, remark, pay_type') // ->where($map) // ->page($page,$row) // ->select(); + $first = M('value_detail_log', 'tab_')->field('after_value')->where($map)->limit(1)->order('create_time')->select(); + if (!empty($first[0]['after_value'])) { + $first = number_format($first[0]['after_value'],2,'.',''); + }else { + $first = '0.00'; + } + $csvFileName = '平台币明细'.'.csv'; //设置好告诉浏览器要下载excel文件的headers @@ -2665,7 +2673,7 @@ class ExportController extends Controller $vlaueDetailData['create_time'] = date('Y-m-d H:i:s', $valueDetailData['create_time']); if($valueDetailData['pay_type'] == 1) { $vlaueDetailData['type'] = "消费"; - $total -= $valueDetailData['value']; + $total += $valueDetailData['value']; } if($valueDetailData['pay_type'] == 2) { $vlaueDetailData['type'] = "充值"; @@ -2686,16 +2694,11 @@ class ExportController extends Controller ob_flush(); flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 } - if ($total >= 0) { - $fuhao = '+'; - }else { - $fuhao = '-'; - } $alldatas['order_number'] = "汇总(检索时间内所有数据的统计)"; $alldatas['create_time'] = ""; - $alldatas['type'] = $fuhao; - $alldatas['value'] = $total; - $alldatas['after_value'] = ""; + $alldatas['type'] = ""; + $alldatas['value'] = $t; + $alldatas['after_value'] = $first; mb_convert_variables('GBK', 'UTF-8', $alldatas); fputcsv($fp, $alldatas); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 7d3612a71..260744384 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1255,16 +1255,17 @@ class FinanceController extends ThinkController $map1['pay_type'] = 1; $totalSpend = M('value_detail_log', 'tab_')->where($map1)->sum('value'); $totalSpend = empty($totalSpend) ? '0.00' : $totalSpend; + $totalSpend = number_format(abs($totalSpend),2,'.',''); $map2['create_time'] = $map['create_time']; $map2['pay_type'] = 2; $deposit = M('value_detail_log', 'tab_')->where($map2)->sum('value'); - $deposit= empty($deposit) ? '0.00' : $deposit; + $deposit= empty($deposit) ? '0.00' : number_format($deposit,2,'.',''); $map3['create_time'] = $map['create_time']; $map3['pay_type'] = 3; $allpromoteCoin = M('value_detail_log', 'tab_')->where($map3)->sum('value'); - $allpromoteCoin = empty($promoteCoin) ? '0.00' : $promoteCoin; + $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)->group('user_id')->select(); @@ -1272,7 +1273,7 @@ class FinanceController extends ThinkController foreach($banlace as $k222 => $vvv) { $banlaceTotal += $vvv['after_value']; } - + $banlaceTotal = number_format($banlaceTotal,2,'.',''); $map['user_id'] = ['in', $ids]; $newValueByTimeDatas = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map)->group('user_id')->select(); // var_dump($newValueByTimeDatas);die(); @@ -1309,7 +1310,7 @@ class FinanceController extends ThinkController $this->display(); } - public function definiteDetaile() { + public function definiteDetaile($p=1) { $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 $row=10; @@ -1328,10 +1329,12 @@ class FinanceController extends ThinkController } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { $map['create_time'] = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); } - $total = 0; + $total = '0.00'; + $t = M('value_detail_log', 'tab_')->where($map)->sum('value'); $valueDetailDatas = M('value_detail_log', 'tab_')->field('order_number, user_id, before_value, value, after_value, create_time, type, remark, pay_type') ->where($map) ->page($page,$row) + ->order('create_time desc') ->select(); $counts = M('value_detail_log', 'tab_')->field('id') ->where($map) @@ -1344,7 +1347,7 @@ class FinanceController extends ThinkController $vlaueDetailDatas[$key]['pay_type'] = $valueDetailData['pay_type']; if($valueDetailData['pay_type'] == 1) { $vlaueDetailDatas[$key]['type'] = "消费"; - $total -= $valueDetailData['value']; + $total += $valueDetailData['value']; } if($valueDetailData['pay_type'] == 2) { $vlaueDetailDatas[$key]['type'] = "充值"; @@ -1355,17 +1358,24 @@ class FinanceController extends ThinkController $total += $valueDetailData['value']; } } - if($total >= 0 ) { - $fuhao = '+'; + if (!empty($vlaueDetailDatas[0]['after_value'])) { + $totalAfterValue = number_format($vlaueDetailDatas[0]['after_value'],2,'.',''); }else { - $fuhao = '-'; - } + $totalAfterValue = '0.00'; + } + $total = number_format($total,2,'.',''); + // if($total >= 0 ) { + // $fuhao = '+'; + // }else { + // $fuhao = '-'; + // } $page = set_pagination($counts,$row); if($page) {$this->assign('_page', $page);} $this->assign('fuhao', $fuhao); - $this->assign('total', $total); + $this->assign('total', $t); $this->assign('listdata', $vlaueDetailDatas); + $this->assign('totalAfterValue', $totalAfterValue); $this->display(); } diff --git a/Application/Admin/Controller/RepairController.class.php b/Application/Admin/Controller/RepairController.class.php index 9f111b602..f6eb96244 100644 --- a/Application/Admin/Controller/RepairController.class.php +++ b/Application/Admin/Controller/RepairController.class.php @@ -149,7 +149,8 @@ class RepairController extends ThinkController { 'pay_order_number' => $orderNo, 'pay_status' => 0 ])->save([ - 'pay_status' => 1 + 'pay_status' => 1, + 'payed_time' => time() ]); if ($r) { diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html index 7e534ac61..380119bc6 100644 --- a/Application/Admin/View/Deposit/lists_secord.html +++ b/Application/Admin/View/Deposit/lists_secord.html @@ -118,7 +118,7 @@ 充值方式 - 充值时间 + 支付时间 订单状态 diff --git a/Application/Admin/View/Finance/definiteDetaile.html b/Application/Admin/View/Finance/definiteDetaile.html index be06240e5..ed67ae874 100644 --- a/Application/Admin/View/Finance/definiteDetaile.html +++ b/Application/Admin/View/Finance/definiteDetaile.html @@ -101,10 +101,12 @@ 汇总(检索时间内所有数据的统计) - - {$fuhao}{$fuhao} + {$total}{$total} + + {$totalAfterValue} + From 9878ba45e5ef19034330d3bf76d3ad83045c87cd Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Mar 2020 18:05:41 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/PromoteCoinRecordService.class.php | 6 +----- Application/Base/Service/PromoteService.class.php | 12 +----------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Application/Base/Service/PromoteCoinRecordService.class.php b/Application/Base/Service/PromoteCoinRecordService.class.php index ae1776fea..c8b896354 100644 --- a/Application/Base/Service/PromoteCoinRecordService.class.php +++ b/Application/Base/Service/PromoteCoinRecordService.class.php @@ -67,12 +67,8 @@ class PromoteCoinRecordService { return $items; } - public function addRecord($params,$valueDetailData = []) { + public function addRecord($params) { $data = $this->createRecord($params); - if(!empty($valueDetailData)) { - $valueDetailData['order_number'] = $data['sn']; - addValueDetail($valueDetailData); - } return M('PromoteCoinRecord', 'tab_')->add($data); } diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index b3aeba218..b3680d471 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -515,17 +515,7 @@ class PromoteService { 'remark' => $remark, ]; - $valueDetailData = [ - 'user_id' => $userId, - 'before_value' => $before_value, - 'value' => $num, - 'after_value' => $num + $before_value, - 'create_time' => time(), - 'type' => 1, - 'remark' => $remark, - 'pay_type' => 3, - ]; - $promoteCoinRecordService->addRecord($fromRecord, $valueDetailData); + $promoteCoinRecordService->addRecord($fromRecord); $incStatus = M('user_play', 'tab_')->where(['game_id' => $gameId, 'user_id' => $userId])->setInc('bind_balance', $num); $decStatus = $this->decCoin($promoteId, $num, $isUseBind ? $gameId : 0); From 132dee220ad22fe05fd52b273218a7ab4fb0135e Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 17 Mar 2020 18:58:36 +0800 Subject: [PATCH 12/16] fix --- Application/Admin/View/Statistics/packdownload.html | 1 + Application/Admin/View/Statistics/packuserdownload.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/View/Statistics/packdownload.html b/Application/Admin/View/Statistics/packdownload.html index 547b1ede4..d8ece1783 100644 --- a/Application/Admin/View/Statistics/packdownload.html +++ b/Application/Admin/View/Statistics/packdownload.html @@ -43,6 +43,7 @@
+
diff --git a/Application/Admin/View/Statistics/packuserdownload.html b/Application/Admin/View/Statistics/packuserdownload.html index ad08729b2..ddd5ca8f5 100644 --- a/Application/Admin/View/Statistics/packuserdownload.html +++ b/Application/Admin/View/Statistics/packuserdownload.html @@ -76,7 +76,7 @@
- $item):?> From fea5f4d2d71ff3cf4272f606e31f16426942e0f7 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Mar 2020 19:06:49 +0800 Subject: [PATCH 13/16] ios --- .../Admin/View/BehaviorLog/singleSupplement.html | 2 +- Application/Admin/View/BindRechargeRecord/lists.html | 2 +- Application/Admin/View/Deposit/lists.html | 2 +- Application/Admin/View/Spend/lists.html | 2 +- .../Home/Controller/DownloadController.class.php | 11 ++++++++++- Application/Home/Controller/QueryController.class.php | 11 ++++++++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Application/Admin/View/BehaviorLog/singleSupplement.html b/Application/Admin/View/BehaviorLog/singleSupplement.html index 525c0a5ae..ab2778f69 100644 --- a/Application/Admin/View/BehaviorLog/singleSupplement.html +++ b/Application/Admin/View/BehaviorLog/singleSupplement.html @@ -108,7 +108,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! diff --git a/Application/Admin/View/BindRechargeRecord/lists.html b/Application/Admin/View/BindRechargeRecord/lists.html index fe66dfd30..f819b7b90 100644 --- a/Application/Admin/View/BindRechargeRecord/lists.html +++ b/Application/Admin/View/BindRechargeRecord/lists.html @@ -114,7 +114,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 51262e4a4..eb155b224 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -139,7 +139,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index ea1f7e6f7..438a93554 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -170,7 +170,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 4d33be971..65c0f5a02 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2358,6 +2358,7 @@ public function iosDetailExcelInfo($id,$map) { } $rs = M('promote', 'tab_')->field(['id'])->where($map1)->select(); $allids = array_column($rs, 'id'); + array_push($allids, PID); $allUserMap['promote_id'] = ['in', $allids]; $allTFMap['promote_id'] = ['in', $allids]; $allTFMap['type'] = 2; @@ -2386,12 +2387,20 @@ public function iosDetailExcelInfo($id,$map) { $data = M('promote', 'tab_')->field(['id'])->where($map1) ->limit(($i-1)*$perSize ,$perSize)->select(); $ids = array_column($data, 'id'); + if ($i == 1) { + array_unshift($ids, PID); + } foreach($ids as $key => $id) { $promote1 = M('promote', 'tab_')->field('account, level, parent_id, chain')->where(['id' => $id])->select(); $promote = $promote1[0]; $chain = $promote['chain']; //$csvData['promote_id'] = $id; - $csvData['account'] = $promote['account']; + if($id == PID) { + $csvData['account'] = $promote['account'].'[自己]'; + }else { + $csvData['account'] = $promote['account']; + } + $tfMap['promote_id'] = $id; $tfMap['type'] = 2; $companyMap['promote_id'] = $id; diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 14fe4dc0c..bbb9af98e 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -2519,10 +2519,15 @@ class QueryController extends BaseController $query = M('promote', 'tab_')->field(['id'])->where($map); list($promotes, $pagination, $count) = $this->paginate($query); $ids = array_column($promotes, 'id'); + if ($page == 1) { + array_push($ids, PID); + } + // var_dump($ids);die(); // $ids = M('promote', 'tab_')->where($map)->getField('id', true); // $ids[] = $queryPromote['id']; $allPromote = M('promote', 'tab_')->field(['id'])->where($map)->select(); $allids = array_column($allPromote, 'id'); + array_push($allids, PID); $map = []; $map['tab_package_download_log.promote_id'] = ['in', $ids]; @@ -2545,7 +2550,11 @@ class QueryController extends BaseController $promote = $promote1[0]; $chain = $promote['chain']; $listData[$key]['promote_id'] = $id; - $listData[$key]['account'] = $promote['account']; + if($id == PID) { + $listData[$key]['account'] = $promote['account'].''.'['.'自己'.']'.''; + }else { + $listData[$key]['account'] = $promote['account']; + } $tfMap['promote_id'] = $id; $tfMap['type'] = 2; $companyMap['promote_id'] = $id; From 9eac7222224fca13b019edb60fe0b916f466d721 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 17 Mar 2020 19:08:26 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E5=88=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A45=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 9ffda74a9..283a6c9b1 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1439,7 +1439,7 @@ CREATE TABLE `tab_work_order_info` ( `server_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '区服ID', `server_name` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', `role_name` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', - `score` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '评价分数', + `score` tinyint(1) unsigned NOT NULL DEFAULT '5' COMMENT '评价分数', `attachment_url` varchar(1000) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '附件ID', `feedback` varchar(1000) COLLATE utf8mb4_bin NOT NULL DEFAULT '', `status` tinyint(1) unsigned NOT NULL DEFAULT '3' COMMENT '单号状态 1完成 2失败 3等待', From 3b58c877c4fdd09a487285f440b60ba67f745518 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 17 Mar 2020 19:17:43 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/TestResourceController.class.php | 2 +- Application/Home/Controller/TestResourceController.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php index 53f6d3548..d5efaeacb 100644 --- a/Application/Admin/Controller/TestResourceController.class.php +++ b/Application/Admin/Controller/TestResourceController.class.php @@ -548,7 +548,7 @@ class TestResourceController extends ThinkController $used_resource = $used_resource ?: 0; $usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核 $usable_resource -= $resource; - if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<$availableBalance) { + if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<=$availableBalance) { $data['verify_remark'] = '自动审核'; $data['verify_resource']= $data['apply_resource']; $data['verify_time'] = time(); diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php index e882db9a8..85d228a81 100644 --- a/Application/Home/Controller/TestResourceController.class.php +++ b/Application/Home/Controller/TestResourceController.class.php @@ -500,7 +500,7 @@ class TestResourceController extends BaseController $used_resource = $used_resource ?: 0; $usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核 $usable_resource -= $resource; - if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<$availableBalance) { + if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<=$availableBalance) { $data['verify_remark'] = '自动审核'; $data['verify_resource']= $data['apply_resource']; $data['verify_time'] = time(); From eca43f471d263e570ce12f85ae0ee3e503ee2a15 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Tue, 17 Mar 2020 19:24:10 +0800 Subject: [PATCH 16/16] upt --- Application/Admin/Controller/ExportController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 5b56d145a..0f2cf9239 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8519,7 +8519,7 @@ class ExportController extends Controller } else { $xlsData = M('promote', 'tab_')->alias('p') ->field('p.id, p.level, p.account, count(if(p2.level = '.($level+1).', 1, null)) as lowerCount, count(if(pdl.type = 1, 1, null)) as signCount, count(if(pdl.type = 2, 1, null)) as tfCount, count(if(pdl.type = 3, 1, null)) as superSignCount') - ->join("tab_promote p2 on p2.chain like CONCAT(p.chain, p.id, '/%') and or p2.id = p.id", 'left') + ->join("tab_promote p2 on p2.chain like CONCAT(p.chain, p.id, '/%') or p2.id = p.id", 'left') ->join("tab_package_download_log pdl on pdl.promote_id = p2.id $pdlMap", 'left') ->where($map) ->group('p.id')