diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 7adebc73c..806a852b6 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -541,8 +541,10 @@ class CompanyStatementController extends ThinkController } if($k=="ups" || $k=='downs'){ $is_payment = 1; + $verify_status = 0; }else{ $is_payment = 2; + $verify_status = 2; } //创建基础未满基础信息 @@ -607,7 +609,8 @@ class CompanyStatementController extends ThinkController "statement_begin_time"=>$v['statement_begin_time'], "statement_end_time"=>$v['statement_end_time'], "statement_info"=>json_encode($va['statement_info'],JSON_UNESCAPED_UNICODE), - "statement_num"=>$va['statement_num'] + "statement_num"=>$va['statement_num'], + "verify_status"=>$verify_status ]; $companyid = $StatementInfo->add($company); $v['info_ids'][] =$companyid; diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index d590e0fd5..7def57060 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -210,7 +210,7 @@ class CompanyStatementLackController extends ThinkController //保存公司信息 $company_list = $v['company_list']; foreach ($company_list as $ke => $va) { - $this->addStatementInfo($va,$ke,$v); + $this->addStatementInfo($va,$ke,$v,$k); } if(empty($v['create_lack_ids']) && empty($v['del_lack_ids']) && empty($v['info_ids'])){ continue;} @@ -238,7 +238,13 @@ class CompanyStatementLackController extends ThinkController "info"=>"汇总成功" )); } - protected function addStatementInfo($va,$ke,&$v){ + protected function addStatementInfo($va,$ke,&$v,$k){ + if($k=="ups" || $k=='downs' || $k =="users"){ + $verify_status = 0; + }else{ + $verify_status = 2; + } + $StatementInfo = M("company_statement_info","tab_"); if($va['pay_amount'] > 0){ //存成功 @@ -257,7 +263,8 @@ class CompanyStatementLackController extends ThinkController "statement_begin_time"=>$v['statement_begin_time'], "statement_end_time"=>$v['statement_end_time'], "statement_info"=>json_encode($va['statement_info'],JSON_UNESCAPED_UNICODE), - "statement_num"=>$va['statement_num'] + "statement_num"=>$va['statement_num'], + "verify_status"=>$verify_status ]; $companyid = $StatementInfo->add($company); $v['info_ids'][] =$companyid; diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index b9545acf8..47b81c0e8 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -90,7 +90,8 @@ class CompanyStatementPoolController extends ThinkController $data = $this->DBModel ->field("*") ->where($map) - ->order("op_time Desc")->page($page,$row)->select(); + ->order("FIELD(verify_status,0,1,-1,-2,2,3,4,5),id desc") + ->page($page,$row)->select(); foreach($data as $k => &$v) { $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); @@ -394,7 +395,24 @@ class CompanyStatementPoolController extends ThinkController public function verifyRefuse(){ $this->setVerifyStatus(0,-1,"verify"); } + //线下打款 + public function setUlPayment() + { + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + //修改info + $ires = M("company_statement_info","tab_")->where("pool_id='{$ids}'")->save(['pay_type'=>3,'pay_status'=>1]); + if($ires !== false){ + $this->setVerifyStatus(1,4,"payment"); + } + $this->ajaxReturn(array( + 'status' =>0, + "info"=>"线下打款失败" + )); + + + } protected function setVerifyStatus($old_status,$change_status,$op_pre) { if(!isset($_REQUEST['ids'])) $this->error("参数错误"); @@ -416,6 +434,28 @@ class CompanyStatementPoolController extends ThinkController "info"=>$opname."成功" )); } + //打款设置 + public function setPayment(){ + if(!isset($_REQUEST['id'])) $this->error("参数错误"); + $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,p.statement_num,i.remark,p.statement_money all_money") + ->join("tab_company_statement_pool p ON p.id = i.pool_id") + ->where("pool_id='{$id}'") + ->select(); + foreach($CompanyInfo as $k=>&$v){ + $v['company_info'] = json_decode($v['company_info'],true); + $v['company_info']['ali_user'] ?? ''; + $v['company_info']['ali_account'] ?? ''; + } + + $this->assign("CompanyInfo",$CompanyInfo); + $this->display(); + + + } + //保存备注 public function saveRemark(){ if(!isset($_REQUEST['id'])) $this->error("参数错误"); @@ -659,7 +699,7 @@ class CompanyStatementPoolController extends ThinkController M()->commit(); $this->ajaxReturn(array( 'status' => 1, - "info"=>"重算金额成功" + "info"=>"撤销汇总成功" )); } @@ -694,6 +734,8 @@ class CompanyStatementPoolController extends ThinkController "viewVoucher"=>"查看凭证", "editVoucher"=>" 编辑凭证", + "setUlPayment"=>"线下打款", + "setPayment"=>"打款信息提交", "editPayment"=>"打款信息编辑", "viePayment"=>"打款详情", @@ -711,7 +753,7 @@ class CompanyStatementPoolController extends ThinkController $optist = ["viewPool","reCount","cancelPool"]; break; case '1': - $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","setPayment"]; + $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","setPayment","setUlPayment"]; break; case '2': $optist = ["viewPool","addRemark","viewRemark","editRemark","viewVoucher","editVoucher","uploadVoucher","editPayment"]; @@ -755,6 +797,13 @@ class CompanyStatementPoolController extends ThinkController }else{ $optist = array_diff($optist, ["uploadVoucher"]); } + + if($info['is_payment'] == 1){ + $optist = array_diff($optist, ["setUlPayment"]); + }else{ + $optist = array_diff($optist, ["setPayment","editPayment","viePayment"]); + } + if(empty($info['remark'])){ //未上传备注 $optist = array_diff($optist, ["editRemark", "viewRemark"]); diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 93bafa9ef..8ddba5ba4 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -818,7 +818,9 @@ class CompanyStatementSetController extends Controller { "nickname"=>$v['nickname'], "payee_name"=>$v['payee_name'], "bank_account"=>$v['bank_account'], - "opening_bank"=>$v['opening_bank'] + "opening_bank"=>$v['opening_bank'], + "ali_user"=>$v['ali_user'], + "ali_account"=>$v['ali_account'] ]; if($v['statement_money'] < 300){ $lackcompany =[ @@ -887,6 +889,11 @@ class CompanyStatementSetController extends Controller { "statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE), "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) ]; + if($v['is_payment'] == 1){ + $company['verify_status'] = 0; + }else{ + $company['verify_status'] = 2; + } $companyid = $StatementInfo->add($company); $countdata['info_ids'][] =$companyid; $countdata['del_lack_ids'] =array_merge($countdata['del_lack_ids'],$del_lack_ids); diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 50f4c3e9c..09f698766 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -398,11 +398,31 @@ }) //撤销汇总 - $(".cancelPool").on("click",function(){ + $(".cancelPool,.reCount").on("click",function(){ var id = $(this).data('id'); var url = "{:U('cancelPool')}"; cancelPoolAjax(url,{id:id}); }) + //线下打款 + $(".setUlPayment").on("click",function(){ + var id = $(this).data('id'); + var url = "{:U('setUlPayment')}"; + cancelPoolAjax(url,{ids:id}); + }) + $(".setPayment").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('setPayment')}"+"&id="+id + layer.open({ + type: 2, + title: "海南万盟天下科技有限公司", + shadeClose: true, + shade: 0.8, + area: ['70%', '80%'], + content: url + }); + }) + + function cancelPoolAjax(opurl,senddata){ //执行 $.ajax({ diff --git a/Application/Admin/View/CompanyStatementPool/setPayment.html b/Application/Admin/View/CompanyStatementPool/setPayment.html new file mode 100644 index 000000000..be1e93892 --- /dev/null +++ b/Application/Admin/View/CompanyStatementPool/setPayment.html @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号合作公司支付宝真实名称支付宝账号关联结算汇总单订单号金额(元)备注
{$key-0+1}{$vo.company_name}{$vo.statement_num}{$vo.statement_money}
合计:打款总金额:{$CompanyInfo[0]['all_money']}
+
+
+
+
+ 确认提交 +
+
+ + + + + + \ No newline at end of file diff --git a/Data/update.sql b/Data/update.sql index 3319e800d..77aa6438c 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1947,7 +1947,8 @@ CREATE TABLE `tab_company_statement_info` ( `statement_end_time` int(11) NOT NULL DEFAULT '0' COMMENT '对账截止时间', `statement_num` varchar(500) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '结算单号', `statement_info` text NOT NULL DEFAULT '' COMMENT '订单相关信息json', - `pay_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '审核状态 -1:打款失败 0:未打款 1:打款成功', + `verify_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '验证状态 -1:配置信息不全 0:信息未确认 1:允许打款 2:线下无需打款', + `pay_status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '打款状态 -1:打款失败 0:未打款 1:打款成功', `pay_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '支付完成时间', `pay_type` tinyint(2) NOT NULL DEFAULT '0' COMMENT '打款类型 1提现 2线上打款 3线下打款',