优化线下打款

master
chenzhi 4 years ago
parent 5a303a6a7a
commit 44ceb3ead3

@ -38,5 +38,14 @@ class TransferMerchantModel extends Model
$item["is_free_str"] = self::IS_FREE_STR[$item["is_free"]]; $item["is_free_str"] = self::IS_FREE_STR[$item["is_free"]];
return $item; 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;
}
} }

@ -346,12 +346,13 @@ class ExcelPaymentController extends BaseController
} }
$count = M("ExcelStatementInfo","tab_")->field("sum(statement_money) statement_money")->where("id in ({$ids})")->find(); $count = M("ExcelStatementInfo","tab_")->field("sum(statement_money) statement_money")->where("id in ({$ids})")->find();
$paymentInfo = D("Admin/TransferMerchant")->getUnderPaymentInfo();
$this->getAccountMoney(); $this->getAccountMoney();
// dd($CompanyInfo);
$this->assign("CompanyInfo",$CompanyInfo); $this->assign("CompanyInfo",$CompanyInfo);
$this->assign("mobile",$this->admininfo['mobile']); $this->assign("mobile",$this->admininfo['mobile']);
$this->assign("count",$count); $this->assign("count",$count);
$this->assign("paymentInfo",$paymentInfo);
$this->display(); $this->display();
// $this->display(); // $this->display();
@ -362,7 +363,7 @@ class ExcelPaymentController extends BaseController
if(empty(C("ALI_PAYMENT"))){ if(empty(C("ALI_PAYMENT"))){
$money = "测试站无法查看"; $money = "测试站无法查看";
}else{ }else{
$fund = new \Fund(C("ALI_PAYMENT")); $fund = new \Fund(D("Admin/TransferMerchant")->getUnderPaymentConfig());
$money = $fund->account(); $money = $fund->account();
if($money !== -1){ if($money !== -1){
$money = $money['amount']; $money = $money['amount'];
@ -392,7 +393,7 @@ class ExcelPaymentController extends BaseController
} }
Vendor("Alipay2020/Fund"); Vendor("Alipay2020/Fund");
$fund = new \Fund(C("ALI_PAYMENT")); $fund = new \Fund(D("Admin/TransferMerchant")->getUnderPaymentConfig());
$dbres = M("ExcelStatementInfo", "tab_")->where("id='{$id}'")->find(); $dbres = M("ExcelStatementInfo", "tab_")->where("id='{$id}'")->find();
$company_info = json_decode($dbres['company_info'], true); $company_info = json_decode($dbres['company_info'], true);

Loading…
Cancel
Save