作者 郭文星

1231

@@ -9,6 +9,7 @@ use app\api\controller\v1\Base; @@ -9,6 +9,7 @@ use app\api\controller\v1\Base;
9 use app\api\controller\Index; 9 use app\api\controller\Index;
10 use app\api\controller\v1\WxxcxPush; 10 use app\api\controller\v1\WxxcxPush;
11 use app\common\controller\Api; 11 use app\common\controller\Api;
  12 +use app\common\exception\UploadException;
12 use think\Db; 13 use think\Db;
13 14
14 /** 15 /**
@@ -1818,6 +1819,7 @@ class Car extends Base @@ -1818,6 +1819,7 @@ class Car extends Base
1818 //下单五分钟后五收取手续费 1819 //下单五分钟后五收取手续费
1819 $create_time=$order['create_time']; 1820 $create_time=$order['create_time'];
1820 $newtime=time()-$create_time; 1821 $newtime=time()-$create_time;
  1822 + try {
1821 1823
1822 if($newtime<300){ 1824 if($newtime<300){
1823 // print_r([$create_time,$newtime]); 1825 // print_r([$create_time,$newtime]);
@@ -1889,7 +1891,14 @@ class Car extends Base @@ -1889,7 +1891,14 @@ class Car extends Base
1889 'openid' => $userinfo['wx_xcx_openid'], 1891 'openid' => $userinfo['wx_xcx_openid'],
1890 ]; 1892 ];
1891 $f = \addons\epay\library\Service::submitOrder($params); 1893 $f = \addons\epay\library\Service::submitOrder($params);
1892 - $this->success("请求成功", $f); 1894 + $data=[
  1895 + "pay"=>$f,
  1896 + "commission_price"=>$neworder['commission_price'],
  1897 + ];
  1898 + $this->success("请求成功", $data);
  1899 + } catch (UploadException $e) {
  1900 + $this->error($e->getMessage());
  1901 + }
1893 } 1902 }
1894 1903
1895 } 1904 }