elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/change_statement_time' of wmtx/platform into release

Browse Source
master
陈志 4 years ago committed by Gogs
parent 281bcc7638 51fb6a3ebd
commit e8e9035c08
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File

39
Application/Payment/Controller/ExcelPaymentController.class.php
Unescape Escape View File

@ -307,12 +307,16 @@ class ExcelPaymentController extends BaseController
}
public function getAccountMoney(){
Vendor("Alipay2020/Fund");
$fund = new \Fund(C("ALI_PAYMENT"));
$money = $fund->account();
if($money !== -1){
$money = $money['amount'];
if(empty(C("ALI_PAYMENT"))){
$money = "测试站无法查看";
}else{
$money = "--";
$fund = new \Fund(C("ALI_PAYMENT"));
$money = $fund->account();
if($money !== -1){
$money = $money['amount'];
}else{
$money = "--";
}
}
$this->assign("money",$money);
}
@ -331,41 +335,44 @@ class ExcelPaymentController extends BaseController
{
$id = $_REQUEST['id'];
$remark = $_REQUEST['remark'];
if (empty(C("ALI_PAYMENT"))) {
$this->ajaxReturn(["success"=>"配置错误，无法打款","data"=>[]]);
}
Vendor("Alipay2020/Fund");
$fund = new \Fund(C("ALI_PAYMENT"));
$dbres = M("ExcelStatementInfo","tab_")->where("id='{$id}'")->find();
$company_info = json_decode($dbres['company_info'],true);
$dbres = M("ExcelStatementInfo", "tab_")->where("id='{$id}'")->find();
$company_info = json_decode($dbres['company_info'], true);
if($dbres['pay_status'] != 1){
if ($dbres['pay_status'] != 1) {
//执行打款
$title = $remark;
$amount = $dbres['statement_money'];
$payres = $fund->transfer($company_info['ali_account'],$company_info['ali_user'],$dbres['statement_num'],$amount, $title);
$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){
if (!empty($resultCode)&&$resultCode == 10000) {
$savedata["pay_status"]=1;
} else {
$savedata["pay_status"]=-1;
}
$payres = json_decode( json_encode($payres),true);
$payres = json_decode(json_encode($payres), true);
$payres["remark"] = $remark;
$savedata["pay_info"] = json_encode($payres,JSON_UNESCAPED_UNICODE);
$savedata["pay_info"] = json_encode($payres, JSON_UNESCAPED_UNICODE);
$savedata["pay_time"]=time();
$pu = [
"mobile"=>$this->admininfo['mobile'],
"real_name"=>$this->admininfo['real_name'],
"time"=>date("Y-m-d H:i:s")
];
$savedata['payment_user'] = json_encode($pu,JSON_UNESCAPED_UNICODE);
$savedata['payment_user'] = json_encode($pu, JSON_UNESCAPED_UNICODE);
}
M("ExcelStatementInfo","tab_")->save($savedata);
M("ExcelStatementInfo", "tab_")->save($savedata);
$this->ajaxReturn(["success"=>"打款成功","data"=>[]]);
}
/**
* 打款详情

40
Application/Payment/Controller/PaymentController.class.php
Unescape Escape View File

@ -406,13 +406,18 @@ class PaymentController extends BaseController
}
public function getAccountMoney(){
Vendor("Alipay2020/Fund");
$fund = new \Fund(C("ALI_PAYMENT"));
$money = $fund->account();
if($money !== -1){
$money = $money['amount'];
if(empty(C("ALI_PAYMENT"))){
$money = "测试站无法查看";
}else{
$money = "--";
$fund = new \Fund(C("ALI_PAYMENT"));
$money = $fund->account();
if($money !== -1){
$money = $money['amount'];
}else{
$money = "--";
}
}
$this->assign("money",$money);
}
//以下打款流程
@ -430,39 +435,34 @@ class PaymentController extends BaseController
{
$id = $_REQUEST['id'];
$remark = $_REQUEST['remark'];
if(empty(C("ALI_PAYMENT"))){
$this->ajaxReturn(["success"=>"配置错误，无法打款","data"=>[]]);
}
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){
$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);
$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){
if (!empty($resultCode)&&$resultCode == 10000) {
$savedata["pay_status"]=1;
} else {
$savedata["pay_status"]=-1;
}
$payres = json_decode( json_encode($payres),true);
$payres = json_decode(json_encode($payres), true);
$payres["remark"] = $remark;
$savedata["pay_info"] = json_encode($payres,JSON_UNESCAPED_UNICODE);
$savedata["pay_info"] = json_encode($payres, JSON_UNESCAPED_UNICODE);
$savedata["pay_type"]=2;
$savedata["pay_time"]=time();
}
M("company_statement_info","tab_")->save($savedata);
$this->ajaxReturn(["success"=>"打款成功","data"=>[]]);
# code...
}
/**
* 执行最后聚合表统计

Write Preview
Loading…
Cancel
Save