From c5ad18661715aa787b4297c5c02b7566f38e5b41 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 15 Aug 2023 11:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E8=BD=AC=E5=94=AE=E8=B0=83=E8=B4=A7=E4=BB=B7=E6=A0=BC=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderCreateRepository.php   |  1 -
 .../store/order/StoreOrderRepository.php         | 16 ++++++++++++++++
 app/controller/api/store/order/StoreOrder.php    |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 7104f28c..23c4f645 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -118,7 +118,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             app()->make(StoreDiscountRepository::class)
                 ->check($merchantCartList[0]['list'][0]['source_id'], $merchantCartList[0]['list'], $user);
         }
-
         $orderDeliveryStatus = true;
         $order_svip_discount = 0;
         // 循环计算每个店铺的订单数据
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index e9146513..1a28119a 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -525,6 +525,14 @@ class StoreOrderRepository extends BaseRepository
             return $cart['productAssistAttr']['assist_price'];
         } else if ($cart['product_type'] == '4') {
             return $cart['activeSku']['active_price'];
+        // 更新调货价格
+        } else if ($cart['product_type'] == '98') {
+            $price = Db::name('resale')->where('product_attr_unique', $cart['product_attr_unique'])->where('status', 0)->value('price');
+            if ($price) {
+                return $price;
+            } else {
+                return $cart['productAttr']['price'];
+            }
         } else {
             return $cart['productAttr']['price'];
         }
@@ -540,6 +548,14 @@ class StoreOrderRepository extends BaseRepository
             return 0;
         } else if ($cart['product_type'] == '4') {
             return 0;
+        // 更新调货价格
+        } else if ($cart['product_type'] == '98') {
+            $price = Db::name('resale')->where('product_attr_unique', $cart['product_attr_unique'])->where('status', 0)->value('price');
+            if ($price) {
+                return $price;
+            } else {
+                return $cart['productAttr']['price'];
+            }
         } else {
             return $cart['productAttr']['price'];
         }
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 6f012699..1a796b5b 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -64,7 +64,7 @@ class StoreOrder extends BaseController
         $user = $this->request->userInfo();
         $uid = $user->uid;
         if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
-            return app('json')->fail('数据无效');
+            return app('json')->fail('数据无效1');
         $orderInfo = $orderCreateRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId);
 
         return app('json')->success($orderInfo);