Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/OracleDocWaveDetailService.php

@@ -17,7 +17,8 @@ class OracleDocWaveDetailService
     {
         if (!$orderHeaders) return;
         $clearOrderNos = data_get($orderHeaders, '*.orderno');
-        OracleDOCWaveDetails::query()->whereIn('OrderNo', $clearOrderNos)->delete();
+        $ownerNos = data_get($orderHeaders, '*.ownerno');
+        OracleDOCWaveDetails::query()->whereIn('OrderNo', $clearOrderNos)->whereIn('OwnerNo',$ownerNos)->delete();
         app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($clearOrderNos) );
     }
 
@@ -94,7 +95,10 @@ class OracleDocWaveDetailService
         foreach ($orderHeaderList as $items) {
             $this->clearCancelledOrder($items);
             if ($orderHeaders->count() > 0) {
-                OracleDOCOrderHeader::query()->whereIn('orderNo', data_get($items, '*.orderno'))->update(['waveno' => '*']);
+                OracleDOCOrderHeader::query()
+                    ->whereIn('orderNo', data_get($items, '*.orderno'))
+                    ->whereIn('owerno', data_get($items, '*.owerno'))
+                    ->update(['waveno' => '*']);
                 $json = json_encode($items->map(function ($orderHeader) {
                     return ['orderno' => $orderHeader->orderno, 'waveno' => $orderHeader->waveno];
                 }));