app/Http/Controllers/Admin/Orders.php

@@ -418,6 +418,7 @@ class Orders extends Auth{
         // 查询数据
         $list					= $OrdersProduct->query()
             ->join('custom','orders_product.custom_uid','=','custom.uid')
+            ->join('orders','orders_product.order_id','=','orders.id')
             ->join('orders_addr','orders_addr.order_id','=','orders_product.order_id');
         if ( $shopIds )    		$list =   $list->whereIn('orders_product.business_id',$shopIds);
         $list                   = $list->where($map)
@@ -446,6 +447,7 @@ class Orders extends Auth{
                 'orders_product.pay_total',
                 'orders_product.insert_time',
                 'custom.weiban_extid as weiban_extid',
+                'orders.is_pay as is_pay',
             ])
             ->get()->toArray();
         $data       =   [];
@@ -481,6 +483,7 @@ class Orders extends Auth{
                 'pay_total'		    => $value['pay_total'],
                 'weiban_extid'		=> $value['weiban_extid'],
                 'insert_time'		=> date('Y-m-d H:i:s',$value['insert_time']),
+                'is_pay'		    => $value['is_pay'] ? '支付' : '预约',
             ];
         }
 		try {
@@ -525,6 +528,7 @@ class Orders extends Auth{
                 '产品金额',
                 '微伴ID',
                 '下单时间',
+                '订单类型',
             ];
             $filePath = $excel->fileName('tutorial01.xlsx', 'sheet1')
                 ->header($header)

app/Http/Controllers/Admin/OrdersReceipt.php

@@ -130,8 +130,16 @@ class OrdersReceipt extends Auth{
 				$result				= $Model->edit($id,['status'=>$status,'remark'=>$remark,'admin_uid'=>admin('uid')]);
 				// 提示新增失败
 				if( !$result )		return json_send(['code'=>'error','msg'=>'操作失败']);
-				// 恢复订单进行中
-				$result				= $Orders->setOrderStatus($oldData['order_id'],1,$OrdersProduct);
+                $ordersInfo         = $Orders->where(['id'=>$oldData['order_id']])->first();
+                if (!$ordersInfo)   return json_send(['code'=>'error','msg'=>'操作失败,订单不存在']);
+                $ordersInfo         = $ordersInfo->toArray();
+                if ($ordersInfo['is_pay']){
+                    // 恢复订单待收货
+                    $result				= $Orders->setOrderStatus($oldData['order_id'],2,$OrdersProduct);
+                }else{
+                    // 恢复订单进行中
+                    $result				= $Orders->setOrderStatus($oldData['order_id'],1,$OrdersProduct);
+                }
 				// 提示新增失败
 				if( isset($result['error']) ){
 					// 回退数据