From 816521c6bef03d8406142072eb28432c88b2fe9c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 6 Sep 2024 13:46:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(store=5Forder):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=97=E9=93=BAID=E6=9D=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=86=E6=94=AF=E5=95=86=E5=93=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/store_order/StoreOrderController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/admin/controller/store_order/StoreOrderController.php b/app/admin/controller/store_order/StoreOrderController.php
index c475a5e98..efa371bbe 100644
--- a/app/admin/controller/store_order/StoreOrderController.php
+++ b/app/admin/controller/store_order/StoreOrderController.php
@@ -13,6 +13,7 @@ use app\admin\validate\store_order\StoreOrderValidate;
 use app\common\enum\PayEnum;
 use app\common\logic\PayNotifyLogic;
 use app\common\model\delivery_service\DeliveryService;
+use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product\StoreProduct;
@@ -167,7 +168,11 @@ class StoreOrderController extends BaseAdminController
         $order['delivery_time'] = date('Y-m-d', $time);
         $data = StoreOrderCartInfo::where('oid', $id)->select();
         foreach ($data as $key => &$value) {
-            $find = StoreProduct::where('id', $value->product_id)->find();
+            if(in_array($order['store_id'],[17,18])){
+                $find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->find();
+            }else{
+                $find = StoreProduct::where('id', $value->product_id)->find();
+            }
             $value->store_name = $find['store_name'] ?? '';
             $value->store_info = $find['store_info'] ?? '';
             $value->total_price = bcmul($value['price'], $value['cart_num'], 2);