'1425'

app/controller/merchant/Order.php

@@ -86,4 +86,10 @@ class Order extends Base
         }
     }
 
+
+    public function setOrderAgree()
+    {
+
+    }
+
 }

app/controller/mini/Notify.php

@@ -23,8 +23,8 @@ class Notify extends Base
      * @param Request $request
      * @return Response
      */
-    #[Route(path: "hook",methods: "post")]
-    public function webhook(Request $request): Response
+    #[Route(path: "hook/{id}",methods: "post")]
+    public function webhook(Request $request,$id): Response
     {
         try {
             $param = $request->post();

app/controller/mini/Order.php

@@ -257,6 +257,7 @@ class Order extends Base
             $order = (new SaasOrder)->where("order_sn",$param['order'])->findOrEmpty();
             if ($order->isEmpty()) return error("订单数据异常");
             if ($order['open_id'] <> $request->user['open_id']) return error("订单数据异常");
+            if ($order['express_status'] == 4) return error("该订单正在撤销审核中，不允许删除！");
             $state = $order->delete();
             if (!$state) return error("删除失败");
             return success("删除成功");