|
|
@@ -812,37 +812,37 @@ class OrderController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //取消订单 shizhongqi 20220619
|
|
|
+ //取消(供应商)订单 shizhongqi 20220619
|
|
|
public function actionCancleOrder()
|
|
|
{
|
|
|
$post = Yii::$app->request->post();
|
|
|
$id = $post['id'] ?? 0;
|
|
|
- $order = OrderClass::getLockById($id);
|
|
|
- if (empty($order)) {
|
|
|
- util::fail('没有找到订单');
|
|
|
+ $purchase = PurchaseClass::getById($id);
|
|
|
+ if (empty($purchase)) {
|
|
|
+ util::fail('没有找到采购单');
|
|
|
}
|
|
|
- OrderClass::valid($order, $this->shopId);
|
|
|
- $deadLineTime = strtotime($order['deadline']);
|
|
|
+ $deadLineTime = strtotime($purchase['deadline']);
|
|
|
$diff = $deadLineTime - time();
|
|
|
if ($diff < (200 + 10)) {
|
|
|
- util::fail('取消订单失败');
|
|
|
+ util::fail('取消采购单失败');
|
|
|
}
|
|
|
|
|
|
- $connection = Yii::$app->db;
|
|
|
+ $connection = Yii::$app->db;//事务处理
|
|
|
$transaction = $connection->beginTransaction();
|
|
|
- $id = $order['id'] ?? 0;
|
|
|
- $orderSn = $order['orderSn'] ?? '';
|
|
|
+ $orderSn = $purchase['orderSn'];
|
|
|
try {
|
|
|
- $order = \bizHd\order\classes\OrderClass::getById($id, true);
|
|
|
- //暂时只考虑花材库存的回滚
|
|
|
- OrderClass::setExpire($order);
|
|
|
+ $current = PurchaseClass::getById($id, true);
|
|
|
+ PurchaseService::expire($current);
|
|
|
$transaction->commit();
|
|
|
- noticeUtil::push("商城订单未付款,库存已回滚,单号:{$orderSn}");
|
|
|
+
|
|
|
+ noticeUtil::push("采购单过期未付款,库存已回滚,单号:{$orderSn}");
|
|
|
+
|
|
|
} catch (\Exception $e) {
|
|
|
$transaction->rollBack();
|
|
|
$msg = $e->getMessage();
|
|
|
- noticeUtil::push("处理报错了!订单号:{$orderSn},错误信息:{$msg}", '15280215347');
|
|
|
+ noticeUtil::push("采购单过期处理报错了!订单号:{$orderSn},错误信息:{$msg}", '15280215347');
|
|
|
}
|
|
|
+
|
|
|
util::complete();
|
|
|
}
|
|
|
|