|
@@ -325,6 +325,7 @@ class ProductRepository extends BaseRepository
|
|
325
|
$data['gong_sku_id'] = $settleParams['data']['gong_sku_id'] ?? 0;
|
325
|
$data['gong_sku_id'] = $settleParams['data']['gong_sku_id'] ?? 0;
|
|
326
|
$data['cost'] = $settleParams['data']['cost'];
|
326
|
$data['cost'] = $settleParams['data']['cost'];
|
|
327
|
$data['stock'] = $settleParams['data']['stock'];
|
327
|
$data['stock'] = $settleParams['data']['stock'];
|
|
|
|
328
|
+ $data['concession_pri'] = $settleParams['data']['concession_pri'];
|
|
328
|
return $this->dao->update($id, $data);
|
329
|
return $this->dao->update($id, $data);
|
|
329
|
}
|
330
|
}
|
|
330
|
|
331
|
|
|
@@ -377,7 +378,7 @@ class ProductRepository extends BaseRepository
|
|
377
|
}
|
378
|
}
|
|
378
|
}
|
379
|
}
|
|
379
|
$extension_status = systemConfig('extension_status');
|
380
|
$extension_status = systemConfig('extension_status');
|
|
380
|
- $pric = $stock = $ot_price = $cost = $dc_price = 0;
|
|
|
|
|
|
381
|
+ $pric = $stock = $ot_price = $cost = $dc_price = $concession_pri = 0;
|
|
381
|
if (isset($data['attrValue']) && is_array($data['attrValue'])) {
|
382
|
if (isset($data['attrValue']) && is_array($data['attrValue'])) {
|
|
382
|
foreach ($data['attrValue'] as $value) {
|
383
|
foreach ($data['attrValue'] as $value) {
|
|
383
|
$sku = '';
|
384
|
$sku = '';
|
|
@@ -464,7 +465,10 @@ class ProductRepository extends BaseRepository
|
|
464
|
if (!$ot_price) $ot_price = $value['ot_price'];
|
465
|
if (!$ot_price) $ot_price = $value['ot_price'];
|
|
465
|
if (!$dc_price) $dc_price = $value['dacang_price'];
|
466
|
if (!$dc_price) $dc_price = $value['dacang_price'];
|
|
466
|
if (!$cost) $cost = $value['cost'];
|
467
|
if (!$cost) $cost = $value['cost'];
|
|
|
|
468
|
+ if (!$concession_pri) $concession_pri = $value['plate_mer_profit'] ? (($value['plate_mer_profit'] < 0) ? 0 : $value['plate_mer_profit']) : 0;
|
|
467
|
$ot_price = ($ot_price > $value['ot_price']) ? $value['ot_price'] : $ot_price;
|
469
|
$ot_price = ($ot_price > $value['ot_price']) ? $value['ot_price'] : $ot_price;
|
|
|
|
470
|
+
|
|
|
|
471
|
+ $concession_pri = ($pric > $value['price']) ? $value['plate_mer_profit'] : $concession_pri;
|
|
468
|
$pric = ($pric > $value['price']) ? $value['price'] : $pric;
|
472
|
$pric = ($pric > $value['price']) ? $value['price'] : $pric;
|
|
469
|
|
473
|
|
|
470
|
$dc_price = ($dc_price > $value['dacang_price']) ? $value['dacang_price'] : $dc_price;
|
474
|
$dc_price = ($dc_price > $value['dacang_price']) ? $value['dacang_price'] : $dc_price;
|
|
@@ -474,7 +478,7 @@ class ProductRepository extends BaseRepository
|
|
474
|
$stock = $stock + $value['stock'];
|
478
|
$stock = $stock + $value['stock'];
|
|
475
|
}
|
479
|
}
|
|
476
|
}
|
480
|
}
|
|
477
|
- $result['data'] = ['price' => $pric, 'stock' => $stock, 'ot_price' => $ot_price, 'cost' => $cost, 'dc_price' => $dc_price];
|
|
|
|
|
|
481
|
+ $result['data'] = ['price' => $pric, 'stock' => $stock, 'ot_price' => $ot_price, 'cost' => $cost, 'dc_price' => $dc_price,'concession_pri'=>$concession_pri];
|
|
478
|
return $result;
|
482
|
return $result;
|
|
479
|
}
|
483
|
}
|
|
480
|
|
484
|
|