sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钱包优化

feat/task1-c-wallet
devil_gong 2019-05-08 09:58:18 +08:00
parent 11bc54cd9c
commit 9c674cfeac
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/view/default/slide/index.html
View File

@ -84,7 +84,7 @@
</td>
<td>
{{$v.event_value}}
{{if !empty($v['event_value'])}}
{{if !empty($v['event_value']) and !empty($v['event_type_text'])}}
<br /><span class="am-badge am-badge-warning am-radius">{{$v.event_type_text}}</span>
{{/if}}
</td>

4
application/admin/view/default/slide/save_info.html
View File

@ -22,7 +22,7 @@
<div class="am-form-group">
<label>所属平台</label>
<select name="platform" class="am-radius chosen-select" data-placeholder="可选择..." placeholder="所属平台有误">
<select name="platform" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择所属平台" required>
<option value="">可选择...</option>
{{foreach $common_platform_type as $v}}
<option value="{{$v.value}}" {{if isset($data['platform']) and $data['platform'] eq $v['value']}}selected{{else /}}{{if !isset($data['platform']) and isset($v['checked']) and $v['checked'] eq true}}selected{{/if}}{{/if}}>{{$v.name}}</option>
@ -32,7 +32,7 @@
<div class="am-form-group">
<label>事件类型</label>
<select name="event_type" class="am-radius chosen-select" data-placeholder="可选择..." placeholder="事件值类型有误">
<select name="event_type" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择事件值类型">
<option value="">可选择...</option>
{{foreach $common_app_event_type as $v}}
<option value="{{$v.value}}" {{if isset($data['event_type']) and $data['event_type'] eq $v['value']}}selected{{else /}}{{if !isset($data['event_type']) and isset($v['checked']) and $v['checked'] eq true}}selected{{/if}}{{/if}}>{{$v.name}}</option>

2
application/plugins/wallet/install.sql
View File

@ -6,7 +6,7 @@ CREATE TABLE `s_plugins_wallet_recharge` (
`recharge_no` char(60) NOT NULL DEFAULT '' COMMENT '充值单号',
`status` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0未支付, 1已支付）',
`money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '金额',
`pay_price` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '支付金额',
`pay_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '支付金额',
`payment_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '支付方式id',
`payment` char(60) NOT NULL DEFAULT '' COMMENT '支付方式标记',
`payment_name` char(60) NOT NULL DEFAULT '' COMMENT '支付方式名称',

4
application/plugins/wallet/service/PayService.php
View File

@ -309,7 +309,7 @@ class PayService
return DataReturn('支付方式有误', -1);
}
// 支付参数
// 支付金额
$pay_price = isset($params['pay']['pay_price']) ? $params['pay']['pay_price'] : 0;
// 写入支付日志
@ -345,7 +345,7 @@ class PayService
// 更新充值状态
$upd_data = array(
'status' => 1,
'pay_price' => $pay_price,
'pay_money' => $pay_price,
'payment_id' => $params['payment']['id'],
'payment' => $params['payment']['payment'],
'payment_name' => $params['payment']['name'],