0723-1450-h01

app/controller/api/Order.php

@@ -50,6 +50,26 @@ class Order extends Base
     }
 
 
+    #[GetMapping('chat')]
+    public function getDataChat(Request $request): Response
+    {
+        try {
+            $param = $request->all();
+            if (!empty($param['size'])) {
+                $param['pageSize'] = $param['size'];
+            }
+            $param['openid'] = $request->user['openid'];
+            $param['statusIn'] = [1,2];
+            $data = $this->service->setModel()->getList($param,['product' => function($query){
+                $query->field("product_id,product_name");
+            }]);
+            return successTrans("success.data",pageFormat($data));
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
+
+
     #[PostMapping("del")]
     public function delOrderData(Request $request): Response
     {

app/controller/api/Service.php

@@ -282,15 +282,19 @@ class Service extends Base
                 "order.require"     => trans("empty.require"),
             ],$request->method());
             if (!is_array($param)) return error($param);
+            echo getDateFull()."===地址信息\n";
+            print_r($param);
             $cityJson = json_decode($param['city'],true);
             $cityCode = [];
+            $city_text = "";
             foreach ($cityJson as $k => $v){
                 $cityCode[$k] = $v['value'];
-                $param['city_text'] .= $v['text'];
+                $city_text .= $v['text'];
             }
+            $param['city_text'] = $city_text;
             $param['city_code'] = json_encode($cityCode);
             $orderData = json_decode($param['order'],true);
-            $order = (new SaasOrder)->where("out_trade_no",$orderData["order"])->with(['poi'])->findOrEmpty();
+            $order = (new SaasOrder)->where("out_order_no",$orderData["order"])->with(['poi'])->findOrEmpty();
             if ($order->isEmpty()) return error("关联订单错误");
             if ($order['openid'] <> $request->user['openid']) return error("关联订单错误");
             if ($order['status'] <> 1) return error("关联订单错误");

app/service/saas/OrderService.php

@@ -29,6 +29,7 @@ class OrderService extends Service
         !empty($param['openid']) && $filter[] = ["openid", '=', $param['openid']];
         !empty($param['poi_id']) && $filter[] = ["poi_id", '=', $param['poi_id']];
         !empty($param['status']) && $filter[] = ["status", '=', ($param['status']-1)];
+        !empty($param['statusIn']) && $filter[] = ["status", 'in', $param['statusIn']];
         !empty($param['type']) && $filter[] = ["type", '=', $param['type']];
         !empty($param['name']) && $filter[] = ["poi_name", 'like', "%{$param['name']}%"];
         !empty($param['order_sn']) && $filter[] = ["order_sn", 'like', "%{$param['order_sn']}%"];