|
@@ -444,7 +444,7 @@ class OrderImport extends Base
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //删除【待用户确认】的订单
|
|
|
+ //删除【待用户确认】或者【库存不足】的订单
|
|
|
public function delImportData()
|
|
|
{
|
|
|
|
|
@@ -453,12 +453,12 @@ class OrderImport extends Base
|
|
|
if (empty($ids)) return error_show(1004, 'ids不能为空');
|
|
|
|
|
|
$rs = OIFCModel::field('id')
|
|
|
- ->where('status', '<>', OIFCModel::$status_wait_confirm)
|
|
|
+ ->whereNotIn('status', [OIFCModel::$status_wait_confirm, OIFCModel::$status_stock_not_enough])
|
|
|
->whereIn('id', $ids)
|
|
|
->findOrEmpty()
|
|
|
->isEmpty();
|
|
|
|
|
|
- if (!$rs) return error_show(1005, '非[待用户确认]状态不允许删除');
|
|
|
+ if (!$rs) return error_show(1005, '该状态下不允许删除');
|
|
|
|
|
|
Db::startTrans();
|
|
|
try {
|
|
@@ -466,10 +466,9 @@ class OrderImport extends Base
|
|
|
$user = GetUserInfo($this->post['token']);
|
|
|
|
|
|
Db::name('order_import_from_c')
|
|
|
- ->where([
|
|
|
- 'status' => OIFCModel::$status_wait_confirm,
|
|
|
- 'is_del' => OIFCModel::$is_del_normal,
|
|
|
- ])->whereIn('id', $ids)
|
|
|
+ ->where('is_del', OIFCModel::$is_del_normal)
|
|
|
+ ->whereIn('id', $ids)
|
|
|
+ ->whereIn('status', [OIFCModel::$status_wait_confirm, OIFCModel::$status_stock_not_enough])
|
|
|
->update([
|
|
|
'updatetime' => date('Y-m-d H:i:s'),
|
|
|
'is_del' => OIFCModel::$is_del_delete,
|