|
|
@@ -183,9 +183,7 @@ class OrderClass extends BaseClass
|
|
|
util::fail('订单不是待付款状态');
|
|
|
}
|
|
|
$orderGoods = OrderGoodsClass::getAllByCondition(['orderId' => $order->id], null, '*');
|
|
|
- if (empty($orderGoods)) {
|
|
|
- util::fail('没有找到订单商品');
|
|
|
- }
|
|
|
+
|
|
|
$order->status = self::ORDER_STATUS_UN_SEND;
|
|
|
$order->currentFlow = 2;
|
|
|
$order->payWay = $payWay;
|
|
|
@@ -204,11 +202,12 @@ class OrderClass extends BaseClass
|
|
|
$shop->unPayOrder -= 1;
|
|
|
$shop->save();
|
|
|
|
|
|
- // 扣库存
|
|
|
- self::decGoodsStock($orderGoods);
|
|
|
-
|
|
|
- // 增加销量
|
|
|
- self::updateGoodsActualSold($orderGoods);
|
|
|
+ if (!empty($orderGoods)) {
|
|
|
+ // 扣库存
|
|
|
+ self::decGoodsStock($orderGoods);
|
|
|
+ // 增加销量
|
|
|
+ self::updateGoodsActualSold($orderGoods);
|
|
|
+ }
|
|
|
|
|
|
if (isset($order->shopAdminId) && !empty($order->shopAdminId)) {
|
|
|
//员工开单,自取订单,直接完成
|