|
@@ -1007,13 +1007,12 @@ class DwyController extends BaseController
|
|
|
|
|
|
public function setTbData(Request $request){
|
|
|
$data = $request->all();
|
|
|
- if(empty($data['id']) && empty($data['mac']) && empty($data['data'])) return [201, ''];
|
|
|
+ if(empty($data['id']) && empty($data['data'])) return [201, ''];
|
|
|
|
|
|
BigKingTbj::updateOrCreate(
|
|
|
- ['id' => $data['id'], 'mac' => $data['mac']], //查询条件
|
|
|
+ ['id' => $data['id']], //查询条件
|
|
|
[
|
|
|
"id" => $data['id'],
|
|
|
- "mac" => $data['mac'],
|
|
|
"data" => json_encode($data['data'])
|
|
|
] //添加或者修改的数据
|
|
|
);
|
|
@@ -1023,22 +1022,11 @@ class DwyController extends BaseController
|
|
|
|
|
|
public function getTbData(Request $request){
|
|
|
$data = $request->all();
|
|
|
-// if(empty($data['mac'])) return [201, ''];
|
|
|
if(empty($data['id'])) return [201, ''];
|
|
|
- $result = BigKingTbj::where('id',$data['id'])->get()->toArray();
|
|
|
-// $result = BigKingTbj::where('mac',$data['mac'])->get()->toArray();
|
|
|
+ $result = BigKingTbj::where('id',$data['id'])->first();
|
|
|
if(empty($result)) return [200,'data' => []];
|
|
|
|
|
|
- $return = [];
|
|
|
- foreach ($result as $value){
|
|
|
- $return[] = [
|
|
|
-// 'id' => $value['id'],
|
|
|
- 'mac' => $value['mac'],
|
|
|
- 'data' => json_decode($value['data'],true),
|
|
|
- ];
|
|
|
- }
|
|
|
-
|
|
|
- return [200, 'data' => $return];
|
|
|
+ return [200, 'data' => json_decode($result['data'],true)];
|
|
|
}
|
|
|
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';
|