diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php index 7118e5268..efe8a7833 100644 --- a/Application/Admin/Controller/PaymentMerchantController.class.php +++ b/Application/Admin/Controller/PaymentMerchantController.class.php @@ -196,7 +196,6 @@ class PaymentMerchantController extends ThinkController $data = []; $data['name'] = $name; $data['account'] = $account; - $data['identifier'] = $identifier; $data['type'] = 1; $data['status'] = $status; $data['ways'] = $waysValue; @@ -207,8 +206,10 @@ class PaymentMerchantController extends ThinkController if ($id == 0) { $data['create_time'] = time(); $data['channel'] = $channel; + $data['identifier'] = $paymentMerchantService->getIdentifierByConfig($config, $channel); M('payment_merchant', 'tab_')->add($data); } else { + $data['identifier'] = $paymentMerchantService->getIdentifierByConfig($config, $merchant['channel']); M('payment_merchant', 'tab_')->where(['id' => $id])->save($data); } @@ -293,11 +294,24 @@ class PaymentMerchantController extends ThinkController } } + private function getEffectiveTimeRange($startedAt, $endedAt) + { + $start = 0; + $end = PaymentRuleService::FOREVER_TIME; + if ($startedAt != '') { + $start = strtotime($startedAt . ' 00:00:00'); + } + if ($endedAt != '') { + $end = strtotime($startedAt . ' 23:59:59'); + } + return [$start, $end]; + } + public function rules() { $page = I('p', 1); $row = I('row', 10); - $companyBelong = I('compnay_belong', -1); + $companyBelong = I('company_belong', -1); $companyId = I('company_id', 0); $gameTypeId = I('game_type_id', 0); $gameId = I('game_id', 0); @@ -329,12 +343,17 @@ class PaymentMerchantController extends ThinkController if ($expressId != 0) { $conditions['express_merchant_id'] = $expressId; } - if ($startedAt != '') { - $conditions['update_time'] = ['egt', strtotime($startedAt . ' 00:00:00')]; - } - if ($endedAt != '') { - $conditions['update_time'] = ['elt', strtotime($endedAt . ' 23:59:59')]; + + [$start, $end] = $this->getEffectiveTimeRange($startedAt, $endedAt); + // var_dump($start, $end);die(); + $timeCondition = ' ((start_time >= ' . $start . ' AND start_time <= ' . $end . ') OR (start_time <= ' . $start . ' AND end_time >= ' . $end + . ') OR (end_time >= ' . $start . ' AND end_time <= ' . $end . '))'; + if (isset($conditions['_string'])) { + $conditions['_string'] .= $timeCondition; + } else { + $conditions['_string'] = $timeCondition; } + $paymentRuleService = new PaymentRuleService(); $gameService = new GameService(); @@ -362,7 +381,7 @@ class PaymentMerchantController extends ThinkController foreach ($items as $item) { $records[] = [ 'id' => $item['id'], - 'company_type_name' => $companyTypes[$item['company_belong']] ?? '无', + 'company_type_name' => $companyTypes[$item['company_belong']] ?? '--', 'company_name' => isset($companies[$item['company_id']]) ? $companies[$item['company_id']]['company_name'] : '--', 'game_name' => isset($games[$item['game_id']]) ? $games[$item['game_id']]['name'] : '--', 'game_type_name' => isset($gameTypes[$item['game_type_id']]) ? $gameTypes[$item['game_type_id']]['type_name'] : '--', @@ -375,7 +394,6 @@ class PaymentMerchantController extends ThinkController 'effective_time_display' => $paymentRuleService->getEffectiveTimeDisplay($item) ]; } - // var_dump($records);die(); $page = set_pagination($count, $row); if($page) { @@ -440,9 +458,16 @@ class PaymentMerchantController extends ThinkController ]); } + $paymentRuleService = new PaymentRuleService(); foreach ($records as $record) { $startTime = $record['start_time'] == '' ? 0 : strtotime($record['start_time'] . ' 00:00:00'); - $endTime = $record['end_time'] == '' ? 0 : strtotime($record['end_time'] . ' 23:59:59'); + $endTime = $record['end_time'] == '' ? PaymentRuleService::FOREVER_TIME : strtotime($record['end_time'] . ' 23:59:59'); + + $repeatRules = $paymentRuleService->getTimeRepeatRules($record); + if (count($repeatRules)) { + $paymentRuleService->resetTimeRules($repeatRules, $startTime, $endTime); + } + $item = [ 'company_belong' => $record['company_id'] > 0 ? -1 : $record['company_belong'], 'company_id' => $record['company_id'], @@ -465,6 +490,105 @@ class PaymentMerchantController extends ThinkController ]); } + public function editRule() + { + $id = I('id', 0); + $rule = M('payment_rule', 'tab_')->where(['id' => $id])->find(); + if ($rule === null) { + $this->error('记录不存在'); + } + + $gameService = new GameService(); + $gameTypes = $gameService->getGameTypes(null, 'id,type_name'); + $games = $gameService->getBaseGames(null, 'id,name'); + $companyBelongs = PromoteCompanyService::$belongs; + $companyService = new PromoteCompanyService(); + $paymentMerchantService = new PaymentMerchantService(); + $aliMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_ALIPAY); + $weixinMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_WEIXIN); + $expressMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_EXPRESS); + $companies = $companyService->getCompanies(null, 'id,company_name'); + + $rule ['start_time'] = $rule ['start_time'] == 0 ? '' : date('Y-m-d', $rule ['start_time']); + $rule ['end_time'] = $rule ['end_time'] == PaymentRuleService::FOREVER_TIME ? '' : date('Y-m-d', $rule ['end_time']); + + $this->assign('aliMerchants', $aliMerchants); + $this->assign('weixinMerchants', $weixinMerchants); + $this->assign('expressMerchants', $expressMerchants); + $this->assign('record', $rule); + $this->assign('games', $games); + $this->assign('gameTypes', $gameTypes); + $this->assign('companyBelongs', $companyBelongs); + $this->assign('companies', $companies); + $this->display('ruleEditForm'); + } + + public function modifyRule() + { + $params = I('post.'); + $id = $params['id'] ?? 0; + if ($id == 0) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '提交数据异常' + ]); + } + + $rule = M('payment_rule', 'tab_')->where(['id' => $id])->find(); + if ($rule === null) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '记录不存在' + ]); + } + + $startTime = $params['start_time'] == '' ? 0 : strtotime($params['start_time'] . ' 00:00:00'); + $endTime = $params['end_time'] == '' ? PaymentRuleService::FOREVER_TIME : strtotime($params['end_time'] . ' 23:59:59'); + + if (date('Ymd', $rule['start_time']) <= date('Ymd') && $startTime != $rule['start_time']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '原开始生效时间在今日之前，不可修改' + ]); + } + + if (date('Ymd', $startTime) <= date('Ymd') && $startTime != $rule['start_time']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '开始生效时间在今日之前，不可修改' + ]); + } + if (date('Ymd', $rule['end_time']) <= date('Ymd') && $endTime != $rule['end_time']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '原最后生效时间在今日之前，不可修改' + ]); + } + + if (date('Ymd', $endTime) <= date('Ymd') && $endTime != $rule['end_time']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '最后生效时间在今日之前，不可修改' + ]); + } + + $item = [ + 'alipay_merchant_id' => $params['alipay_merchant_id'], + 'weixin_merchant_id' => $params['weixin_merchant_id'], + 'express_merchant_id' => $params['express_merchant_id'], + 'start_time' => $startTime, + 'end_time' => $endTime, + 'update_time' => time() + ]; + + M('payment_rule', 'tab_')->where(['id' => $id])->save($item); + + $this->ajaxReturn([ + 'status' => 1, + 'message' => '修改成功' + ]); + } + public function deleteRule() { $id = I('id', 0); @@ -519,6 +643,29 @@ class PaymentMerchantController extends ThinkController public function checkRules() { + $records = I('records', []); + if (count($records) == 0) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '未提交换绑数据' + ]); + } + $isRepat = false; + $paymentRuleService = new PaymentRuleService(); + foreach ($records as $record) { + $rules = $paymentRuleService->getTimeRepeatRules($record); + if (count($rules)) { + $isRepat = true; + break; + } + } + $this->ajaxReturn([ + 'status' => 1, + 'message' => '成功', + 'data' => [ + 'is_repeat' => $isRepat + ] + ]); } } diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html index cec4bfdd8..68e382640 100644 --- a/Application/Admin/View/PaymentMerchant/form.html +++ b/Application/Admin/View/PaymentMerchant/form.html @@ -88,12 +88,12 @@ - *商户主体： - - - - - + *商户主体： + + + + + *商户账号： @@ -101,13 +101,6 @@ - - *商户号： - - - - - *启用状态 @@ -237,6 +230,13 @@ + + + +
商户号 + + +
APPID @@ -282,6 +282,13 @@ + + + + diff --git a/Application/Base/Service/PaymentMerchantService.class.php b/Application/Base/Service/PaymentMerchantService.class.php index 43a870056..b23dfbeba 100644 --- a/Application/Base/Service/PaymentMerchantService.class.php +++ b/Application/Base/Service/PaymentMerchantService.class.php @@ -88,6 +88,29 @@ class PaymentMerchantService { return $nameList; } + public function getIdentifierByConfig($config, $channel) + { + $identifier = ''; + switch($channel) { + case 1: + $identifier = $config['app_id'] ?? ''; + break; + case 2: + $identifier = $config['partner'] ?? ''; + break; + case 3: + $identifier = $config['partner'] ?? ''; + break; + case 4: + $identifier = $config['merno'] ?? ''; + break; + case 5: + $identifier = $config['merno'] ?? ''; + break; + } + return $identifier; + } + public function setDefault($way, $merchantId) { $merchantBefore = $this->getDefault($way); @@ -107,6 +130,6 @@ class PaymentMerchantService { public function getDefault($way) { - return M('payment_merchant', 'tab_')->where(['_string' => 'is_default&' . $way . '=' . $way])->find(); + return M('payment_merchant', 'tab_')->where(['_string' => 'ways&' . $way . '=' . $way . ' and is_default&' . $way . '=' . $way])->find(); } } \ No newline at end of file diff --git a/Application/Base/Service/PaymentRuleService.class.php b/Application/Base/Service/PaymentRuleService.class.php index 4ab808e16..5b1596275 100644 --- a/Application/Base/Service/PaymentRuleService.class.php +++ b/Application/Base/Service/PaymentRuleService.class.php @@ -3,7 +3,12 @@ namespace Base\Service; use Base\Facade\Request; -class PaymentRuleService { +class PaymentRuleService +{ + /** + * @var 永久默认时间（为方便查询，设为 2100-01-01 00:00:00 ） + */ + const FOREVER_TIME = 4102444800; public function getRulesByIds(array $ids = null, $fields = '*') { @@ -22,7 +27,7 @@ class PaymentRuleService { public function getEffectiveTimeDisplay($rule) { $startTime = $rule['start_time'] == 0 ? null : date('Y-m-d', $rule['start_time']); - $endTime = $rule['end_time'] == 0 ? null : date('Y-m-d', $rule['end_time']); + $endTime = $rule['end_time'] == self::FOREVER_TIME ? null : date('Y-m-d', $rule['end_time']); if ($startTime == null && $endTime == null) { return '永久'; } @@ -36,4 +41,72 @@ class PaymentRuleService { return $startTime . ' 至 永久'; } } + + public function getTimeRepeatCondition($startTime, $endTime) + { + return ' ((start_time >= ' . $startTime . ' AND start_time <= ' . $endTime . ') OR (start_time <= ' . $startTime . ' AND end_time >= ' . $endTime + . ') OR (end_time >= ' . $startTime . ' AND end_time <= ' . $endTime . '))'; + } + + public function getTimeRepeatRules($record) + { + $conditions = [ + 'company_belong' => $record['company_belong'], + 'company_id' => $record['company_id'] ?? 0, + 'game_time_id' => $record['game_time_id'], + 'game_id' => $record['game_id'] ?? 0, + ]; + $startTime = $record['start_time'] == '' ? 0 : strtotime($record['start_time'] . ' 00:00:00'); + $endTime = $record['end_time'] == '' ? PaymentRuleService::FOREVER_TIME : strtotime($record['end_time'] . ' 23:59:59'); + $conditions['_string'] = $this->getTimeRepeatCondition($startTime, $endTime); + return M('payment_rule', 'tab_')->where($conditions)->order('start_time asc')->select(); + } + + public function resetTimeRules($repeatRules, $startTime, $endTime) + { + $length = count($repeatRules); + if ($length == 0) { + return; + } + if ($length == 1) { + $first = $repeatRules[0]; + if ($startTime <= $first['start_time'] && $endTime >= $last['end_time']) { + M('payment_rule', 'tab_')->where(['id' => $first['id']])->delete(); + } elseif ($endTime < $first['end_time'] && $startTime <= $first['start_time']) { + M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['start_time' => $endTime + 1, 'update_time' => time()]); + } elseif ($endTime >= $first['end_time'] && $startTime > $first['start_time']) { + M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['end_time' => $startTime - 1, 'update_time' => time()]); + } else { + $newRule = $first; + M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['end_time' => $startTime - 1, 'update_time' => time()]); + unset($newRule['id']); + unset($newRule['create_time']); + $newRule['start_time'] = $endTime + 1; + $newRule['update_time'] = time(); + M('payment_rule', 'tab_')->add($newRule); + } + } else { + $first = $repeatRules[0]; + $last = $repeatRules[$length - 1]; + $exceptIds = []; + if ($startTime <= $first['start_time'] && $endTime >= $last['end_time']) { + + } elseif ($startTime <= $first['start_time'] && $endTime < $last['end_time']) { + M('payment_rule', 'tab_')->where(['id' => $last['id']])->save(['start_time' => $endTime + 1, 'update_time' => time()]); + $exceptIds = [$last['id']]; + } elseif ($startTime > $first['start_time'] && $endTime >= $last['end_time']) { + M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['end_time' => $startTime - 1, 'update_time' => time()]); + $exceptIds = [$first['id']]; + } else { + M('payment_rule', 'tab_')->where(['id' => $first['id']])->save(['end_time' => $startTime - 1, 'update_time' => time()]); + M('payment_rule', 'tab_')->where(['id' => $last['id']])->save(['start_time' => $endTime + 1, 'update_time' => time()]); + $exceptIds = [$first['id'], $last['id']]; + } + foreach ($repeatRules as $rule) { + if (!in_array($rule['id'], $exceptIds)) { + M('payment_rule', 'tab_')->where(['id' => $rule['id']])->delete(); + } + } + } + } } \ No newline at end of file
商户号 + + +
上级商户号 @@ -354,10 +361,17 @@
+ + + + @@ -406,10 +420,17 @@
商户号 + + +
双乾密钥key - + 双乾秘钥
+ + + + @@ -507,6 +528,7 @@ $(function(){ window.location.href = '{:U("list")}' }, 200) } else { + $(that).removeClass('disabled').attr('autocomplete','on').prop('disabled',false); layer.msg(result.message) } }); diff --git a/Application/Admin/View/PaymentMerchant/ruleAddForm.html b/Application/Admin/View/PaymentMerchant/ruleAddForm.html index b92ec54b8..a7195da3e 100644 --- a/Application/Admin/View/PaymentMerchant/ruleAddForm.html +++ b/Application/Admin/View/PaymentMerchant/ruleAddForm.html @@ -181,7 +181,7 @@ - + @@ -270,7 +270,7 @@ $(function(){ change: function() { var companyBelong = $(this).val() getCompaniesByBelong(companyBelong, function(companies) { - var html = '' + var html = '' for (var key in companies) { html += '' + var html = '' for (var key in games) { html += '' + - '' + + console.log(data) + var uniqueKey = getUniqueKey(data) + if (isUniqueKeyExists(uniqueKey)) { + return layer.msg('已经添加相同配置，请检查') + } + data.unique_key = uniqueKey + records.push(data) + } + + for (var i in records) { + var data = records[i] + var html = '' + + '' + '' + - '' + + '' + '' + '' + '' + @@ -486,6 +536,45 @@ $(function(){ $('#record-table').find('tbody').children('tr').each(function() { records.push(JSON.parse($(this).attr('data-post'))) }) + if (records.length == 0) { + return layer.msg('请添加配置数据') + } + + var accessStatus = true + var checkStatus = true + $.ajax({ + url: '{:U("checkRules")}', + type: 'post', + dataType: 'json', + async: false, + data: {records: records}, + success: function(result) { + if (result.status == 1) { + if (result.data.is_repeat) { + checkStatus = false + } + } else { + accessStatus = false + layer.msg(result.message) + } + } + }) + if (!accessStatus) { + return layer.msg('验证异常') + } + if (!checkStatus) { + layer.confirm('该时间段已有相同条件设置，是否设置？', { + title: "是否设置", + btn: ['确定', '取消'] + }, function () { + saveRules(records) + }); + } else { + saveRules(records) + } + }); + + function saveRules(records) { $.ajax({ url: '{:U("saveRule")}', type: 'post', @@ -502,7 +591,7 @@ $(function(){ } } }) - }); + } }); \ No newline at end of file diff --git a/Application/Admin/View/PaymentMerchant/ruleEditForm.html b/Application/Admin/View/PaymentMerchant/ruleEditForm.html index 4603e9823..5ff2c13fb 100644 --- a/Application/Admin/View/PaymentMerchant/ruleEditForm.html +++ b/Application/Admin/View/PaymentMerchant/ruleEditForm.html @@ -109,7 +109,7 @@ @@ -120,7 +120,7 @@ @@ -131,7 +131,7 @@ @@ -142,7 +142,7 @@ @@ -153,7 +153,7 @@ @@ -164,7 +164,7 @@ @@ -175,7 +175,7 @@ @@ -183,18 +183,19 @@
商户号 + + +
汇付宝密钥key - + 汇付宝秘钥
生效时间（开始）：*生效时间（开始）：
' + companyBelongName + '' + getCompanyName(items[i][1]) + '
' + companyBelongName + '' + getCompanyName(data.company_id) + '' + gameTypeName + '' + getGameName(items[i][3]) + '' + getGameName(data.game_id) + '' + alipayName + '' + weixinName + '' + expressName + '
生效时间（开始）： - +
生效时间（结束）： - +
+
- @@ -249,7 +247,7 @@ $(function(){ change: function() { var companyBelong = $(this).val() getCompaniesByBelong(companyBelong, function(companies) { - var html = '' + var html = '' for (var key in companies) { html += '' + var html = '' for (var key in games) { html += '		{$data.effective_time_display}
- 编辑 + 编辑 删除