diff --git a/app/admin/controller/LocalController.php b/app/admin/controller/LocalController.php index f83debfda..c94abfbeb 100644 --- a/app/admin/controller/LocalController.php +++ b/app/admin/controller/LocalController.php @@ -429,6 +429,7 @@ class LocalController extends BaseAdminController 'need_num' => $product['nums'], 'mark' => $product['mark'] ?? '', 'buyer_id' => $params['buyer_id'], + 'buyer_confirm' => 1, 'buyer_nums' => $product['nums'], 'total_price' => $product['purchase_total'], 'status' => 0, diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php index 705e8743f..e1f596a34 100644 --- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php +++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php @@ -458,7 +458,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic $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(); - PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']); + if (!in_array($beforehandOrder['order_type'], [6, 9])) { + PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']); + } Db::commit(); return true;