汇总单代码提交

master
zhengyongxing 5 years ago
parent 61d12c2750
commit b664ba46ad

@ -391,6 +391,10 @@ class PromoteController extends ThinkController
$use = new UserApi();
$data['password']=think_ucenter_md5($pwd, UC_AUTH_KEY);
$data['second_pwd']=think_ucenter_md5($second_pwd, UC_AUTH_KEY);
$data['withdraw_show'] = $_POST['withdraw_show'];
$data['withdraw_done'] = $_POST['withdraw_done'];
if (empty($pwd)) {
unset($data['password']);
}

@ -150,7 +150,7 @@
<input type="radio" value="1" name="withdraw_done"> 开启
</label >
<label >
<input type="radio" value="2" name="withdraw_done" checked="checked"> 锁定
<input type="radio" value="0" name="withdraw_done" checked="checked"> 锁定
</label>
</span>
</td>

@ -294,10 +294,10 @@
<td class="r table_radio">
<span class="form_radio table_btn">
<label >
<input type="radio" value="1" name="withdraw_show" > 开启
<input type="radio" value="1" name="withdraw_show" <if condition="$data['withdraw_show'] eq 1">checked="checked"</if>> 开启
</label >
<label >
<input type="radio" value="0" name="withdraw_show" checked="checked"> 锁定
<input type="radio" value="0" name="withdraw_show" <if condition="$data['withdraw_show'] eq 0">checked="checked"</if>> 锁定
</label>
</span>
</td>
@ -308,10 +308,10 @@
<td class="r table_radio">
<span class="form_radio table_btn">
<label >
<input type="radio" value="1" name="withdraw_done"> 开启
<input type="radio" value="1" name="withdraw_done" <if condition="$data['withdraw_done'] eq 1">checked="checked"</if>> 开启
</label >
<label >
<input type="radio" value="2" name="withdraw_done" checked="checked"> 锁定
<input type="radio" value="0" name="withdraw_done" <if condition="$data['withdraw_done'] eq 0">checked="checked"</if>> 锁定
</label>
</span>
</td>

@ -1324,13 +1324,16 @@ function getAvailableBalance($promote_id=0,$game_id=0,$server_id='') {
}
/**
* 获取测试资源可用余额
* promote_id=>推广员id,
* game_id=>游戏id,
* 获取同一个公司的会长
* $promoteType=>推广员等级,
*/
function getPromoteLists($promoteType = 1) {
$map['level'] = $promoteType;
$company = M('promote','tab_')->field("company_id")->where(['id'=>get_pid()])->find();
$map['company_id'] = $company['company_id'];
$data = M('promote','tab_')
->field('id,account,real_name')
->where($map)

@ -2224,7 +2224,7 @@ class DownloadController extends BaseController {
case "汇总单信息":
$this->WithdrawIndexExcelInfo($id,$map);
break;
case "结算单详情":
case "结算单明细":
$this->WithdrawOrderExcelInfo($id,$map);
break;
default:
@ -4816,14 +4816,31 @@ public function iosDetailExcelInfo($id,$map) {
$game_id = M("game","tab_")->field("id")->where($game_map)->select();
$promote_data = [];
$promote_id = M("promote","tab_")->field("id")->where(['company_id'=>$_REQUEST['company_id']])->select();
foreach ($promote_id as $key => $value) {
$promote_data[] = $value['id'];
$data = M("promote","tab_")->field("id")->where(['chain'=>['like',"/{$value['id']}/"]])->select();
foreach ($data as $k => $v) {
$promote_data[] = $v['id'];
}
}
if ($promote_data) {
$map['promote_id'] = ['in',$promote_data];
}
$game_id = array_column($game_id,'id');
$map['pay_status'] = 1;
$map['pay_time'] = ['between',[strtotime($start),strtotime($end)+86399]];
$map['game_id'] = ['in',$game_id];
if ($_REQUEST['team_leader_id']||$_REQUEST['team_leader_id']=="0") {
$map['promote_id'] = $_REQUEST['team_leader_id'];
if ($_REQUEST['team_leader_id']) {
$promote_id = M("promote","tab_")->field("id")->where("id = {$_REQUEST['team_leader_id']} or chain like '%/{$_REQUEST['team_leader_id']}/%'")->select();
$map['promote_id'] = ['in',array_column($promote_id,'id')];
}
if(!empty($_REQUEST['start'])&&empty($_REQUEST['end'])){

@ -91,26 +91,25 @@ class WithdrawController extends BaseController
{
$this->ajaxReturn(["msg"=>"打款成功","data"=>[],"status"=>1]);die();
$id = $_REQUEST['id'];
$remark = $_REQUEST['remark'];
var_dump(1);die();
Vendor("Alipay2020/Fund");
$fund = new \Fund();
//
$dbres = M("company_statement_info","tab_")->where("id='{$id}'")->find();
// $this->ajaxReturn(["msg"=>"打款成功","data"=>$dbres,"status"=>1]);die();
$company_info = json_decode($dbres['company_info'],true);
//TODO:未进行真实打款
if($dbres['pay_status'] != 1 && $dbres['verify_status'] == 1){
//执行打款
$title = "测试-".$dbres['company_name']."结算";
$amount = $dbres['statement_money'];
$amount = 0.1;//测试金额为0
// $amount = 0.1;//测试金额为0
$payres = $fund->transfer($company_info['ali_account'],$company_info['ali_user'],$dbres['statement_num'],$amount, $title);
$resultCode = $payres->code;
$savedata = ["id"=>$dbres['id']];
if(!empty($resultCode)&&$resultCode == 10000){
$savedata["pay_status"]=1;
@ -122,22 +121,84 @@ var_dump(1);die();
$payres["remark"] = $remark;
$savedata["pay_info"] = json_encode($payres,JSON_UNESCAPED_UNICODE);
$savedata["pay_type"]=2;
$savedata["pay_type"]=1;
$savedata["pay_time"]=time();
} else {
$this->ajaxReturn(["msg"=>"已经打款过","data"=>[],"status"=>0]);
$this->poolCount($dbres['pool_id']);
$this->ajaxReturn(["msg"=>"已经打款过","data"=>$dbres,"status"=>0]);
}
$this->poolCount($dbres['pool_id']);
M("company_statement_info","tab_")->save($savedata);
$this->ajaxReturn(["msg"=>"打款成功","data"=>[],"status"=>1]);
$this->ajaxReturn(["msg"=>"打款成功","data"=>$dbres,"status"=>1]);
# code...
}
/**
* 执行最后聚合表统计
* 整合数据,全部成功则支付成功,否则为支付中
*/
public function poolCount($poolid){
$pool_id = $poolid;
$CompanyInfo = M("company_statement_info","tab_");
if(count($pool_id) > 0){
foreach($pool_id as $k=>$v){
$f = $CompanyInfo->where("pool_id = {$v} AND pay_status <> 1")->find();
if(empty($f)){
//全部完成
$this->setOneVerifyStatus(4,"payment",$v);
}else{
//打款中
$this->setOneVerifyStatus(3,"payment",$v);
}
}
}
$this->ajaxReturn(["success"=>"打款成功","data"=>[]]);
}
protected function setOneVerifyStatus($change_status,$op_pre,$id)
{
$dbres = M("company_statement_pool","tab_")->field("id,verify_status,verify_log")->where("id = {$id}")->find();
$dbres['verify_log'] = json_decode($dbres['verify_log'],true);
$dbres['verify_log'][$op_pre.'_user']=$this->admininfo["mobile"];
$dbres['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s");
$dbres['verify_log'] = json_encode($dbres['verify_log']);
$dbres['verify_status']=$change_status;
M("company_statement_pool","tab_")->save($dbres);
}
public function withdrawDetail() {
$id = $_REQUEST["id"];
$dbres = M("company_statement_info","tab_")->where("id='{$id}'")->find();
$dbres = M("company_statement_info","tab_")
->field("*,tab_company_statement_info.id")
->join("left join tab_promote_company company on tab_company_statement_info.company_id=company.id")
->where("tab_company_statement_info.id='{$id}'")->find();
// dump($dbres);die();
$relation = M("company_relation","tab_")->where("second_company_id={$dbres['company_id']}")->find();
if (!$relation) {
$this->error("乙方关联信息不存在!");
}
if ($relation['invoice_type']==1) {
$relation['invoice_type'] = "专票";
} else if ($relation['invoice_type'] == 2) {
$relation['invoice_type'] = "普票";
} else {
$relation['invoice_type'] = "无";
}
$first_companmInfo = M("company_info","tab_")->where("id={$relation['first_company_id']}")->find();
if (!$first_companmInfo) {
$this->error("甲方公司信息不存在!");
}
$this->assign("relation",$relation);
$this->assign("first_company_info",$first_companmInfo);
$company_info = json_decode($dbres['company_info'],true);
$statemnt_info = json_decode($dbres['statement_info'],true);
@ -175,14 +236,31 @@ var_dump(1);die();
$game_id = M("game","tab_")->field("id")->where($game_map)->select();
$promote_data = [];
$promote_id = M("promote","tab_")->field("id")->where(['company_id'=>$_REQUEST['company_id']])->select();
foreach ($promote_id as $key => $value) {
$promote_data[] = $value['id'];
$data = M("promote","tab_")->field("id")->where(['chain'=>['like',"/{$value['id']}/"]])->select();
foreach ($data as $k => $v) {
$promote_data[] = $v['id'];
}
}
if ($promote_data) {
$map['promote_id'] = ['in',$promote_data];
}
$game_id = array_column($game_id,'id');
$map['pay_time'] = ['between',[strtotime($start),strtotime($end)+86399]];
$map['pay_status'] = 1;
$map['game_id'] = ['in',$game_id];
if ($_REQUEST['team_leader_id']||$_REQUEST['team_leader_id']=="0") {
$map['promote_id'] = $_REQUEST['team_leader_id'];
if ($_REQUEST['team_leader_id']) {
$promote_id = M("promote","tab_")->field("id")->where("id = {$_REQUEST['team_leader_id']} or chain like '%/{$_REQUEST['team_leader_id']}/%'")->select();
$map['promote_id'] = ['in',array_column($promote_id,'id')];
}
if(!empty($_REQUEST['start'])&&empty($_REQUEST['end'])){
@ -209,6 +287,7 @@ var_dump(1);die();
->where($map)
->page($page,$row)
->select();
// var_dump($data);die();
foreach ($data as $key => $value) {
$data[$key]['pay_time'] = date("Y-m-d H:i:s",$data[$key]['pay_time']);

@ -214,7 +214,7 @@
<elseif condition="$s.pay_status eq 1"/>打款成功</if>
</td>
<td>
<if condition="$promote_data.withdraw_done eq 1">
<if condition="$promote_data.withdraw_done eq 1 and $s.verify_status eq 1">
<a href="javascript:;" class="open_edit" data-id="{$s.id}">提现</a>
</if>
<a href="javascript:;" class="apply" data-id="{$s.id}">结算单详情</a>

@ -207,39 +207,43 @@
<volist name="statemnt_info" id="s" index="key">
<tr>
<td>{$s['statement_begin_time']}-{$s['statement_end_time']}</td>
<td>{$s['game_name']}</td>
<td>{$s['sum_money']}</td>
<td><if condition="$s['increment_ratio']">0<else/>{$s['ratio']}</if></td>
<td><if condition="$s['ratio']">0<else/>{$s['increment_ratio']}</if></td>
<td>{$s['fax_ratio']}</td>
<td>{$s['pay_amount']}</td>
<td>{$s['statement_begin_time']|default="无"}-{$s['statement_end_time']|default="无"}</td>
<td>{$s['game_name']|default="无"}</td>
<td>
<a href="javascript:;" class="apply" data-company="{$data['company_id']}" data-id="{$s['relation_game_id']}" data-start="{$s['statement_begin_time']}" data-end="{$s['statement_end_time']}">
{$s['pay_amount']|default="0"}
</a>
</td>
<td><if condition="$s['ratio']">0%<else/>{$s['ratio']|default="0"}%</if></td>
<td><if condition="$s['increment_ratio']">0%<else/>{$s['increment_ratio']|default="0"}%</if></td>
<td>{$s['fax_ratio']|default="0"}%</td>
<td>{$s['sum_money']|default="0"}</td>
</tr>
</volist>
<tr>
<td>{$data['statement_begin_time']}-{$data['statement_end_time']}</td>
<td>{$data['statement_begin_time']|default="无"}-{$data['statement_end_time']|default="无"}</td>
<td>罚款</td>
<td>{$data['fine']}</td>
<td>{$data['fine']|default="0"}</td>
<td></td>
<td></td>
<td></td>
<td>{$data['fine']}</td>
<td>{$data['fine']|default="0"}</td>
</tr>
<tr>
<td>{$data['statement_begin_time']}-{$data['statement_end_time']}</td>
<td>{$data['statement_begin_time']|default="无"}-{$data['statement_end_time']|default="无"}</td>
<td>奖励</td>
<td>{$data['reward']}</td>
<td>{$data['reward']|default="0"}</td>
<td></td>
<td></td>
<td></td>
<td>{$data['reward']}</td>
<td>{$data['reward']|default="0"}</td>
</tr>
<tr>
<td colspan="2">
合计
</td>
<td>
{$data['pay_amount']}
{$data['pay_amount']|default="0"}
</td>
<td colspan="3">
</td>
@ -253,7 +257,7 @@
支付金额(大写)
</td>
<td colspan="20">
{$data['hletter_amount']}
{$data['hletter_amount']|default="0"}
</td>
</tr>
<tr>
@ -268,65 +272,65 @@
<tr>
<td></td>
<td>甲方:</td>
<td></td>
<td>{$first_company_info['partner']|default="无"}</td>
<td>乙方:</td>
<td>{$company_info['partner']}</td>
<td>{$company_info['partner']|default="无"}</td>
<td></td>
</tr>
<tr>
<td></td>
<td>联系人:</td>
<td></td>
<td>{$first_company_info['link_man']|default="无"}</td>
<td>联系人:</td>
<td>{$company_info['link_man']}</td>
<td>{$company_info['link_man']|default="无"}</td>
<td></td>
</tr>
<tr>
<td></td>
<td>联系电话:</td>
<td></td>
<td>{$first_company_info['link_phone']|default="无"}</td>
<td>联系电话:</td>
<td>{$company_info['link_phone']}</td>
<td>{$company_info['link_phone']|default="无"}</td>
<td></td>
</tr>
<tr>
<td></td>
<td>开票项目</td>
<td></td>
<td>{$relation['invoice_content']|default="无"}</td>
<td>邮寄地址</td>
<td></td>
<td>{$data['address']|default="无"}</td>
<td></td>
</tr>
<tr>
<td></td>
<td>发票类型</td>
<td></td>
<td>{$relation['invoice_type']|default="无"}</td>
<td>请汇入此账号</td>
<td>{$company_info['ali_account']}</td>
<td>{$company_info['ali_account']|default="无"}</td>
<td></td>
</tr>
<tr>
<td colspan="3"></td>
<td>户名</td>
<td>{$company_info['link_phone']}</td>
<td>{$company_info['link_phone']|default="无"}</td>
<td></td>
</tr>
<tr>
<td colspan="3"></td>
<td>账号</td>
<td>{$company_info['bank_account']}</td>
<td>{$company_info['bank_account']|default="无"}</td>
<td></td>
</tr>
<tr>
<td colspan="3"></td>
<td>开户行</td>
<td>{$company_info['opening_bank']}</td>
<td>{$company_info['opening_bank']|default="无"}</td>
<td></td>
</tr>
@ -477,8 +481,9 @@
var id = $(this).attr('data-id');
var start = $(this).attr('data-start');
var end = $(this).attr('data-end');
var company = $(this).attr('data-company');
var url = "{:U('withdrawOrderDetail','','')}" + '/relation_game_id/' + id + "/start/" + start + "/end/" + end;
var url = "{:U('withdrawOrderDetail','','')}" + '/relation_game_id/' + id + "/start/" + start + "/end/" + end + "/company_id/" + company;
window.location.href = url;
});

@ -154,7 +154,7 @@
<div class="form-group normal_space fr">
<select id="team_leader_id" name="team_leader_id" class="reselect select_gallery" style="min-width:130px;">
<option value="">会长账号</option>
<option value="0" <if condition="'0' eq $_GET['team_leader_id']"> selected="selected" </if>>江息网络</option>
<!-- <option value="0" <if condition="'0' eq $_GET['team_leader_id']"> selected="selected" </if>>江息网络</option>-->
<volist name=":getPromoteLists(1)" id="vo">
<option value="{$vo.id}" <if condition="$vo.id eq $_GET['team_leader_id']"> selected="selected" </if>>{$vo['account']}({$vo['real_name']})</option>
</volist>
@ -162,6 +162,8 @@
</div>
<input type="hidden" class="txt" name="relation_game_id" value="{:I('relation_game_id')}" >
<input type="hidden" class="txt" name="company_id" value="{:I('company_id')}" >
<div class="form-group normal_space fr">
<label class="form-title select-title" style="margin-right: 9px;"></label>

@ -1996,6 +1996,6 @@ ALTER TABLE `tab_forbit_ip`
ADD UNIQUE INDEX `userid_type`(`user_id`, `type`) COMMENT '用户id与类型唯一索引';
ALTER TABLE `platform`.`tab_promote`
ALTER TABLE `tab_promote`
ADD COLUMN `withdraw_show` tinyint(2) NOT NULL DEFAULT 0 COMMENT '推广员提现查看权限 1 有 0 无' AFTER `group_remark`,
ADD COLUMN `withdraw_done` tinyint(2) NOT NULL DEFAULT 0 COMMENT '推广员提现查看权限 1 有 0 无' AFTER `withdraw_show`;
Loading…
Cancel
Save