|
|
@@ -189,7 +189,6 @@ class CommodityService
|
|
|
$commodities = Commodity::query()
|
|
|
->whereIn('owner_id', data_get($owners, '*.id'))
|
|
|
->whereIn('sku', $orderHeader_sku)
|
|
|
- ->groupBy('owner_id', 'sku') //*!!!!!!!!
|
|
|
->get();
|
|
|
|
|
|
if ($commodities->count() < count($customerId_sku_map)) {
|
|
|
@@ -515,7 +514,6 @@ class CommodityService
|
|
|
$commodities = Commodity::query()
|
|
|
->whereIn('owner_id', array_unique($owner_id))
|
|
|
->whereIn('sku', array_unique($sku))
|
|
|
- ->groupBy('owner_id', 'sku')
|
|
|
->get();
|
|
|
$unexists = [];
|
|
|
foreach ($owner_sku_map as $item) {
|
|
|
@@ -541,7 +539,8 @@ class CommodityService
|
|
|
$inner_params = (function () use ($BasSKUs, $owner_map) {
|
|
|
$map = [];
|
|
|
$BasSKUs->each(function ($basSku) use (&$map, $owner_map) {
|
|
|
- $map[] = [
|
|
|
+ $key = $basSku['sku'].$owner_map[$basSku['customerid']];
|
|
|
+ $map[$key] = [
|
|
|
'owner_id' => $owner_map[$basSku['customerid']] ?? '',
|
|
|
'sku' => $basSku->sku,
|
|
|
'name' => $basSku->descr_c,
|
|
|
@@ -596,7 +595,6 @@ class CommodityService
|
|
|
$commodities = Commodity::query()
|
|
|
->whereIn('owner_id', array_unique($owner_id))
|
|
|
->whereIn('sku', array_unique($sku))
|
|
|
- ->groupBy('owner_id', 'sku')
|
|
|
->get();
|
|
|
$commodities_map = $dataHandlerService->dataHeader(['owner_id', 'sku'], $commodities);
|
|
|
$updateParams = [[
|
|
|
@@ -609,7 +607,8 @@ class CommodityService
|
|
|
if (!$commodity) $commodity = $dataHandlerService->getKeyValue(['owner_id' => $owner_map[$basSku['customerid']], 'sku' => $basSku['sku']], $commodities_map);
|
|
|
if (!$commodity) {
|
|
|
$updateBasSkus->add($basSku);
|
|
|
- $insert_params[] = [
|
|
|
+ $key = $basSku['sku'].$owner_map[$basSku['customerid']];
|
|
|
+ $insert_params[$key] = [
|
|
|
'owner_id' => $owner_map[$basSku['customerid']] ?? '',
|
|
|
'sku' => $basSku->sku,
|
|
|
'name' => $basSku->descr_c,
|
haozi