|
|
@@ -204,6 +204,7 @@ class Order extends Base
|
|
|
$refund_state = input('get.apply_refund',-1);
|
|
|
$where = [];
|
|
|
$where[] = ['user_id','=',$this->user_id];
|
|
|
+ $where[] = ['is_deleted','=',0];
|
|
|
if($status > -1) $where[] = ['status','=',$status];
|
|
|
if($pay_state > -1) $where[] = ['pay_state','=',$pay_state];
|
|
|
if($cancel_state > -1) $where[] = ['cancel_state','=',$cancel_state];
|
|
|
@@ -265,6 +266,7 @@ class Order extends Base
|
|
|
{
|
|
|
$order_id = input('get.order_id');
|
|
|
$detail = GoodsOrder::where('id',$order_id)->find()->toArray();
|
|
|
+ if($detail['is_deleted'] == 1) $this->error('订单已删除');
|
|
|
$detail['order_item'] = (new GoodsOrderItem())->getOrderItem($order_id);
|
|
|
$this->success('ok',['detail'=>$detail]);
|
|
|
}
|
