Merge pull request 'feature/finance_payment_20210115' (#145) from feature/finance_payment_20210115 into release

优化公会统计说明
master
陈志 4 years ago
commit fca978ae2c

@ -47,6 +47,9 @@ class CompanyStatementOfflineController extends ThinkController
$time_end = strtotime($_REQUEST['time_end'])+ 86399;
$map["_string"] = "(c.statement_begin_time <= {$time_end} ) OR (c.statement_end_time <= {$time_end})";
}
if(isset($_REQUEST['pay_status'])){
$map['c.pay_status'] = $_REQUEST['pay_status'];
}
//其他
if(isset($_REQUEST['company_type'])){
@ -67,7 +70,7 @@ class CompanyStatementOfflineController extends ThinkController
->alias("c")
->field("c.*,p.statement_num,p.verify_status")
->where($map)
->where(['p.verify_status'=>['neq',6]])
->where('p.verify_status <> 6')
->join("tab_company_statement_pool as p ON c.pool_id = p.id")
->order("id desc")
->select();
@ -81,10 +84,8 @@ class CompanyStatementOfflineController extends ThinkController
->alias("c")
->field("c.*,p.statement_num,p.verify_status")
->where($map)
->where(['p.verify_status'=>['neq',6]])
->where('p.verify_status <> 6')
->join("tab_company_statement_pool as p ON c.pool_id = p.id")
->page($page,$row)
->order("id desc")
->select();
@ -117,9 +118,12 @@ class CompanyStatementOfflineController extends ThinkController
$v['oplist'] = $this->OpAuth($v);
}
$count = SM("company_statement_info","tab_")->alias("c")->field("count(c.id) count,sum(c.statement_money) statement_money")->join("tab_company_statement_pool as p ON c.pool_id = p.id")->where($map)->find();
// dd($count);
//pay_status
$field = "count(c.id) count,IFNULL(SUM(CASE WHEN pay_status = 1 THEN c.statement_money ELSE 0 END),0) as success_money,
IFNULL(SUM(CASE WHEN pay_status = 0 THEN c.statement_money ELSE 0 END),0) as statement_money,
IFNULL(SUM(CASE WHEN pay_status = -1 THEN c.statement_money ELSE 0 END),0) as error_money";
$count = SM("company_statement_info","tab_")->alias("c")->field($field)->join("tab_company_statement_pool as p ON c.pool_id = p.id")->where($map)->find();
$params['p'] = $page;
$params['row'] = $row;
$page = set_pagination($count['count'], $row, $params);
@ -130,6 +134,7 @@ class CompanyStatementOfflineController extends ThinkController
$this->assign('data',$data);
$this->assign('count',$count);
$this->assign('CompanyType',$this->CompanyType);
$this->assign("PayStatus", $this->PayStatus);
$this->display();
}

@ -117,6 +117,14 @@
<div class="input-list">
<input style="width: 200px;" type="text" name="company_name" class="search-input" value="{:I('company_name')}" placeholder="请输入公司名称搜索">&nbsp;
</div>
<div class="input-list input-list-promote search_label_rehab">
<select id="pay_status" name="pay_status" class="select_gallery" >
<option value="">打款状态</option>
<volist name="PayStatus" id="vo">
<option value="{$key}" <if condition="isset($_GET['pay_status']) && $key eq I('pay_status')">selected</if> >{$vo}</option>
</volist>
</select>
</div>
<div class="input-list">
<input style="width: 200px;" type="text" name="statement_pool_num" class="search-input" value="{:I('statement_pool_num')}" placeholder="请输入汇总单号">&nbsp;
@ -195,7 +203,8 @@
</td>
</tr>
</volist>
<tr><td style="line-height: 42px;">合计</td><td colspan="12" style="line-height: 42px;">结算总金额:&nbsp;{$count.statement_money}</td></tr>
<tr><td style="line-height: 42px;">合计</td><td colspan="12" style="line-height: 42px;">待打款金额:&nbsp;{$count.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;打款成功金额:&nbsp;{$count.success_money}&nbsp;&nbsp;&nbsp;&nbsp;打款失败金额:&nbsp;{$count.error_money}</td></tr>
</notemtpy>
</tbody>
</table>

@ -76,12 +76,30 @@
display: block;
}
.main-place .question_content:before{
right: 20px;
left: auto;
}
</style>
<!-- 标题栏 -->
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">公会统计</h3>
<p class="description_text">说明:公会相关统计<span style="color: red;margin-left: 10px;">不含不参与结算的订单数据</span></p>
<p class="description_text">说明:公会相关统计</p>
<div class="question" style="float: right;margin-right: 20px;">
<i class="question_mark">?</i>
<ul class="question_content" style="right: -20px;left: auto;">
<li class="question_title">数据相关说明</li>
<li class="question_list">
<span class="">不结算充值合计:</span>
<span class="">该工会未推广的游戏所产生的流水将被记为不结算充值</span>
</li>
<li class="question_list">
<span class="">下游结算:</span>
<span class="">下游结算时不包含不结算订单</span>
</li>
</ul>
</div>
</div>
<style>
@ -251,7 +269,7 @@
<!-- <td><span class='ljzc'
data-value="{$data['id']}"><a>{$data.inside_cash_count}</a></span></td> -->
<td>{$data.allcount}</td>
<td>{$data.unallcount}</td>
<td style="color: red;">{$data.unallcount}</td>
<td>
@ -276,7 +294,7 @@
<td style="text-align: center;">{$all_count['bind_coin_count']}</td>
<td style="text-align: center;">{$all_count['inside_cash_count']}</td>
<td style="text-align: center;">{$all_count['all_count']}</td>
<td style="text-align: center;">{$all_count['unallcount']}</td>
<td style="text-align: center;color: red;">{$all_count['unallcount']}</td>
<td style="text-align: center;">
<a
href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_type'=>1,'p'=>1]))}">游戏查看</a>

@ -73,6 +73,16 @@ class PaymentController extends BaseController
$map['s.verify_time'] = ['ELT', strtotime($_REQUEST['verifytime_end']) + 86399];
}
if(isset($_REQUEST['statement_num'])){
$statement_num = $_REQUEST['statement_num'];
$pool_ids = M("company_statement_pool","tab_")->where("statement_num like '%{$statement_num}%'")->getField("id",true);
if(!empty($pool_ids)){
$map['s.pool_id'] = ['in', $pool_ids];
}else{
$map['s.pool_id'] = 0;
}
}
if(isset($_REQUEST['company_type'])){
$map['s.company_type'] = $_REQUEST['company_type'];
}

@ -130,7 +130,7 @@ class PublicController extends \Think\Controller
public function checksafecode($phone, $code)
{
//测试验证码
if($code == "txsb0601"){
if(C('PAYMENT_MOBILE_DEBUG') && $code === C('PAYMENT_MOBILE_DEBUG')){
return true;
}
$taskClient = new TaskClient();

@ -145,7 +145,7 @@
<div class="input-list input-list-promote search_label_rehab">
<select id="pay_status" name="pay_status" class="select_gallery" >
<option value="">支付状态</option>
<option value="">打款状态</option>
<volist name="PayStatus" id="vo">
<option value="{$key}" <if condition="isset($_GET['pay_status']) && $key eq I('pay_status')">selected</if> >{$vo}</option>
</volist>
@ -258,7 +258,7 @@
</tr>
</volist>
<tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">
打款成功金额:&nbsp;{$money.success_money}&nbsp;&nbsp;/&nbsp;&nbsp;待打款金额:&nbsp;{$money.statement_money}&nbsp;&nbsp;/&nbsp;&nbsp;打款失败金额:&nbsp;{$money.error_money}
待打款金额:&nbsp;{$money.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;打款成功金额:&nbsp;{$money.success_money}&nbsp;&nbsp;&nbsp;&nbsp;打款失败金额:&nbsp;{$money.error_money}
</td></tr>
</notemtpy>
</tbody>

@ -180,8 +180,9 @@
<option value="2" <if condition="isset($_GET['pay_type']) && I('pay_type') eq 2">selected</if> >线上打款</option>
</select>
</div>
<div class="input-list">
<input type="text" name="statement_num" class="" value="{:I('statement_num')}" placeholder="请输入汇总单号" style="width: 180px;"/>
</div>
<div class="input-list">
<input type="text" readonly id="time_start2" name="pay_time_start" class="" value="{:I('pay_time_start')}" placeholder="支付开始时间" />
&nbsp;-&nbsp;
@ -324,7 +325,7 @@
</if>
</volist>
</volist>
<tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">待打款金额:&nbsp;{$sum['unpay_amount']|default='0.00'}&nbsp;&nbsp;打款成功金额:&nbsp;{$sum['pay_amount']|default='0.00'}&nbsp;打款失败金额:&nbsp;{$sum['faild_pay_amount']|default='0.00'}</td></tr>
<tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">待打款金额:&nbsp;{$sum['unpay_amount']|default='0.00'}&nbsp;&nbsp;&nbsp;&nbsp;打款成功金额:&nbsp;{$sum['pay_amount']|default='0.00'}&nbsp;&nbsp;&nbsp;&nbsp;打款失败金额:&nbsp;{$sum['faild_pay_amount']|default='0.00'}</td></tr>
</notemtpy>
</tbody>
</table>

Loading…
Cancel
Save