From 82ec19f862d7db3239116685a80e172829bb54c2 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 21 Feb 2024 16:54:48 +0800 Subject: [PATCH] =?UTF-8?q?edit=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/api/controllers/SigningController.php | 3 ++- modules/api/models/SigningForm.php | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/api/controllers/SigningController.php b/modules/api/controllers/SigningController.php index 1bca96b..4c0e7f1 100644 --- a/modules/api/controllers/SigningController.php +++ b/modules/api/controllers/SigningController.php @@ -18,7 +18,8 @@ class SigningController extends Controller 'login' => [ 'class' => LoginBehavior::className(), 'ignore' => [ - 'api/signing/signing-pay-notify' + 'api/signing/signing-pay-notify', +// 'api/signing/signing-detail', ] ] ]); diff --git a/modules/api/models/SigningForm.php b/modules/api/models/SigningForm.php index b4a845c..5883903 100644 --- a/modules/api/models/SigningForm.php +++ b/modules/api/models/SigningForm.php @@ -114,15 +114,23 @@ class SigningForm extends ApiModel public function orderDetail($orderNo) { - $order = Signing::find()->andWhere(['order_no' => $orderNo, 'user_id' => $this->user_id])->one()->toArray(); + $order = Signing::find()->andWhere(['order_no' => $orderNo, 'user_id' => $this->user_id])->one(); + if(empty($order)){ + return $this->apiReturnError('订单号错误'); + } + $order = $order->toArray(); +// $order = Signing::find()->andWhere(['order_no' => $orderNo])->one()->toArray(); if (!$order) { return $this->apiReturnError('订单号错误'); } - $order['goods'] = Goods::findOne($order['goods_id']); + $order['goods'] = Goods::findOne($order['goods_id'])->toArray(); +// $order['goods']['price'] = $order['moy']; - $order['goods_hub'] = GoodsHub::findOne($order['goods']['goods_hub_id']); + $order['goods_hub'] = GoodsHub::findOne($order['goods']['goods_hub_id'])->toArray(); + $order['goods_hub']['original_price'] = $order['moy']; + $order['goods_hub']['cost_price'] = $order['moy']; return $this->apiReturnSuccess('success', $order); }