0837

app/controller/admin/Store.php

@@ -45,7 +45,8 @@ class Store extends Base
     public function getStoreData(Request $request): Response
     {
         try {
-            $data = $this->service->setModel()->getList($request->all(),null,true,['type'],['type' => function($query,$resp){
+            $param = $request->all();
+            $data = $this->service->setModel()->getList($param,null,true,['type'],['type' => function($query,$resp){
                 if (empty($resp['product_type'])) return [];
                 $productType = json_decode($resp['product_type'],true);
                 $typeData = [];

app/controller/admin/StoreUser.php

@@ -31,7 +31,22 @@ class StoreUser extends Base
     public function getDataList(Request $request): Response
     {
         try {
-            $data = $this->service->setModel()->getList($request->all(),"account");
+            $param = $request->all();
+            $param['type'] = 2;
+            $data = $this->service->setModel()->getList($param,"account");
+            return successTrans(100010,pageFormat($data),200);
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
+
+    #[GetMapping('service')]
+    public function getDataListService(Request $request): Response
+    {
+        try {
+            $param = $request->all();
+            $param['type'] = 3;
+            $data = $this->service->setModel()->getList($param,"account");
             return successTrans(100010,pageFormat($data),200);
         } catch (\Throwable $th) {
             return error($th->getMessage());

app/controller/merchant/Goods.php

@@ -146,7 +146,6 @@ class Goods extends Base
             }
             unset($param['skuSpecs']);
             $param['line_price'] = $param['line_price'] * 100;
-
             if (!empty($skuData)) {
                 [$state,$msg] = $this->skuData($skuData);
                 if (!$state) return error($msg);

app/service/saas/StoreService.php

@@ -28,6 +28,7 @@ class StoreService extends Service
     {
         $filter = [];
         !empty($param['status']) && $filter[] = ["status", '=', $param['status']];
+        !empty($param['type']) && $filter[] = ["type", '=', $param['type']];
         !empty($param['name']) && $filter[] = ["poi_name", 'like', "%{$param['name']}%"];
         return $filter;
     }

app/service/system/UserService.php

@@ -27,6 +27,7 @@ class UserService extends Service
     {
         $filter = [];
         !empty($param['status']) && $filter[] = ["status", '=', $param['status']];
+        !empty($param['type']) && $filter[] = ["type", '=', $param['type']];
         !empty($param['name']) && $filter[] = ["poi_name", 'like', "%{$param['name']}%"];
         return $filter;
     }