From acd6f8b4026e9072b34c12e9817d3c34eead482d Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 3 Jan 2025 11:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AC=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforehand_order/BeforehandOrderLogic.php | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index e8941155d..d9bef6369 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -176,9 +176,12 @@ class BeforehandOrderLogic extends BaseLogic
     public static function generateOrder(array $params): bool
     {
         $order = BeforehandOrder::where('id', $params['id'])->find();
-        if ($order['order_type'] == 4) {
+        if ($order['order_type'] == 4 || $order['order_type'] == 7) {
             throw new BusinessException('该订单类型不能生成支付订单');
         }
+        if (!empty($order['order_sn'])) {
+            throw new BusinessException('当前订单已生成支付订单');
+        }
         Db::startTrans();
         try {
             $cart_info = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->toArray();
@@ -198,14 +201,14 @@ class BeforehandOrderLogic extends BaseLogic
                 }
 
                 $cart_select[$k]['price'] = $v['price'];
-                //判断如果采购价小于售价，则采购价等于售价
-                if ($v['price'] < $find['purchase'] && $find['purchase'] != 0) {
-                    $cart_select[$k]['price'] = $find['purchase'];
-                }
-                if ($user['user_ship'] == 4 && $find['cost'] != 0) {
-                    $cart_select[$k]['price'] = $find['cost'];
-                    $total_prices = bcmul($find['cost'], $v['cart_num'], 2);
-                }
+//                //判断如果零售价小于供货价，则零售价等于供货价
+//                if ($v['price'] < $find['purchase'] && $find['purchase'] != 0) {
+//                    $cart_select[$k]['price'] = $find['purchase'];
+//                }
+//                if ($user['user_ship'] == 4 && $find['cost'] != 0) {
+//                    $cart_select[$k]['price'] = $find['cost'];
+//                    $total_prices = bcmul($find['cost'], $v['cart_num'], 2);
+//                }
                 $cart_select[$k]['cost'] = $find['cost'];
                 $cart_select[$k]['purchase'] = $find['purchase'];
                 $cart_select[$k]['vip'] = 0;