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); }