'0714-1916-c01'

app/controller/merchant/Order.php

@@ -68,7 +68,7 @@ class Order extends Base
             if (!is_array($param)) return error($param);
             $order = $this->model->where("out_order_no",$param['order'])->with(['product','poi','user'])->findOrEmpty();
             if ($order->isEmpty()) return errorTrans("empty.data");
-            if ($order['poi_id'] <> $request->user['store_id']) return errorTrans("empty.data");
+            if ($order['poi_id'] <> $request->user['store_id'] && $request->user['is_super'] == 0) return errorTrans("empty.data");
             $order['end_time'] = timeDiff(strtotime("+30 minutes",strtotime($order['create_at'])),time());
             return successTrans("success.data",$order->toArray());
         } catch (\Throwable $throwable) {
@@ -127,7 +127,7 @@ class Order extends Base
             if (!$state) return error("核销失败");
             return success("核销成功");
         } catch (\Throwable $throwable) {
-
+            return error($throwable->getMessage());
         }
     }