diff --git a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php index ea170896a..f39cd3aad 100644 --- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php +++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php @@ -54,6 +54,7 @@ class BeforehandOrderCartInfoController extends BaseAdminController public function append_add() { $params = $this->request->post(); + $params['admin_id']=$this->adminId; $result = BeforehandOrderCartInfoLogic::appendAdd($params); return $this->success('追加成功', [], 1, 1); diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 0b2f50a52..c7510bea9 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -61,7 +61,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic public static function appendAdd(array $params): bool { $order = BeforehandOrder::where('id', $params['id'])->find(); - if (!empty($order) && $order->is_confirm == 1) { + if (!empty($order) && $order->is_confirm == 1 && empty($params['admin_id'])) { throw new BusinessException('该订单已确认,不能追加商品'); } Db::startTrans(); @@ -358,7 +358,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic if ($purchaseProductOffer['is_storage'] == 1) { throw new BusinessException('商品已入库'); } - $beforehandOrder = BeforehandOrder::where('id', $params['bhoid'])->field('id,order_type,warehousing_id')->find(); + $beforehandOrder = BeforehandOrder::where('id', $params['bhoid'])->field('id,order_type,warehousing_id,is_warehousing')->find(); $completed_amount = PurchaseProductOffer::where(['order_id' => $params['bhoid'], 'pay_type' => 1, 'is_storage' => 1])->sum('total_price'); $outstanding_amount = PurchaseProductOffer::where(['order_id' => $params['bhoid'], 'pay_type' => 2, 'is_storage' => 1])->sum('total_price'); @@ -420,9 +420,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $attrs['is_buying'] = 1; } $result = BeforehandOrder::where('id', $params['bhoid'])->where('warehousing_id', 0)->where('is_warehousing', 0)->update($attrs); - // if (!$result) { - // throw new BusinessException('入库失败,预订单更新出错'); - // } + if (!$result) { + throw new BusinessException('入库失败,预订单更新出错'); + } } $purchaseProductOffer['purchase']=$purchaseProductOffer['price']; $product = StoreProduct::where('id', $purchaseProductOffer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find();