From 91e79605b1311312d65149a74b6ead8b363051c2 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 20 Jan 2024 18:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderCreateRepository.php    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 1171823c..1ce3a95e 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -496,9 +496,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             $platformConsumption = Db::name('store_consumption_user')->where($ConsumptionWhere)->limit(100)->order('create_time', 'desc')
             ->field('uid,coupon_title,coupon_price')
             ->select();
-            if(count($platformConsumption)>1){
-                $consumption=$platformConsumption[0];
-            }
+            // if(count($platformConsumption)>1){
+            //     $consumption=$platformConsumption[0];
+            // }
         }
         //        }
 
@@ -558,9 +558,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 $pay_price = $org_price;
             }
 
-            if($consumption){
-                $pay_price = bcsub($pay_price, $consumption['coupon_price'], 2);
-            }
+            // if($consumption){
+            //     $pay_price = bcsub($pay_price, $consumption['coupon_price'], 2);
+            // }
 
             $giveIntegralFlag = $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_order_rate'] > 0;
             $total_give_integral = 0;
@@ -628,7 +628,8 @@ class StoreOrderCreateRepository extends StoreOrderRepository
             'address',
             'openIntegral',
             'useIntegral',
-            'key'
+            'key',
+            'consumption'
         ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
     }