Merge branch 'feature/promote_withdraw' into feature/platfrom_aggregate_finance

master
zhengyongxing 4 years ago
commit 846264600e

@ -24,6 +24,15 @@ class WithdrawController extends BaseController
$row=10;
if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
$id = get_pid();
$safePwd = M('promote','tab_')->where(['id'=>$id])->field('second_pwd')->find();
if(empty($safePwd['second_pwd'])) {
$this->display('Public/setSafePwd');
exit;
}
$map = [];
$map["promote.id"] = get_pid();
@ -90,7 +99,12 @@ class WithdrawController extends BaseController
public function doPayment()
{
$id = get_pid();
$safePwd = M('promote','tab_')->where(['id'=>$id])->field('second_pwd')->find();
if(empty($safePwd['second_pwd'])) {
$this->display('Public/setSafePwd');
exit;
}
$id = $_REQUEST['id'];
$remark = $_REQUEST['remark'];
@ -106,7 +120,7 @@ class WithdrawController extends BaseController
//执行打款
$title = "测试-".$dbres['company_name']."结算";
$amount = $dbres['statement_money'];
// $amount = 0.1;//测试金额为0
$amount = 0.1;//测试金额为0
$payres = $fund->transfer($company_info['ali_account'],$company_info['ali_user'],$dbres['statement_num'],$amount, $title);
$resultCode = $payres->code;
@ -167,6 +181,13 @@ class WithdrawController extends BaseController
public function withdrawDetail() {
$id = get_pid();
$safePwd = M('promote','tab_')->where(['id'=>$id])->field('second_pwd')->find();
if(empty($safePwd['second_pwd'])) {
$this->display('Public/setSafePwd');
exit;
}
$id = $_REQUEST["id"];
$dbres = M("company_statement_info","tab_")
@ -222,6 +243,13 @@ class WithdrawController extends BaseController
public function withdrawOrderDetail($p=0) {
$id = get_pid();
$safePwd = M('promote','tab_')->where(['id'=>$id])->field('second_pwd')->find();
if(empty($safePwd['second_pwd'])) {
$this->display('Public/setSafePwd');
exit;
}
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据
$row=10;

Loading…
Cancel
Save