From 398893e2c5b1e0c9919dfa67edec2637b9c857b2 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 13:56:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderCreateRepository.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index ec703a28..6bf62788 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -962,6 +962,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                             $balance=['balance'=>0,'status'=>1];
                             Db::name('store_consumption_user')->where('coupon_user_id',$groupOrder['coupon_user_id'])->update();
                         }
+                    }
        
                }
                 app()->make(UserBillRepository::class)->decBill($user['uid'], 'consumption', 'deduction', [

From 64bb636a9c85f37b19d8f0f67e67e676044a2537 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 14:11:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderCreateRepository.php  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 6bf62788..93de8676 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -504,9 +504,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                 $item['describe']='仅限平台指定商家商品可使用';
                 return $item;
             });
-            // if(count($platformConsumption)>1){
-            //     $consumption=$platformConsumption[0];
-            // }
         }
         //        }
 
@@ -636,7 +633,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         $status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress';
         $order = $merchantCartList;
         $consumption_money = $this->consumption_money;
-        $total_price = $order_total_price;
+        $total_price = bcsub($order_total_price,$consumption_money,2);
         $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
         $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
         $is_self_pickup=true;

From fcb09b2157959a44f5d31692f48301e0a0407b4a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 14:13:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderCreateRepository.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 93de8676..15b64165 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -580,13 +580,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository
                         }
                     }
                     if($this->store_consumption_user['type']==1){
-                            if($pay_price>$this->store_consumption_user['balance']){
+                            if($pay_price > $this->store_consumption_user['balance']){
                                 $pay_price = bcsub($pay_price, $this->store_consumption_user['balance'], 2);
                                 $this->consumption_money=$this->store_consumption_user['balance'];
                                 $a=$this->store_consumption_user['balance'];
                             }else{
                                 $pay_price=0;
-                                $this->consumption_money=bcsub($this->store_consumption_user['balance'],$pay_price, 2);
+                                $this->consumption_money=$pay_price;
                                 $a=$this->consumption_money;
                             }
                     }