From 2d5d59586aba1a5094202970164a7a3208b3c479 Mon Sep 17 00:00:00 2001 From: devil Date: Sun, 16 Aug 2020 12:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/OrderService.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/application/service/OrderService.php b/application/service/OrderService.php index 0f9487919..3e7fba2f0 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -2041,15 +2041,22 @@ class OrderService } // 获取订单状态 - $where = ['order_no'=>$params['order_no'], 'user_id'=>$params['user']['id']]; - $order = Db::name('Order')->where($where)->field('id,pay_status')->find(); - if(empty($order)) + $where = ['log_no'=>$params['order_no'], 'user_id'=>$params['user']['id']]; + $pay_log = Db::name('PayLog')->where($where)->field('id,status')->find(); + if(empty($pay_log)) { - return DataReturn('订单不存在', -400, ['url'=>__MY_URL__]); + return DataReturn('支付订单不存在', -400, ['url'=>__MY_URL__]); } - if($order['pay_status'] == 1) + if($pay_log['status'] == 1) { - return DataReturn('支付成功', 0, ['url'=>MyUrl('index/order/detail', ['id'=>$order['id']])]); + $pay_log_value = Db::name('PayLogValue')->where(['pay_log_id'=>$pay_log['id']])->column('business_id'); + if(empty($pay_log_value) || count($pay_log_value) > 1) + { + $url = MyUrl('index/order/index'); + } else { + $url = MyUrl('index/order/detail', ['id'=>$pay_log_value[0]]); + } + return DataReturn('支付成功', 0, ['url'=>$url]); } return DataReturn('支付中', -300); }