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

12月功能提交

Browse Source
master
zhengyongxing 4 years ago
parent b8af3ea384
commit 8bb8e4379f
5 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -1827,7 +1827,7 @@ class CompanyStatementPoolController extends ThinkController
$save['verify_status'] = $svalue['verify_status'];
$save['remark'] = $svalue['remark'];
$save['company_info'] = $svalue['company_info'];
$save['statement_num'] = "JS_" . date("YmdHis", time()) . sp_random_string(5);
$save['statement_num'] = "JS_" . date("YmdHis", time()) . $svalue['company_id'] . sp_random_string(5);
if ($amount > $limit_amount) {
$save['statement_money'] = $limit_amount;
@ -1928,7 +1928,7 @@ class CompanyStatementPoolController extends ThinkController
$save['verify_status'] = $svalue['verify_status'];
$save['remark'] = $svalue['remark'];
$save['company_info'] = $svalue['company_info'];
$save['statement_num'] = "JS_" . date("YmdHis", time()) . sp_random_string(5);
$save['statement_num'] = "JS_" . date("YmdHis", time()) .$svalue['company_id'] . sp_random_string(5);
$save['statement_money'] = $svalue['statement_money'];
$save['statement_info_id'] = $svalue['id'];

72
Application/Payment/Controller/PaymentController.class.php
Unescape Escape View File

@ -140,50 +140,50 @@ class PaymentController extends BaseController
$v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
}
if ($handleData) {
$statementInfo = M("pay_statement_info","tab_")
->alias('s')
->field("s.*,p.statement_num statement_pool_num")
->join("left join tab_company_statement_info i ON s.statement_info_id = i.id")
->join("left join tab_company_statement_pool p ON p.id = i.pool_id")
->where(['statement_info_id'=>['in',$handleData]])
->order("FIELD(s.pay_status,0,-1,1),s.verify_status desc")
->select();
$statementInfo = M("pay_statement_info","tab_")
->alias('s')
->field("s.*,p.statement_num statement_pool_num")
->join("left join tab_company_statement_info i ON s.statement_info_id = i.id")
->join("left join tab_company_statement_pool p ON p.id = i.pool_id")
->where(['statement_info_id'=>['in',$handleData]])
->order("FIELD(s.pay_status,0,-1,1),s.verify_status desc")
->select();
$handleData = [];
foreach ($statementInfo as $key => $value) {
$handleData = [];
foreach ($statementInfo as $key => $value) {
$value['can_pay'] = 1;
if($value['verify_status'] == -1){
$value['verify_status_str']="信息配置不全";
$value['can_pay'] = 0;
}else{
if($value['pay_status'] == 1){ $value['can_pay'] = 0; }
$value['verify_status_str'] = $this->PayStatus[$value['pay_status']];
if($value['pay_status'] == 1){
$value['pay_type'] = $value['pay_type'] == 1 ? "提现" :"线上打款";
$value['verify_status_str'] .= ("/". $value['pay_type']);
}
}
$value['can_pay'] = 1;
if($value['verify_status'] == -1){
$value['verify_status_str']="信息配置不全";
$value['can_pay'] = 0;
}else{
if($value['pay_status'] == 1){ $value['can_pay'] = 0; }
$value['verify_status_str'] = $this->PayStatus[$value['pay_status']];
if($value['pay_status'] == 1){
$value['pay_type'] = $value['pay_type'] == 1 ? "提现" :"线上打款";
$value['verify_status_str'] .= ("/". $value['pay_type']);
$value['company_type'] = $this->CompanyType[$value['company_type']];
$value['statement_begin_time'] = date('Y-m-d',$value['statement_begin_time']);
$value['statement_end_time'] = date('Y-m-d',$value['statement_end_time']);
if(empty($value['pay_time'])){
$value['pay_time'] = "--";
}else{
$value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
}
$value["valid"] = "{$value['statement_begin_time']} ~ {$value['statement_end_time']}";
$handleData[$value['statement_info_id']]['data'][] = $value;
$handleData[$value['statement_info_id']]['ids'][] = $value['id'];
}
$value['company_type'] = $this->CompanyType[$value['company_type']];
$value['statement_begin_time'] = date('Y-m-d',$value['statement_begin_time']);
$value['statement_end_time'] = date('Y-m-d',$value['statement_end_time']);
if(empty($value['pay_time'])){
$value['pay_time'] = "--";
}else{
$value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
foreach ($CompanyInfo as $key=>$value) {
$CompanyInfo[$key]['son_info'] = $handleData[$value['id']]['data'];
$CompanyInfo[$key]['ids'] = implode(',',$handleData[$value['id']]['ids']);
}
$value["valid"] = "{$value['statement_begin_time']} ~ {$value['statement_end_time']}";
$handleData[$value['statement_info_id']]['data'][] = $value;
$handleData[$value['statement_info_id']]['ids'][] = $value['id'];
}
foreach ($CompanyInfo as $key=>$value) {
$CompanyInfo[$key]['son_info'] = $handleData[$value['id']]['data'];
$CompanyInfo[$key]['ids'] = implode(',',$handleData[$value['id']]['ids']);
}
// dump($CompanyInfo);die();
//统计待打款金额
$countmap = $map;

3
Application/Payment/View/ExcelPayment/lists.html
Unescape Escape View File

@ -366,6 +366,9 @@
} else {
layer.msg("<font style='color: white'>打款失败</font>");
}
setTimeout(function () {
window.location.reload();
},2000);
}

14
Application/Payment/View/Payment/lists.html
Unescape Escape View File

@ -417,6 +417,9 @@
} else {
layer.msg("<font style='color: white'>打款失败</font>");
}
setTimeout(function () {
window.location.reload();
},2000);
}
@ -431,6 +434,7 @@
var status = $(this).data('value');
var verifytip = 0;
var paytip = 0;
var canpay = 0;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
@ -447,6 +451,11 @@
return ;
}
if($(elem).data("pay") != 1) {
canpay = 1;
return;
}
return $(elem).data('verify_id');
}).get();
@ -461,6 +470,11 @@
return;
}
if (canpay == 1) {
layer.msg("<font style='color:white'>" + '请选择信息配置完全的打款单' + "</font>");
return;
}
if(text.length < 1){
layer.msg("<font style='color:white'>" + '请先选择要操作的打款单' + "</font>");
return;

39
Application/Payment/View/Payment/viewPuPool.html
Unescape Escape View File

@ -111,10 +111,12 @@
<th>奖励</th>
<th>罚款</th>
<th>结算金额</th>
<th>开户名</th>
<th>银行卡号</th>
<th>开户支行</th>
<th>帐户类型</th>
<!-- <th>开户名</th>-->
<!-- <th>银行卡号</th>-->
<!-- <th>开户支行</th>-->
<!-- <th>帐户类型</th>-->
<th>支付宝用户</th>
<th>支付宝账号</th>
<th>备注</th>
</tr>
</thead>
@ -187,8 +189,8 @@
<notempty name="com['statement_info'][0]['game_list']">
<td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
<!-- <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>-->
<td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>
<td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
<!-- <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>-->
<td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
@ -209,9 +211,7 @@
<td>-</td>
<td>-</td>
<td>-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
<td>-</td>
</notempty>
@ -219,21 +219,17 @@
<td rowspan="{$com.row}">{$com.company_info.payee_name}</td>
<td rowspan="{$com.row}">&nbsp;{$com.company_info.bank_account}</td>
<td rowspan="{$com.row}">{$com.company_info.opening_bank}</td>
<td rowspan="{$com.statement_count}"></td>
</if>
<if condition="$com['is_payment'] eq 1">
<td rowspan="{$com.row}">{$com.company_info.ali_user}</td>
<td rowspan="{$com.row}">{$com.company_info.ali_account}</td>
<td rowspan="{$com.row}"></td>
<!-- <td rowspan="{$com.row}"></td>-->
<!-- <td rowspan="{$com.row}"></td>-->
</if>
<if condition="!$is_export">
<td rowspan="{$com.row}">
<if condition="($com['st'] eq 1 ) AND ($pool_status lt 1)">
<a data-id="{$com['id']}" class='butn no_statement' style="cursor:pointer">不结算</a>
</if>
</td>
</if>
<td rowspan="{$com.row}">{$com.remark}</td>-->
</tr>
@ -276,16 +272,13 @@
<td>{$account['game_list'][0]['ratio']}%</td>
<td>{$account['game_list'][0]['increment_ratio']}%</td>
<td><span class="sum_money_span">{$account['game_list'][0]['sum_money']}</span></td>
<notempty name="account['time']">
<td rowspan="{$account['time_row']}">{$account['reward']|default=0}</td>
<td rowspan="{$account['time_row']}">{$account['fine']|default=0}</td>
</notempty>
<td><span class="sum_money_span">{$account['game_list'][0]['sum_money']}</span></td>
<notempty name="account['time']">
<td rowspan="{$account['time_row']}">{$account['withhold_amount']|default=0}</td>
<td rowspan="{$account['time_row']}">{$account['week_amount']}</td>
</notempty>
<else />
<td>-</td>
@ -338,8 +331,6 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>

Write Preview
Loading…
Cancel
Save