Browse Source

小程序app-订单详情

xupuyuan 10 months ago
parent
commit
9c2bc7cd00

+ 3 - 0
app/common/repositories/store/order/StoreOrderRepository.php

@@ -2702,6 +2702,9 @@ class StoreOrderRepository extends BaseRepository
2702 2702
         }
2703 2703
         $pay_time = isset($data->pay_time) ?? $data['pay_time'];
2704 2704
         $data['take_order_time'] = strtotime($pay_time) + $time;
2705
+        if ($query->order_type == 1) {
2706
+            $query->append(['take']);
2707
+        }
2705 2708
         return $data;
2706 2709
     }
2707 2710
 

+ 3 - 3
app/controller/api/store/order/StoreOrder.php

@@ -963,9 +963,9 @@ class StoreOrder extends BaseController
963 963
 //        $order = $this->repository->getDetail((int)$id, $this->request->uid());
964 964
         if (!$order)
965 965
             return app('json')->fail('订单不存在');
966
-        if ($order->order_type == 1) {
967
-            $order->append(['take']);
968
-        }
966
+//        if ($order->order_type == 1) {
967
+//            $order->append(['take']);
968
+//        }
969 969
         return app('json')->success($order->toArray());
970 970
 //        $query = Db::name('store_order')
971 971
 //            ->where('order_sn', $id)