From 4c9a1153f2bd6f6a5ace9706b32d46ad5077cb5b Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 18 Feb 2024 11:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=BD=E6=88=90=E9=87=91=E9=A2=9D=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=87=91=E9=A2=9D=E6=97=B6=EF=BC=8C=E6=8A=BD?=
 =?UTF-8?q?=E6=88=90=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=88=E6=9C=AA=E4=B9=98=E4=BB=A5=E8=B4=AD=E4=B9=B0=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/event.php                                      |  2 +-
 .../platformCommission/OrderPaySuccessEvent.php    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/event.php b/app/event.php
index 42fd85e..15d4be9 100644
--- a/app/event.php
+++ b/app/event.php
@@ -69,7 +69,7 @@ return [
         ],
         // 订单核销成功事件触发
         'order.verify' => [
-            // 酒卡额度解冻
+            // 订单核销成功 - 平台抽成相关冻结内容解冻
             'app\listener\platformCommission\OrderTakeEvent'
         ],
     ],
diff --git a/app/listener/platformCommission/OrderPaySuccessEvent.php b/app/listener/platformCommission/OrderPaySuccessEvent.php
index c3f06d0..b8c2a98 100644
--- a/app/listener/platformCommission/OrderPaySuccessEvent.php
+++ b/app/listener/platformCommission/OrderPaySuccessEvent.php
@@ -21,6 +21,7 @@ class OrderPaySuccessEvent{
         $groupOrder = $groupOrder['groupOrder'];
         try{
             Log::info('支付成功 - 平台抽成处理 - 开始： '.var_export(['uid'=>$groupOrder->uid,'group_order_id'=>$groupOrder->group_order_id],1));
+            // 订单支付成功 - 平台抽成处理
             $this->orderPaySuccessHandle($groupOrder);
             // 订单支付成功  触发购买商品升级
             Queue::push(UserBrokerageLevelJob::class,[
@@ -71,17 +72,17 @@ class OrderPaySuccessEvent{
                 if($productInfo->platform_commission_switch == 1){
                     // 独立设置
                     if($productInfo->platform_commission_type == 1) {
-                        // 固定金额
-                        $platformCommissionMoney = $productInfo->platform_commission_money;
+                        // 固定金额     最终抽成金额需要乘以购买数量
+                        $platformCommissionMoney = (float)sprintf("%.3f",$productInfo->platform_commission_money * $orderProductInfo->product_num);
                     }else{
                         // 独立比例
                         $platformCommissionRate = $productInfo->platform_commission_rate;
-                        $platformCommissionMoney = (float)sprintf("%.2f",$orderTotalPrice * $platformCommissionRate / 100);
+                        $platformCommissionMoney = (float)sprintf("%.3f",$orderTotalPrice * $platformCommissionRate / 100);
                     }
                 }else{
                     // 统一设置     获取商户设置抽成比例  获取抽成总金额
                     $platformCommissionRate = (float)Merchant::getDB()->where('mer_id', $orderInfo->mer_id)->value('platform_commission');
-                    $platformCommissionMoney = (float)sprintf("%.2f",$orderTotalPrice * $platformCommissionRate / 100);
+                    $platformCommissionMoney = (float)sprintf("%.3f",$orderTotalPrice * $platformCommissionRate / 100);
                 }
                 // 使用商品售价进行处理
                 if($platformCommissionMoney > 0){
@@ -113,9 +114,10 @@ class OrderPaySuccessEvent{
                             ->where('type', 'order')
                             ->where('category', 'mer_lock_money')
                             ->where('pm', 1)
-                            ->dec('number',$platformCommissionMoney) ->update();
+                            ->dec('number',$platformCommissionMoney)
+                            ->update();
                     } else {
-                        Merchant::where('mer_id',  $orderInfo->mer_id)->dec('mer_money',$platformCommissionMoney) ->update();
+                        Merchant::where('mer_id',  $orderInfo->mer_id)->dec('mer_money',$platformCommissionMoney)->update();
                     }
                 }
             }