正在显示
1 个修改的文件
包含
38 行增加
和
10 行删除
@@ -1816,13 +1816,11 @@ class Car extends Base | @@ -1816,13 +1816,11 @@ class Car extends Base | ||
1816 | $order = Db::name("order")->where("id", $id)->find(); | 1816 | $order = Db::name("order")->where("id", $id)->find(); |
1817 | $departure_time=substr($reservation_time,0,16); | 1817 | $departure_time=substr($reservation_time,0,16); |
1818 | $refund_time=substr($order['reservation_time'],0,16); | 1818 | $refund_time=substr($order['reservation_time'],0,16); |
1819 | -//下单五分钟后五收取手续费 | 1819 | + //下单五分钟后五收取手续费 |
1820 | $create_time=$order['create_time']; | 1820 | $create_time=$order['create_time']; |
1821 | $newtime=time()-$create_time; | 1821 | $newtime=time()-$create_time; |
1822 | try { | 1822 | try { |
1823 | - | ||
1824 | if($newtime<300){ | 1823 | if($newtime<300){ |
1825 | -// print_r([$create_time,$newtime]); | ||
1826 | $pay_fee = $order['price']; | 1824 | $pay_fee = $order['price']; |
1827 | $rebook_fee = 0; | 1825 | $rebook_fee = 0; |
1828 | $res = Db::name("order")->where("id",$id)->update([ | 1826 | $res = Db::name("order")->where("id",$id)->update([ |
@@ -1838,7 +1836,6 @@ class Car extends Base | @@ -1838,7 +1836,6 @@ class Car extends Base | ||
1838 | ]; | 1836 | ]; |
1839 | $this->success("111请求成功", $data); | 1837 | $this->success("111请求成功", $data); |
1840 | }else { | 1838 | }else { |
1841 | - | ||
1842 | $refund_time=strtotime($refund_time); | 1839 | $refund_time=strtotime($refund_time); |
1843 | $newrefund_time=$refund_time-time(); | 1840 | $newrefund_time=$refund_time-time(); |
1844 | if($newrefund_time<0){ | 1841 | if($newrefund_time<0){ |
@@ -1891,14 +1888,12 @@ class Car extends Base | @@ -1891,14 +1888,12 @@ class Car extends Base | ||
1891 | "rebook"=>1, | 1888 | "rebook"=>1, |
1892 | "order_no" => getOrderSn(), | 1889 | "order_no" => getOrderSn(), |
1893 | "reservation_time" => $reservation_time, | 1890 | "reservation_time" => $reservation_time, |
1894 | - //"create_time"=>time() | ||
1895 | ]); | 1891 | ]); |
1896 | $neworder=Db::name("order")->where("id", $id)->find(); | 1892 | $neworder=Db::name("order")->where("id", $id)->find(); |
1897 | $userinfo = Db::name('user') | 1893 | $userinfo = Db::name('user') |
1898 | ->where(['id' => $this->auth->id]) | 1894 | ->where(['id' => $this->auth->id]) |
1899 | ->field('id,wx_xcx_openid') | 1895 | ->field('id,wx_xcx_openid') |
1900 | ->find(); | 1896 | ->find(); |
1901 | - | ||
1902 | $notifyURI = $this->doman . '/addons/epay/api/OrderPayNtf'; | 1897 | $notifyURI = $this->doman . '/addons/epay/api/OrderPayNtf'; |
1903 | $params = [ | 1898 | $params = [ |
1904 | 'amount' => $neworder['commission_price'], | 1899 | 'amount' => $neworder['commission_price'], |
@@ -1918,7 +1913,6 @@ class Car extends Base | @@ -1918,7 +1913,6 @@ class Car extends Base | ||
1918 | $this->error($e->getMessage()); | 1913 | $this->error($e->getMessage()); |
1919 | } | 1914 | } |
1920 | } | 1915 | } |
1921 | - | ||
1922 | /** | 1916 | /** |
1923 | * 改签价格计算 | 1917 | * 改签价格计算 |
1924 | * @return void | 1918 | * @return void |
@@ -1932,7 +1926,6 @@ class Car extends Base | @@ -1932,7 +1926,6 @@ class Car extends Base | ||
1932 | //下单五分钟后五收取手续费 | 1926 | //下单五分钟后五收取手续费 |
1933 | $create_time=$order['create_time']; | 1927 | $create_time=$order['create_time']; |
1934 | $newtime=time()-$create_time; | 1928 | $newtime=time()-$create_time; |
1935 | - | ||
1936 | try { | 1929 | try { |
1937 | if($newtime<300){ | 1930 | if($newtime<300){ |
1938 | // print_r([$create_time,$newtime]); | 1931 | // print_r([$create_time,$newtime]); |
@@ -1941,7 +1934,6 @@ class Car extends Base | @@ -1941,7 +1934,6 @@ class Car extends Base | ||
1941 | }else { | 1934 | }else { |
1942 | $refund_time=strtotime($refund_time); | 1935 | $refund_time=strtotime($refund_time); |
1943 | $newrefund_time=$refund_time-time(); | 1936 | $newrefund_time=$refund_time-time(); |
1944 | - | ||
1945 | if($newrefund_time<0){ | 1937 | if($newrefund_time<0){ |
1946 | $this->error("该订单无法改签,时间过期"); | 1938 | $this->error("该订单无法改签,时间过期"); |
1947 | } | 1939 | } |
@@ -1960,9 +1952,45 @@ class Car extends Base | @@ -1960,9 +1952,45 @@ class Car extends Base | ||
1960 | }else if($newrefund_time>43200){ | 1952 | }else if($newrefund_time>43200){ |
1961 | $pay_fee = $order['price']; | 1953 | $pay_fee = $order['price']; |
1962 | $rebook_fee = 0; | 1954 | $rebook_fee = 0; |
1963 | - | ||
1964 | } | 1955 | } |
1965 | } | 1956 | } |
1957 | + if($rebook_fee>0){ | ||
1958 | + $res = Db::name("order")->where("id",$id)->update([ | ||
1959 | + "commission_price"=>$rebook_fee, | ||
1960 | + "rebook"=>1, | ||
1961 | + "order_no" => getOrderSn(), | ||
1962 | + "reservation_time" => $reservation_time, | ||
1963 | + ]); | ||
1964 | + $neworder=Db::name("order")->where("id", $id)->find(); | ||
1965 | + $userinfo = Db::name('user') | ||
1966 | + ->where(['id' => $this->auth->id]) | ||
1967 | + ->field('id,wx_xcx_openid') | ||
1968 | + ->find(); | ||
1969 | + $notifyURI = $this->doman . '/addons/epay/api/OrderPayNtf'; | ||
1970 | + $params = [ | ||
1971 | + 'amount' => $neworder['commission_price'], | ||
1972 | + 'orderid' => $neworder['order_no'], | ||
1973 | + 'type' => 'wechat', | ||
1974 | + 'notifyurl' => $notifyURI, | ||
1975 | + 'method' => 'miniapp', | ||
1976 | + 'openid' => $userinfo['wx_xcx_openid'], | ||
1977 | + ]; | ||
1978 | + $f = \addons\epay\library\Service::submitOrder($params); | ||
1979 | + $data=[ | ||
1980 | + "pay"=>$f, | ||
1981 | + "commission_price"=>$neworder['commission_price'], | ||
1982 | + ]; | ||
1983 | + $this->success("111请求成功", $data); | ||
1984 | + }else{ | ||
1985 | + $res = Db::name("order") | ||
1986 | + ->where("id",$id) | ||
1987 | + ->update([ | ||
1988 | + "commission_price"=>$rebook_fee, | ||
1989 | + "rebook"=>1, | ||
1990 | + "order_no" => getOrderSn(), | ||
1991 | + "create_time"=>time() | ||
1992 | + ]); | ||
1993 | + } | ||
1966 | $data=["rebook_fee"=>$rebook_fee]; | 1994 | $data=["rebook_fee"=>$rebook_fee]; |
1967 | $this->success("111请求成功", $data); | 1995 | $this->success("111请求成功", $data); |
1968 | } catch (UploadException $e) { | 1996 | } catch (UploadException $e) { |
-
请 注册 或 登录 后发表评论