From 5b64d0d9b29506f02bdd604d3b59b3018d1e0dcf Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 3 Sep 2024 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E5=8F=B0=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=E5=8F=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/store_order/StoreOrderLogic.php |  2 +-
 app/api/logic/order/OrderLogic.php              | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/admin/logic/store_order/StoreOrderLogic.php b/app/admin/logic/store_order/StoreOrderLogic.php
index 6b54d1d93..fc29cda10 100644
--- a/app/admin/logic/store_order/StoreOrderLogic.php
+++ b/app/admin/logic/store_order/StoreOrderLogic.php
@@ -56,7 +56,7 @@ class StoreOrderLogic extends BaseLogic
         $user = User::where('id', $params['user_id'])->find();
         $params['shipping_type'] = 2;
         $params['pay_type'] = 7;
-        $params['source'] =2;
+        $params['source'] =2;//后台下单
         $order = OrderLogic::createOrder($cartId, null, $user, $params);
         return true;
     }
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index f9b1af6ba..ac0b3e735 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -89,7 +89,12 @@ class OrderLogic extends BaseLogic
             $off_activity = Config::where('name', 'off_activity')->value('value');
             $field = 'id,store_name,image,unit,price,vip_price,cost,purchase,cate_id,store_info,rose';
             foreach ($cart_select as $k => $v) {
-                $find = StoreProduct::where(['id' => $v['product_id']])->field($field)->find();
+                if (isset($params['source']) && $params['source'] == 2) {
+                    $field = 'product_id,product_id id,store_name,image,unit,price,vip_price,cost,purchase,cate_id,store_info,rose';
+                    $find = StoreProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field($field)->find();
+                }else{
+                    $find = StoreProduct::where(['id' => $v['product_id']])->field($field)->find();
+                }
                 if (!$find) {
                     throw new BusinessException('商品不存在');
                 }
@@ -472,9 +477,6 @@ class OrderLogic extends BaseLogic
             $data[$k]['store_id'] = $v['store_id'];
             $data[$k]['staff_id'] = $v['staff_id'];
             $data[$k]['combination_id'] = 0;
-            $data[$k]['seckill_id'] = 0;
-            $data[$k]['bargain_id'] = 0;
-            $data[$k]['discount_id'] = 0;
             $data[$k]['status'] = 1;
             $data[$k]['staff_id'] = 0;
             $data[$k]['is_new'] = 0;