Merge remote-tracking branch 'origin/master'

app/Service/LabelDealService.php

@@ -19,24 +19,22 @@ class LabelDealService extends Service
         if( empty($data['lead_out']) || empty($data['lead_out']['brand_out_stock_list'])) return;
 
         foreach ($data['lead_out']['brand_out_stock_list'] as $value){
-            $tmp = $value['brand_out_stock_dtl'][0] ?? [];
-            $return[$value['send_box_code']] = [
-                'fake_qty' => $tmp['fake_qty'],
-                'detail' => explode(',',$tmp['brand_qr_code_list'])
-            ];
             $box_list[] = $value['send_box_code'];
+            foreach ($value['brand_out_stock_dtl'] as $tmp){
+                if(! isset($return[$value['send_box_code']])){
+                    $return[$value['send_box_code']] = [
+                        'fake_qty' => 0,
+                        'detail' => [],
+                    ];
+                }
+                $return[$value['send_box_code']]['fake_qty'] += $tmp['fake_qty'];
+                $return[$value['send_box_code']]['detail'] = array_merge($return[$value['send_box_code']]['detail'], explode(',',$tmp['brand_qr_code_list']));
+            }
         }
     }
 
     public function boxOut($lead_bind,$lead_out,$token,$id)
     {
-        //商标绑定
-//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/1';
-        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind';
-        $return_bind = $this->post_helper($url, json_encode($lead_bind), $token);
-        file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "绑定：" . $return_bind. PHP_EOL,8);
-        $return_bind = json_decode($return_bind, true);
-
         //商标出库
         $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind_out_stock';
 //        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/11';
@@ -44,6 +42,15 @@ class LabelDealService extends Service
         file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "出库：" . $return_out. PHP_EOL,8);
         $return_out = json_decode($return_out, true);
 
+        sleep(3);
+
+        //商标绑定
+//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/1';
+        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind';
+        $return_bind = $this->post_helper($url, json_encode($lead_bind), $token);
+        file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "绑定：" . $return_bind. PHP_EOL,8);
+        $return_bind = json_decode($return_bind, true);
+
         if(isset($return_bind['status']) && $return_bind['status'] == 'success' && isset($return_out['status']) && $return_out['status'] == 'success') BigKingCbj::where('id',$id)->update(['is_successful' => 1]);
     }