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

Merge branch 'master' into release

Browse Source
master
ELF 4 years ago
parent 0d2f58c871 08bfa31433
commit ac79ab9589
7 changed files with 96 additions and 27 deletions
Show Stats Download Patch File Download Diff File

66
Application/Admin/Controller/CompanyStatementOfflineController.class.php
Unescape Escape View File

@ -166,6 +166,8 @@ class CompanyStatementOfflineController extends ThinkController
->where($map)
->find();
unset($map['c.pay_status']);
$countSuccess = SM("company_statement_info_part","tab_")->alias("c")
->field("IFNULL(SUM(CASE WHEN c.pay_status = 0 THEN c.statement_money ELSE 0 END),0) as statement_money,
IFNULL(SUM(CASE WHEN c.pay_status = 1 THEN c.statement_money ELSE 0 END),0) as success_money")
@ -175,12 +177,18 @@ class CompanyStatementOfflineController extends ThinkController
->where(['i.pay_status'=>['neq',1]])
->find();
if ($_REQUEST['pay_status'] == 1) {
$countSuccess = [];
}
// dump($countPart);
// dump($countSuccess);die();
// dump($count);die();
$count['success_money'] += $countSuccess['success_money'];
$count['statement_money'] -= $countSuccess['success_money'];
$count['error_money'] += $countPart['error_money'];
$params['p'] = $page;
$params['row'] = $row;
$page = set_pagination($count['count'], $row, $params);
@ -564,7 +572,7 @@ class CompanyStatementOfflineController extends ThinkController
$saveData = [
"pay_type"=>3,
"pay_status"=>1,
"pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time])
"pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]),'pay_time'=>strtotime($payment_time)
];
if($info_id) {
$companyStatementInfo->where(['id'=>['in',$info_id]])->save($saveData);
@ -575,6 +583,7 @@ class CompanyStatementOfflineController extends ThinkController
"pay_type"=>3,
"pay_status"=>2,
"pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time])
,'pay_time'=>strtotime($payment_time)
];
$unPayData = SM("company_statement_info_part","tab_")
@ -609,8 +618,8 @@ class CompanyStatementOfflineController extends ThinkController
}
SM("company_statement_info_part","tab_")
->where(['info_id'=>$value['id']])
->save(["pay_status"=>1]);
->where(['info_id'=>$value['id'],'pay_status'=>['neq',1]])
->save(["pay_status"=>1,'pay_time'=>strtotime($payment_time)]);
if($value['statement_money'] - $handlePayData[$value['id']] <=0) {
//打款成功
@ -619,7 +628,8 @@ class CompanyStatementOfflineController extends ThinkController
"pay_type"=>3,
"pay_status"=>1,
"pay_info"=>json_encode(["payment_user"=>$_SESSION['onethink_admin']['user_auth']["username"],"payment_time"=>$payment_time]),
"remark"=>$saveData['remark']
"remark"=>$saveData['remark'],
'pay_time'=>strtotime($payment_time)
]);
} else {
$companyStatementInfo->where(['id'=>$value['id']])->save($saveData);
@ -707,7 +717,7 @@ class CompanyStatementOfflineController extends ThinkController
$id = $_REQUEST['id'];
$CompanyInfo = M("company_statement_info","tab_")
->alias('i')
->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check")
->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check,pay_time")
->join("tab_company_statement_pool p ON p.id = i.pool_id")
->where("i.id in({$id}) and (pay_check=1 or pay_check=2)")
->select();
@ -718,7 +728,7 @@ class CompanyStatementOfflineController extends ThinkController
if ($CompanyInfo[0]['id']) {
$CompanyInfoSecord = M("company_statement_info_part","tab_")
->alias('i')
->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check")
->field("info_id id,i.pool_id,i.company_name,i.company_info,i.statement_money,i.remark,i.pay_status,i.verify_status,p.statement_num,i.statement_money,i.pay_check,pay_time")
->join("tab_company_statement_pool p ON p.id = i.pool_id")
->where("i.info_id ={$CompanyInfo[0]['id']}")
->select();
@ -727,7 +737,45 @@ class CompanyStatementOfflineController extends ThinkController
$CompanyInfo = $CompanyInfoSecord;
}
$all_money = 0;
$unPayData = SM("company_statement_info_part","tab_")
->field("sum(statement_money) statement_money,info_id")
->where(["pay_status"=>1,'info_id'=>['in',$_REQUEST['id']]])
->group("info_id")
->select();
$handleData = [];
foreach ($unPayData as $key => $value) {
$handleData[$value['info_id']] = $value['statement_money'];
}
$payData = SM("company_statement_info","tab_")
->field("id,sum(statement_money) statement_money,pay_status")
->where(['id'=>['in',$_REQUEST['id']]])
->group("id")
->select();
$handleAllData = [];
foreach ($payData as $key => $value) {
$handleAllData[$value['id']] = $value['statement_money'];
}
// dump($payData);
$surplurAmount = array_sum($handleData);
$all_money = array_sum($handleAllData);
foreach ($payData as $key => $value) {
if ($value['pay_status'] == 1) {
$surplurAmount -= $handleData[$value['id']];
$surplurAmount += $value['statement_money'];
}
}
$sAmount = number_format($all_money-$surplurAmount,2,'.','');
foreach($CompanyInfo as $k=>&$v){
if($v['verify_status'] == 2){
$v['is_payment'] = 2;
@ -738,11 +786,13 @@ class CompanyStatementOfflineController extends ThinkController
$v['company_info'] = json_decode($v['company_info'],true);
$v['company_info']['ali_user'] ?? '';
$v['company_info']['ali_account'] ?? '';
$v['time'] = date("Y-m-d H:i:s",$v['pay_time']);
$all_money += $v['statement_money'];
// $all_money += $v['statement_money'];
}
$this->assign('surplur_amount',$sAmount);
$this->assign('all_money',$all_money);
$this->assign("CompanyInfo",$CompanyInfo);
$this->assign("id",$id);

35
Application/Admin/Controller/GameMarginController.class.php
Unescape Escape View File

@ -171,12 +171,16 @@ class GameMarginController extends AdminController
private function moreMarginExport($info)
{
$line = 3;
$dateBing = 3;
$excelData = [];
$countLineArr = [];
foreach ($info as $index => $date) {
$marginInfo = json_decode($date['margin_info'],true);
foreach ($marginInfo as $v) {
foreach ($marginInfo as $k=>$v) {
// $v["cp_ratio"] = "=ROUND(G{$line}/D{$line},4)";
if($k == 0){
$dateBing = $line;
}
if($v["pc_pay_amount"] > 0){
$v["pc_ratio"] ="=ROUND(M{$line}/K{$line},2)";
@ -214,33 +218,33 @@ class GameMarginController extends AdminController
"count_year" => $date['count_year'],
'count_month' => $date['count_month'],
'relation_game_name'=>"小计",
"pay_amount"=>"=SUM(D3:D{$line})",
"pay_amount"=>"=SUM(D{$dateBing}:D{$line})",
"cp_statement_amount"=>"=SUM(G3:G{$line})",
"cp_rebate_amount"=>"=SUM(I3:I{$line})",
"cp_other_amount"=>"=SUM(J3:J{$line})",
"cp_statement_amount"=>"=SUM(G{$dateBing}:G{$line})",
"cp_rebate_amount"=>"=SUM(I{$dateBing}:I{$line})",
"cp_other_amount"=>"=SUM(J{$dateBing}:J{$line})",
"pc_pay_amount"=>"=SUM(K3:K{$line})",
"pc_pay_amount"=>"=SUM(K{$dateBing}:K{$line})",
"pc_ratio"=>"=ROUND(M{$countLine}/K{$countLine},4)",
"pc_statement_amount"=>"=SUM(M3:M{$line})",
"pc_margin_amount"=>"=SUM(N3:N{$line})",
"pc_statement_amount"=>"=SUM(M{$dateBing}:M{$line})",
"pc_margin_amount"=>"=SUM(N{$dateBing}:N{$line})",
"pc_margin_ratio"=>"=ROUND(N{$countLine}/K{$countLine},4)",
"pu_pay_amount"=>"=SUM(P3:P{$line})",
"pu_statement_amount"=>"=SUM(R3:R{$line})",
"pu_pay_amount"=>"=SUM(P{$dateBing}:P{$line})",
"pu_statement_amount"=>"=SUM(R{$dateBing}:R{$line})",
"pu_ratio"=>"=ROUND(R{$countLine}/P{$countLine},4)",
"pu_margin_amount"=>"=SUM(S3:S{$line})",
"pu_margin_amount"=>"=SUM(S{$dateBing}:S{$line})",
"pu_margin_ratio"=>"=ROUND(S{$countLine}/P{$countLine},4)",
"platform_margin_ratio"=>"=ROUND((D{$countLine}-V{$countLine}-G{$countLine}-I{$countLine}-J{$countLine}-M{$countLine}-R{$countLine})/(D{$countLine}-V{$countLine}),4)",
"jh_pay_amount"=>"=SUM(V3:V{$line})",
"jh_statement_amount"=>"=SUM(X3:X{$line})",
"jh_pay_amount"=>"=SUM(V{$dateBing}:V{$line})",
"jh_statement_amount"=>"=SUM(X{$dateBing}:X{$line})",
"jh_ratio"=>"=ROUND(X{$countLine}/V{$countLine},4)",
"jh_margin_amount"=>"=SUM(Y3:Y{$line})",
"jh_margin_amount"=>"=SUM(Y{$dateBing}:Y{$line})",
"jh_margin_ratio"=>"=ROUND(Y{$countLine}/V{$countLine},4)",
"margin_ratio"=>"=ROUND(AB{$countLine}/D{$countLine},4)",
"margin_amount"=>"=SUM(AB3:AB{$line})",
"margin_amount"=>"=SUM(AB{$dateBing}:AB{$line})",
];
$line += 2;
@ -318,6 +322,7 @@ class GameMarginController extends AdminController
$allCountData['margin_amount'] = rtrim($allCountData['margin_amount'], ",").")";
$excelData[] = $allCountData;
// dd($excelData);
$this->exportExcel($excelData,"毛利分析表汇总");
}
private function exportExcel($arr,$title)

4
Application/Admin/View/CompanyStatementOffline/viewstatement.html
Unescape Escape View File

@ -113,6 +113,7 @@
<th style="border-right: solid 1px #b6cad2;">关联结算汇总单订单号</th>
<th style="border-right: solid 1px #b6cad2;">结算金额(元)</th>
<th style="border-right: solid 1px #b6cad2;">打款时间</th>
<th style="border-right: solid 1px #b6cad2;">备注</th>
</tr>
</thead>
@ -135,13 +136,14 @@
</if>
<td>{$vo.statement_num}</td>
<td>{$vo.statement_money}</td>
<td>{$vo.time}</td>
<td>{$vo.remark}</td>
</tr>
</foreach>
<tr>
<td colspan="2">合计:</td>
<td colspan="7">结算总金额:{$all_money}</td>
<td colspan="8">结算总金额:{$all_money}<span style="margin-left: 20px">剩余打款金额:</span><span class="surplusAmount">{$surplur_amount}</span></td>
</tr>
</tbody>

3
Application/Base/Service/MendService.class.php
Unescape Escape View File

@ -39,6 +39,9 @@ class MendService
if ($orderTime == '') {
throw new \Exception('没有订单日期');
}
if (strtotime($orderTime) > time()) {
throw new \Exception('订单时间不能大于今天');
}
if ($permPromote) {
$levelColumn = 'level'. $permPromote['level'] . '_id';

3
Application/Base/Service/TestingResourceService.class.php
Unescape Escape View File

@ -120,11 +120,12 @@ class TestingResourceService
$orderData['provide_status'] = 2;
} else {
$orderData['provide_status'] = 1;
$provideAmount += $order['amount'];
}
} else {
$orderData['provide_status'] = 1;
$provideAmount += $order['amount'];
}
$provideAmount += $order['amount'];
$orderData['provide_time'] = time();
M('testing_resource_order', 'tab_')
->where(['id' => $order['id']])

6
Application/Home/Controller/HomeController.class.php
Unescape Escape View File

@ -203,11 +203,15 @@ class HomeController extends Controller
$promoteId = $data['promote_id'];
}
$promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
$promote = M('promote', 'tab_')->field(['id', 'account', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
if (!$promote) {
$this->error('该链接已失效');
}
if ($promote['account'] == 'yl3xiaojian') {
$this->error('链接无效');
}
$promoteService = new PromoteService();
if (!$promoteService->checkPromoteLimitRule($promote)) {
$this->error('链接已失效');

6
Application/Home/Controller/PackageController.class.php
Unescape Escape View File

@ -55,11 +55,15 @@ class PackageController extends Controller
$promoteId = $data['promote_id'];
}
$promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
$promote = M('promote', 'tab_')->field(['id', 'account', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
if (!$promote) {
$this->error('该链接已失效');
}
if ($promote['account'] == 'yl3xiaojian') {
$this->error('链接无效');
}
$promoteService = new PromoteService();
if (!$promoteService->checkPromoteLimitRule($promote)) {
$this->error('链接已失效');

Write Preview
Loading…
Cancel
Save