diff --git a/Application/Admin/Model/TransferMerchantModel.class.php b/Application/Admin/Model/TransferMerchantModel.class.php index ab36f8345..3328f61ad 100644 --- a/Application/Admin/Model/TransferMerchantModel.class.php +++ b/Application/Admin/Model/TransferMerchantModel.class.php @@ -38,5 +38,14 @@ class TransferMerchantModel extends Model $item["is_free_str"] = self::IS_FREE_STR[$item["is_free"]]; return $item; } + + public function getUnderPaymentConfig() + { + $res = $this->where("ways = 1 or ways = 3")->field("config")->find(); + if($res){ + return json_decode($res['config'],true); + } + return false; + } } \ No newline at end of file diff --git a/Application/Payment/Controller/ExcelPaymentController.class.php b/Application/Payment/Controller/ExcelPaymentController.class.php index ecf88ab41..95b24655c 100644 --- a/Application/Payment/Controller/ExcelPaymentController.class.php +++ b/Application/Payment/Controller/ExcelPaymentController.class.php @@ -346,12 +346,13 @@ class ExcelPaymentController extends BaseController } $count = M("ExcelStatementInfo","tab_")->field("sum(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(); @@ -362,7 +363,7 @@ class ExcelPaymentController extends BaseController if(empty(C("ALI_PAYMENT"))){ $money = "测试站无法查看"; }else{ - $fund = new \Fund(C("ALI_PAYMENT")); + $fund = new \Fund(D("Admin/TransferMerchant")->getUnderPaymentConfig()); $money = $fund->account(); if($money !== -1){ $money = $money['amount']; @@ -392,7 +393,7 @@ class ExcelPaymentController extends BaseController } Vendor("Alipay2020/Fund"); - $fund = new \Fund(C("ALI_PAYMENT")); + $fund = new \Fund(D("Admin/TransferMerchant")->getUnderPaymentConfig()); $dbres = M("ExcelStatementInfo", "tab_")->where("id='{$id}'")->find(); $company_info = json_decode($dbres['company_info'], true);