0426

app/controller/merchant/Order.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\controller\merchant;
+
+use app\extra\basic\Base;
+use app\extra\service\saas\OrderLogService;
+use app\extra\service\saas\OrderService;
+use app\middleware\AuthMiddleware;
+use DI\Attribute\Inject;
+use LinFly\Annotation\Route\Controller;
+use LinFly\Annotation\Route\Route;
+use support\Request;
+use support\Response;
+use Webman\Annotation\Middleware;
+
+
+#[Controller(prefix: "/api/merchant/order"),Middleware(AuthMiddleware::class)]
+class Order extends Base
+{
+
+    #[Inject]
+    protected OrderService $service;
+
+    #[Inject]
+    protected OrderLogService $log;
+
+
+    #[Route(path: "list",methods: "get")]
+    public function getOrderList(Request $request): Response
+    {
+        try {
+            $param = $request->get();
+            $param['agent'] = $request->user['agent_id'];
+            $list = $this->service->getList($param);
+            return successTrans("success.data",pageFormat($list),200);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+    #[Route(path: "log",methods: "get")]
+    public function getOrderLog(Request $request): Response
+    {
+        try {
+            $param = $request->get();
+            $list = $this->log->getList($param);
+            return successTrans("success.data",$list,200);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+}

app/controller/mini/Confirm.php

@@ -72,7 +72,7 @@ class Confirm extends Base
             if ($orderLife->isEmpty()) return errorTrans("empty.data");
             $order = (new SaasOrder)->where("order_id",$param['order'])->where("status","in",[1,2,4])->findOrEmpty();
             if (!$order->isEmpty()) return error("请勿重复提交");
-            $param['service_type'] = $orderLife['store']['service_type'];
+//            $param['service_type'] = $orderLife['store']['service_type'];
             $address = !empty($param['address']) ? json_decode($param['address'],true): [];
             $param['order_sn'] = CodeExtend::random(18,1,date("md"));
             $param['order_id'] = $param['order'];
@@ -83,6 +83,7 @@ class Confirm extends Base
             $param['product_id'] = $orderLife['out_id'];
             $param['product_name'] = $orderLife['product_name'];
             $param['status'] = 1;
+            $param['express_status'] = 0;
             $param['username'] = $address['username']??'';
             $param['mobile'] = $address['mobile']??'';
             $param['region'] = $address['region']??'';
@@ -92,8 +93,7 @@ class Confirm extends Base
             $param['certificate_id'] = $orderDetail['data']['certificate_info_list'][0]['certificate_id'];
             $param['lock_key'] = strtoupper(CodeExtend::random(18,3));
             // 锁码
-            $endTime = strtotime("+{$orderLife['store']['code_time']} day");
-            $resp = (new DouyinOrder)->config($this->getDyConfig())->token()->orderLock(2,$param['order'],$param['certificate_id'],$param['lock_key'],time(),$endTime);
+            $resp = (new DouyinOrder)->config($this->getDyConfig())->token()->orderLock(2,$param['order'],$param['certificate_id'],$param['lock_key']);
             if ($resp['err_no'] <> 0) return error("订单数据异常");
             $orderLife->status = 2;
             $orderLife->save();

app/controller/mini/Notify.php

@@ -51,11 +51,11 @@ class Notify extends Base
                                 "pay_at"        => date("Y-m-d H:i:s",$resp['order']['pay_time']),
                                 "status"        => 1
                             ]);
-                            (new SaasOrderLog)->insertGetId([
-                                "order_id"  => $resp['order']['order_id'],
-                                "title"     => "发起订单",
-                                "remark"    => "下单并完成支付"
-                            ]);
+//                            (new SaasOrderLog)->insertGetId([
+//                                "order_id"  => $resp['order']['order_id'],
+//                                "title"     => "发起订单",
+//                                "remark"    => "下单并完成支付"
+//                            ]);
                         }
                     }
                     $return = [];

app/controller/store/Order.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\controller\store;
+
+use app\extra\basic\Base;
+use app\extra\service\saas\OrderLogService;
+use app\extra\service\saas\OrderService;
+use app\middleware\AuthMiddleware;
+use DI\Attribute\Inject;
+use LinFly\Annotation\Route\Controller;
+use LinFly\Annotation\Route\Route;
+use support\Request;
+use support\Response;
+use Webman\Annotation\Middleware;
+
+
+#[Controller(prefix: "/api/store/order"),Middleware(AuthMiddleware::class)]
+class Order extends Base
+{
+
+    #[Inject]
+    protected OrderService $service;
+
+    #[Inject]
+    protected OrderLogService $log;
+
+
+    #[Route(path: "list",methods: "get")]
+    public function getOrderList(Request $request): Response
+    {
+        try {
+            $param = $request->get();
+            $param['store'] = $request->user['store_id'];
+            $list = $this->service->getList($param);
+            return successTrans("success.data",pageFormat($list),200);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+    #[Route(path: "log",methods: "get")]
+    public function getOrderLog(Request $request): Response
+    {
+        try {
+            $param = $request->get();
+            $list = $this->log->getList($param);
+            return successTrans("success.data",$list,200);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+
+}

app/extra/service/saas/OrderService.php

@@ -48,7 +48,7 @@ class OrderService extends Service
         !empty($param['open_id']) && $filter[] = ["open_id", '=', $param['open_id']];
         !empty($param['statusLt']) && $filter[] = ["status", '=', ($param['statusLt']-1)];
         !empty($param['status']) && $filter[] = ["status", '=', $param['status']];
-        !empty($param['ex_status']) && $filter[] = ["express_status", '=', $param['ex_status']];
+        !empty($param['ex_status']) && $filter[] = ["express_status", '=', ($param['ex_status']-1)];
         !empty($param['order']) && $filter[] = ["order_sn", 'like', "%{$param['order']}%"];
         return $filter;
     }