From 529c2cbd1a9d15f03651a35930df9d87e3b858a9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 27 Jan 2024 10:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/StoreOrderCreateRepository.php      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 5869e120..e126da7d 100755
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -590,13 +590,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             } else {
                 $pay_price = $org_price;
             }
-            //计算总红包金额
-            if ($source == 105) {
-                $this->consumption_money = bcsub($pay_price, 2, 2);
-                $pay_price =2; ;
-                $this->balance = 0;
-                $consumption_coupon_id=100;
-            }
 
 
             $giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0;
@@ -642,15 +635,15 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         $groupOrderPayPrice = $order_total_price;
         foreach ($merchantCartList as $k => &$merchantCart) {
             $isLast = count($merchantCartList) == $k + 1;
-            $orderPayPrice = 0;
             foreach ($merchantCart['list'] as &$cart) {
                 $cart['total_price'] = bcadd($cart['total_price'], $cart['svip_discount'], 2);
             }
 
+            $orderPayPrice = $merchantCart['order']['total_price'];
             if ($consumptionTotal) {
                 $storeConsumptionUserDao = new StoreConsumptionUserDao();
                 $storeConsumptionUserDao->groupOrderTotalPrice = $groupOrderPayPrice;
-                $storeConsumptionUserDao->orderTotalPrice = $merchantCart['order']['total_price'];
+                $storeConsumptionUserDao->orderTotalPrice = $orderPayPrice;
                 $storeConsumptionUserDao->consumptionTotalAmount = $consumptionTotal;
                 $storeConsumptionUserDao->isLast = $isLast;
                 [$orderPayPrice, $groupOrderPayPrice, $useAmount, $consumptionTotal] = $storeConsumptionUserDao->calculateByOrder();
@@ -658,6 +651,14 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 $this->balance = bcsub($this->balance, $useAmount, 2);
             }
 
+            if ($source == 105) {
+                $this->consumption_money = bcsub($orderPayPrice, 2, 2);
+                $useAmount = $this->consumption_money;
+                $orderPayPrice = '2.00'; ;
+                $this->balance = 0;
+                $consumption_coupon_id = 100;
+            }
+
             unset($cart);
             $merchantCart['order']['consumption_money'] = $useAmount ?? '0.00';
             $merchantCart['order']['pay_price'] = $orderPayPrice;