|
|
@@ -148,7 +148,6 @@ class StockInOrderClass extends BaseClass
|
|
|
public static function confirmOrder($orderSn, $shop, $adminId)
|
|
|
{
|
|
|
$shopId = $shop->id ?? 0;
|
|
|
- $carSale = $shop->carSale ?? 0;
|
|
|
$data = ['status' => self::STATUS_COMPLETE, 'adminId' => $adminId];
|
|
|
$orderData = self::getOrderDetail($orderSn, $shopId);
|
|
|
if ($orderData['status'] != self::STATUS_WAIT) {
|
|
|
@@ -167,11 +166,8 @@ class StockInOrderClass extends BaseClass
|
|
|
$currentCost = $v['itemPrice'] ?? 0;
|
|
|
$currentHdPrice = $v['price'] ?? 0;
|
|
|
$currentSkPrice = $v['skPrice'] ?? 0;
|
|
|
- if ($carSale == 1) {
|
|
|
- //如果是车销,只同步成本价 ssh 20221113
|
|
|
- ProductClass::updateById($currentItemId, ['cost' => $currentCost]);
|
|
|
- } else {
|
|
|
- //如果当前花材没有库存,则成本和价格都传导过来
|
|
|
+ if (isset($shop->join) && $shop->join == 1) {
|
|
|
+ //加盟店如果当前花材没有库存,则成本和价格都传导过来。直营店在采购和改价都有同步成本和价格,所以调拨时不需要同步。
|
|
|
$currentInfo = ProductClass::getById($currentItemId, true);
|
|
|
if (isset($currentInfo->stock) && floatval($currentInfo->stock) == 0) {
|
|
|
$upData = ['cost' => $currentCost];
|