diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 05b1d5812..a38362616 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -1261,31 +1261,37 @@ class PaymentController extends BaseController } $count = M("pay_statement_info","tab_")->field("sum(final_statement_money) statement_money")->where("id in ({$ids})")->find(); + $paymentInfo = D("Admin/TransferMerchant")->getUnderPaymentInfo(); $this->getAccountMoney(); // dd($CompanyInfo); $this->assign("CompanyInfo",$CompanyInfo); $this->assign("mobile",$this->admininfo['mobile']); $this->assign("count",$count); + $this->assign("paymentInfo",$paymentInfo); $this->display(); // $this->display(); } public function getAccountMoney(){ + Vendor("Alipay2020/Fund"); + $isCanPayment = true; if(empty(C("ALI_PAYMENT"))){ + $isCanPayment = false; $money = "测试站无法查看"; }else{ - $fund = new \Fund(C("ALI_PAYMENT")); + $fund = new \Fund(D("Admin/TransferMerchant")->getStatementPaymentConfig()); $money = $fund->account(); if($money !== -1){ $money = $money['amount']; }else{ + $isCanPayment = false; $money = "--"; } } - + $this->assign("isCanPayment",$isCanPayment); $this->assign("money",$money); } //以下打款流程 @@ -1308,7 +1314,7 @@ class PaymentController extends BaseController $this->ajaxReturn(["success"=>"配置错误,无法打款","data"=>["status"=>0]]); } Vendor("Alipay2020/Fund"); - $fund = new \Fund(C("ALI_PAYMENT")); + $fund = new \Fund(D("Admin/TransferMerchant")->getStatementPaymentConfig()); $dbres = M("pay_statement_info", "tab_")->where("id='{$id}'")->find(); $company_statement = M("company_statement_info", "tab_")->field("pay_check")->where(['id'=>$dbres['statement_info_id']])->find(); diff --git a/Application/Payment/View/ExcelPayment/showPayment.html b/Application/Payment/View/ExcelPayment/showPayment.html index d1680acfa..ba09f164e 100644 --- a/Application/Payment/View/ExcelPayment/showPayment.html +++ b/Application/Payment/View/ExcelPayment/showPayment.html @@ -171,20 +171,21 @@ 支付宝账号:{$paymentInfo['account']} 接口类型:{$paymentInfo['is_free_str']} - -