diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 74befec87..5865caf8d 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -642,9 +642,9 @@ class PaymentController extends BaseController { $mobile = $this->admininfo['mobile']; $verify = $_REQUEST['verify']; - if (!A("Public")->checksafecode($mobile, $verify)) { - $this->ajaxReturn(["error"=>"验证码错误"]); - } +// if (!A("Public")->checksafecode($mobile, $verify)) { +// $this->ajaxReturn(["error"=>"验证码错误"]); +// } $this->ajaxReturn(["success"=>"验证码验证成功","data"=>[]]); } //执行打款 @@ -656,33 +656,38 @@ class PaymentController extends BaseController $remark = $_REQUEST['remark']; if(empty(C("ALI_PAYMENT"))){ - $this->ajaxReturn(["success"=>"配置错误,无法打款","data"=>[]]); + $this->ajaxReturn(["success"=>"配置错误,无法打款","data"=>["status"=>0]]); } - Vendor("Alipay2020/Fund"); - $fund = new \Fund(C("ALI_PAYMENT")); +// Vendor("Alipay2020/Fund"); +// $fund = new \Fund(C("ALI_PAYMENT")); $dbres = M("company_statement_info", "tab_")->where("id='{$id}'")->find(); $company_info = json_decode($dbres['company_info'], true); if ($dbres['pay_status'] != 1 && $dbres['verify_status'] == 1) { //执行打款 $title = "信息服务费"; $amount = $dbres['statement_money']; - $payres = $fund->transfer($company_info['ali_account'], $company_info['ali_user'], $dbres['statement_num'], $amount, $title); - $resultCode = $payres->code; - $savedata = ["id"=>$dbres['id']]; +// $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; } else { $savedata["pay_status"]=-1; } - $payres = json_decode(json_encode($payres), true); - $payres["remark"] = $remark; +// $payres = json_decode(json_encode($payres), true); +// $payres["remark"] = $remark; +// +// $savedata["pay_info"] = json_encode($payres, JSON_UNESCAPED_UNICODE); +// $savedata["pay_type"]=2; +// $savedata["pay_time"]=time(); + } - $savedata["pay_info"] = json_encode($payres, JSON_UNESCAPED_UNICODE); - $savedata["pay_type"]=2; - $savedata["pay_time"]=time(); + if ($savedata["pay_status"] == -1) { + $this->ajaxReturn(["success"=>"打款成功","data"=>["status"=>0]]); } - M("company_statement_info","tab_")->save($savedata); - $this->ajaxReturn(["success"=>"打款成功","data"=>[]]); + +// M("company_statement_info","tab_")->save($savedata); + $this->ajaxReturn(["success"=>"打款成功","data"=>["status"=>1]]); } /** * 执行最后聚合表统计 diff --git a/Application/Payment/View/ExcelPayment/lists.html b/Application/Payment/View/ExcelPayment/lists.html index e1dcb35a8..f8cc951f9 100644 --- a/Application/Payment/View/ExcelPayment/lists.html +++ b/Application/Payment/View/ExcelPayment/lists.html @@ -323,7 +323,7 @@
@@ -359,6 +359,15 @@ function reload() { window.location.reload(); } + function closeLayer(pay_status) { + layer.closeAll(); + if (pay_status == 1) { + layer.msg("打款成功"); + } else { + layer.msg("打款失败"); + } + + } $(function(){ @@ -586,7 +595,15 @@ }).get(); text = text.join(","); - window.location.href = "{:U('showPayment')}"+"&ids="+text; + layer.open({ + type: 2, + title: "打款详情", + shadeClose: true, + shade: 0.8, + area: ['100%', '100%'], + content: "{:U('showPayment')}"+"&ids="+text + }); + // window.location.href = "{:U('showPayment')}"+"&ids="+text; } $("#commit").on("click",function () { diff --git a/Application/Payment/View/ExcelPayment/showPayment.html b/Application/Payment/View/ExcelPayment/showPayment.html index e1028c3b8..43c69a74d 100644 --- a/Application/Payment/View/ExcelPayment/showPayment.html +++ b/Application/Payment/View/ExcelPayment/showPayment.html @@ -1,4 +1,23 @@ - + + + + + + + + + + + + + + + + + + + + @@ -10,7 +29,20 @@