|
@@ -150,8 +150,12 @@ class Orders extends Api
|
|
|
'id'=>['require'],
|
|
|
]);
|
|
|
$user=$this->auth->getUser();
|
|
|
- Cache::remember("user_order_show_{$user['id']}",time(),86400);
|
|
|
- $this->success('',$this->orderDetail($data['id']));
|
|
|
+ $order=$this->orderDetail($data['id']);
|
|
|
+ $goodsBak=$order->info[0]->goodsBak;
|
|
|
+ if(!$goodsBak['goods']['is_fix']) {
|
|
|
+ Cache::remember("user_order_show_{$user['id']}", time(), 86400);
|
|
|
+ }
|
|
|
+ $this->success('',$order);
|
|
|
}
|
|
|
protected function orderDetail($orderId){
|
|
|
$order= Order::with(['info','info.refund','address','logistics','logistics.com'])->findOrFail($orderId);
|
|
@@ -288,7 +292,7 @@ class Orders extends Api
|
|
|
->where('order_no',$data['fix_order_no'])
|
|
|
->where('pay_time','>',$showTime)
|
|
|
->find();
|
|
|
- $goodsBak=$fixOrder->info[0]->goodsBak();
|
|
|
+ $goodsBak=$fixOrder->info[0]->goodsBak;
|
|
|
if(!$fixOrder||$goodsBak['goods']['is_fix']!=1){
|
|
|
$this->error('请完成维修订单支付');
|
|
|
}
|