1

app/Http/Controllers/Api/DwyController.php

@@ -1005,12 +1005,13 @@ class DwyController extends BaseController
 
     public function setTbData(Request $request){
         $data = $request->all();
-        if(empty($data['id']) && empty($data['data'])) return [201, ''];
+        if(empty($data['id']) && empty($data['mac']) && empty($data['data'])) return [201, ''];
 
         BigKingTbj::updateOrCreate(
-            ['id' => $data['id']], //查询条件
+            ['id' => $data['id'], 'mac' => $data['mac']], //查询条件
             [
                 "id" => $data['id'],
+                "mac" => $data['mac'],
                 "data" => json_encode($data['data'])
             ]  //添加或者修改的数据
         );
@@ -1022,11 +1023,18 @@ class DwyController extends BaseController
         $data = $request->all();
         if(empty($data['id'])) return [201, ''];
 
-        $result = BigKingTbj::where('id',$data['id'])->first();
+        $result = BigKingTbj::where('id',$data['id'])->get()->toArray();
         if(empty($result)) return [200,'data' => []];
-        $result = $result->toArray();
 
-        return [200, 'data' => json_decode($result['data'],true)];
+        $return = [];
+        foreach ($result as $value){
+            $return[] = [
+                'mac' => $value['mac'],
+                'data' => json_decode($value['data'],true),
+            ];
+        }
+
+        return [200, 'data' => $return];
     }
     public function setBoxTrademark(Request $request){
         $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_sale_order/brand_sale_order/diy/find_roll_qr_code_list';