|
|
@@ -330,7 +330,7 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
|
$order->status = 5;
|
|
|
$order->save();
|
|
|
- //暂时只考虑花材库存的回滚
|
|
|
+ //暂时只考虑花材库存的回滚。商品只有下单成功了才会占用库存。
|
|
|
$orderSn = $order->orderSn ?? '';
|
|
|
$itemList = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
|
if (!empty($itemList)) {
|
|
|
@@ -366,30 +366,6 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- $goodsList = OrderGoodsClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
|
- if (!empty($goodsList)) {
|
|
|
- foreach ($goodsList as $key => $info) {
|
|
|
- $sjId = $info->sjId ?? 0;
|
|
|
- $shopId = $info->shopId ?? 0;
|
|
|
- $mainId = $info->mainId ?? 0;
|
|
|
- $goodsId = $info->goodsId ?? 0;
|
|
|
- $num = $info->num ?? 0;
|
|
|
- $respond = \bizHd\goods\classes\GoodsClass::addStock($goodsId, $mainId, $num);
|
|
|
- $oldStock = $respond['oldStock'] ?? 0;
|
|
|
- $newStock = $respond['newStock'] ?? 0;
|
|
|
- $data = [];
|
|
|
- $data['sjId'] = $sjId;
|
|
|
- $data['shopId'] = $shopId;
|
|
|
- $data['mainId'] = $mainId;
|
|
|
- $data['orderSn'] = $orderSn;
|
|
|
- $data['goodsId'] = $goodsId;
|
|
|
- $data['goodsNum'] = $num;
|
|
|
- $data['oldStock'] = $oldStock;
|
|
|
- $data['newStock'] = $newStock;
|
|
|
- $data['relateName'] = '';
|
|
|
- GoodsStockRecordClass::cancelOrder($data);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
// 扣库存
|