'1524'

app/controller/merchant/Order.php

@@ -143,7 +143,7 @@ class Order extends Base
             if (!is_array($param)) return error($param);
             $order = $this->mode->where("order_sn",$param['order'])->findOrEmpty();
             if ($order->isEmpty()) return error("订单数据异常");
-            $order->status = 3;
+            $order->status = 2;
             $order->express_status = 1;
             $order->refund_at = getDateFull();
             $state = $order->save();
@@ -159,4 +159,49 @@ class Order extends Base
         }
     }
 
+
+
+    /**
+     * 手动核销
+     * @param Request $request
+     * @return Response
+     */
+    #[Route(path: "end",methods: "post")]
+    public function setOrderEnd(Request $request): Response
+    {
+        try {
+            $param = $this->_valid([
+                "order.require" => trans("empty.require")
+            ],"post");
+            if (!is_array($param)) return error($param);
+            $order = $this->mode->where("order_sn",$param['order'])->findOrEmpty();
+            if ($order->isEmpty()) return error("订单数据异常");
+            return errorTrans("error.data");
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+    /**
+     * 手动呼叫快递
+     * @param Request $request
+     * @return Response
+     */
+    #[Route(path: "express",methods: "post")]
+    public function setOrderExpress(Request $request): Response
+    {
+        try {
+            $param = $this->_valid([
+                "order.require" => trans("empty.require")
+            ],"post");
+            if (!is_array($param)) return error($param);
+            $order = $this->mode->where("order_sn",$param['order'])->findOrEmpty();
+            if ($order->isEmpty()) return error("订单数据异常");
+            return errorTrans("error.data");
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
 }

app/controller/mini/Confirm.php

@@ -82,8 +82,8 @@ class Confirm extends Base
             $param['agent_id'] = $orderLife['agent_id'];
             $param['product_id'] = $orderLife['out_id'];
             $param['product_name'] = $orderLife['product_name'];
-            $param['status'] = 1;
-            $param['express_status'] = 0;
+            $param['status'] = ($param['service_type']==1?2:1);
+            $param['express_status'] = ($param['service_type']==1?1:0);
             $param['username'] = $address['username']??'';
             $param['mobile'] = $address['mobile']??'';
             $param['region'] = $address['region']??'';
@@ -98,8 +98,6 @@ class Confirm extends Base
             $param['lock_key'] = strtoupper(CodeExtend::random(18,3));
             // 锁码
             $resp = (new DouyinOrder)->config($this->getDyConfig())->token()->orderLock(2,$param['order'],$param['certificate_id'],$param['lock_key']);
-            echo getDateFull()."====提交预约-加锁\n";
-            print_r($resp);
             if ($resp['err_no'] <> 0) return error("订单数据异常");
             $orderLife->status = 2;
             $orderLife->save();