elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '优化' (#376) from hotfix/remove_promote_package into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/376
master
廖金灵 4 years ago
parent cf9ee749ca d6efc36e9a
commit 91e70828af
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File

16
Application/Admin/Controller/PaymentMerchantController.class.php
Unescape Escape View File

@ -480,6 +480,14 @@ class PaymentMerchantController extends ThinkController
$weixinMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_WEIXIN); $weixinMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_WEIXIN);
$expressMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_EXPRESS); $expressMerchants = $paymentMerchantService->getMerchantsByWay(PaymentMerchantService::WAY_EXPRESS);
$companies = $companyService->getCompanies(null, 'id,company_name'); $companies = $companyService->getCompanies(null, 'id,company_name');
$defaultExpress = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_EXPRESS);
$defaultAlipay = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_ALIPAY);
$defaultWeixin = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_WEIXIN);
$this->assign('defaultExpress', $defaultExpress ? $defaultExpress['name'] . '(' . $defaultExpress['account'] . ')' : '无');
$this->assign('defaultAlipay', $defaultAlipay ? $defaultAlipay['name'] . '(' . $defaultAlipay['account'] . ')' : '无');
$this->assign('defaultWeixin', $defaultWeixin ? $defaultWeixin['name'] . '(' . $defaultWeixin['account'] . ')' : '无');
$this->assign('aliMerchants', $aliMerchants); $this->assign('aliMerchants', $aliMerchants);
$this->assign('weixinMerchants', $weixinMerchants); $this->assign('weixinMerchants', $weixinMerchants);
$this->assign('expressMerchants', $expressMerchants); $this->assign('expressMerchants', $expressMerchants);
@ -579,6 +587,14 @@ class PaymentMerchantController extends ThinkController
$rule ['start_time'] = $rule ['start_time'] == 0 ? '' : date('Y-m-d', $rule ['start_time']); $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']); $rule ['end_time'] = $rule ['end_time'] == PaymentRuleService::FOREVER_TIME ? '' : date('Y-m-d', $rule ['end_time']);
$defaultExpress = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_EXPRESS);
$defaultAlipay = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_ALIPAY);
$defaultWeixin = $paymentMerchantService->getDefault(PaymentMerchantService::WAY_WEIXIN);
$this->assign('defaultExpress', $defaultExpress ? $defaultExpress['name'] . '(' . $defaultExpress['account'] . ')' : '无');
$this->assign('defaultAlipay', $defaultAlipay ? $defaultAlipay['name'] . '(' . $defaultAlipay['account'] . ')' : '无');
$this->assign('defaultWeixin', $defaultWeixin ? $defaultWeixin['name'] . '(' . $defaultWeixin['account'] . ')' : '无');
$this->assign('aliMerchants', $aliMerchants); $this->assign('aliMerchants', $aliMerchants);
$this->assign('weixinMerchants', $weixinMerchants); $this->assign('weixinMerchants', $weixinMerchants);
$this->assign('expressMerchants', $expressMerchants); $this->assign('expressMerchants', $expressMerchants);

6
Application/Admin/View/PaymentMerchant/ruleAddForm.html
Unescape Escape View File

@ -151,7 +151,7 @@
<td class="l"><i class="mustmark">*</i>支付宝支付配置：</td> <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
<td class="r"> <td class="r">
<select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;"> <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultAlipay?>】</option>
<?php foreach($aliMerchants as $merchant):?> <?php foreach($aliMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>
@ -162,7 +162,7 @@
<td class="l"><i class="mustmark">*</i>微信支付配置：</td> <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
<td class="r"> <td class="r">
<select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;"> <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultWeixin?>】</option>
<?php foreach($weixinMerchants as $merchant):?> <?php foreach($weixinMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>
@ -173,7 +173,7 @@
<td class="l"><i class="mustmark">*</i>快捷支付配置：</td> <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
<td class="r"> <td class="r">
<select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;"> <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultExpress?>】</option>
<?php foreach($expressMerchants as $merchant):?> <?php foreach($expressMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>

6
Application/Admin/View/PaymentMerchant/ruleEditForm.html
Unescape Escape View File

@ -151,7 +151,7 @@
<td class="l"><i class="mustmark">*</i>支付宝支付配置：</td> <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
<td class="r"> <td class="r">
<select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;"> <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultAlipay?>】</option>
<?php foreach($aliMerchants as $merchant):?> <?php foreach($aliMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>
@ -162,7 +162,7 @@
<td class="l"><i class="mustmark">*</i>微信支付配置：</td> <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
<td class="r"> <td class="r">
<select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;"> <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultWeixin?>】</option>
<?php foreach($weixinMerchants as $merchant):?> <?php foreach($weixinMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>
@ -173,7 +173,7 @@
<td class="l"><i class="mustmark">*</i>快捷支付配置：</td> <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
<td class="r"> <td class="r">
<select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;"> <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户【<?=$defaultExpress?>】</option>
<?php foreach($expressMerchants as $merchant):?> <?php foreach($expressMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
<?php endforeach;?> <?php endforeach;?>

Write Preview
Loading…
Cancel
Save