From 93d507182d6c125dc0d5453990cfbfc8bf251f86 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Tue, 6 Feb 2024 11:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8A=BD=E6=88=90=E7=9B=B8=E5=85=B3=E4=BD=A3=E9=87=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BF=9D=E7=95=99=E4=B8=89=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/marketing/PlatformCommission.php | 24 +++++++++---------- .../HandleCommissionMoneyJob.php | 4 ++-- .../HandleCommissionPartnerMoneyJob.php | 2 +- .../OrderPaySuccessEvent.php | 10 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controller/admin/store/marketing/PlatformCommission.php b/app/controller/admin/store/marketing/PlatformCommission.php index e2abf1b..5128558 100644 --- a/app/controller/admin/store/marketing/PlatformCommission.php +++ b/app/controller/admin/store/marketing/PlatformCommission.php @@ -97,18 +97,18 @@ class PlatformCommission extends BaseController{ $data = $this->repository->getRecordList((array)$params,(int)$page,(int)$limit); foreach($data['list'] as &$item){ - $item['refund_platform_commission_money'] = sprintf("%.2f",$item['platform_commission_money'] * $item['refund_ratio'] / 100); - $item['reality_platform_commission_money'] = sprintf("%.2f",$item['platform_commission_money'] - $item['refund_platform_commission_money']); - $item['refund_commission_platform_money'] = sprintf("%.2f",$item['commission_platform_money'] * $item['refund_ratio'] / 100); - $item['reality_commission_platform_money'] = sprintf("%.2f",$item['commission_platform_money'] - $item['refund_commission_platform_money']); - $item['refund_commission_partner_money'] = sprintf("%.2f",$item['commission_partner_money'] * $item['refund_ratio'] / 100); - $item['reality_commission_partner_money'] = sprintf("%.2f",$item['commission_partner_money'] - $item['refund_commission_partner_money']); - $item['refund_commission_merchants_money'] = sprintf("%.2f",$item['commission_merchants_money'] * $item['refund_ratio'] / 100); - $item['reality_commission_merchants_money'] = sprintf("%.2f",$item['commission_merchants_money'] - $item['refund_commission_merchants_money']); - $item['refund_commission_promoter_money'] = sprintf("%.2f",$item['commission_promoter_money'] * $item['refund_ratio'] / 100); - $item['reality_commission_promoter_money'] = sprintf("%.2f",$item['commission_promoter_money'] - $item['refund_commission_promoter_money']); - $item['refund_commission_integral_release_money'] = sprintf("%.2f",$item['commission_integral_release_money'] * $item['refund_ratio'] / 100); - $item['reality_commission_integral_release_money'] = sprintf("%.2f",$item['commission_integral_release_money'] - $item['refund_commission_integral_release_money']); + $item['refund_platform_commission_money'] = sprintf("%.3f",$item['platform_commission_money'] * $item['refund_ratio'] / 100); + $item['reality_platform_commission_money'] = sprintf("%.3f",$item['platform_commission_money'] - $item['refund_platform_commission_money']); + $item['refund_commission_platform_money'] = sprintf("%.3f",$item['commission_platform_money'] * $item['refund_ratio'] / 100); + $item['reality_commission_platform_money'] = sprintf("%.3f",$item['commission_platform_money'] - $item['refund_commission_platform_money']); + $item['refund_commission_partner_money'] = sprintf("%.3f",$item['commission_partner_money'] * $item['refund_ratio'] / 100); + $item['reality_commission_partner_money'] = sprintf("%.3f",$item['commission_partner_money'] - $item['refund_commission_partner_money']); + $item['refund_commission_merchants_money'] = sprintf("%.3f",$item['commission_merchants_money'] * $item['refund_ratio'] / 100); + $item['reality_commission_merchants_money'] = sprintf("%.3f",$item['commission_merchants_money'] - $item['refund_commission_merchants_money']); + $item['refund_commission_promoter_money'] = sprintf("%.3f",$item['commission_promoter_money'] * $item['refund_ratio'] / 100); + $item['reality_commission_promoter_money'] = sprintf("%.3f",$item['commission_promoter_money'] - $item['refund_commission_promoter_money']); + $item['refund_commission_integral_release_money'] = sprintf("%.3f",$item['commission_integral_release_money'] * $item['refund_ratio'] / 100); + $item['reality_commission_integral_release_money'] = sprintf("%.3f",$item['commission_integral_release_money'] - $item['refund_commission_integral_release_money']); } return app('json')->success($data); diff --git a/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionMoneyJob.php b/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionMoneyJob.php index 13de5c9..67f79f6 100644 --- a/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionMoneyJob.php +++ b/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionMoneyJob.php @@ -33,7 +33,7 @@ class HandleCommissionMoneyJob implements JobInterface{ // 处理招商员佣金 if((int)$recordInfo['mer_spread_uid'] > 0){ // 获取冻结中佣金信息 - $reduce = (float)sprintf("%.2f",$recordInfo['commission_merchants_money'] * $data['refund_rate'] / 100);// 减少数量 + $reduce = (float)sprintf("%.3f",$recordInfo['commission_merchants_money'] * $data['refund_rate'] / 100);// 减少数量 // 添加减少记录 $userBillRepository->decBill($recordInfo['mer_spread_uid'], 'brokerage', 'commission_merchants', [ 'link_id' => $recordInfo['order_id'], @@ -47,7 +47,7 @@ class HandleCommissionMoneyJob implements JobInterface{ // 处理推广员佣金 if((int)$recordInfo['spread_uid'] > 0){ // 获取冻结中佣金信息 - $reduce = (float)sprintf("%.2f",$recordInfo['commission_promoter_money'] * $data['refund_rate'] / 100);// 减少数量 + $reduce = (float)sprintf("%.3f",$recordInfo['commission_promoter_money'] * $data['refund_rate'] / 100);// 减少数量 // 添加减少记录 $userBillRepository->decBill($recordInfo['spread_uid'], 'brokerage', 'commission_promoter', [ 'link_id' => $recordInfo['order_id'], diff --git a/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionPartnerMoneyJob.php b/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionPartnerMoneyJob.php index 36f2ff3..90a0f96 100644 --- a/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionPartnerMoneyJob.php +++ b/app/jobs/store/platformCommission/refundOrderHandle/HandleCommissionPartnerMoneyJob.php @@ -30,7 +30,7 @@ class HandleCommissionPartnerMoneyJob implements JobInterface{ ->find(); if($cycleInfo){ // 计算总退款的合伙人佣金 - $reduceCommissionMoney = (float)sprintf("%.2f",$platformCommissionRecord['commission_partner_money'] * $data['refund_rate'] / 100);// 减少数量 + $reduceCommissionMoney = (float)sprintf("%.3f",$platformCommissionRecord['commission_partner_money'] * $data['refund_rate'] / 100);// 减少数量 // 获取退款的用户列表 $userList = PartnerSettlement::field('id,uid,money,proportion,cycle_id') ->where('cycle_id',$cycleInfo->id) diff --git a/app/listener/platformCommission/OrderPaySuccessEvent.php b/app/listener/platformCommission/OrderPaySuccessEvent.php index 3b92946..c3f06d0 100644 --- a/app/listener/platformCommission/OrderPaySuccessEvent.php +++ b/app/listener/platformCommission/OrderPaySuccessEvent.php @@ -96,15 +96,15 @@ class OrderPaySuccessEvent{ 'platform_commission_rate' => $platformCommissionRate, 'platform_commission_money' => $platformCommissionMoney, 'commission_platform_rate' => $set['commission_platform_rate'], - 'commission_platform_money' => (float)sprintf("%.2f",$platformCommissionMoney * $set['commission_platform_rate'] / 100), + 'commission_platform_money' => (float)sprintf("%.3f",$platformCommissionMoney * $set['commission_platform_rate'] / 100), 'commission_partner_rate' => $set['commission_partner_rate'], - 'commission_partner_money' => (float)sprintf("%.2f",$platformCommissionMoney * $set['commission_partner_rate'] / 100), + 'commission_partner_money' => (float)sprintf("%.3f",$platformCommissionMoney * $set['commission_partner_rate'] / 100), 'commission_merchants_rate' => $set['commission_merchants_rate'], - 'commission_merchants_money' => (float)sprintf("%.2f",$platformCommissionMoney * $set['commission_merchants_rate'] / 100), + 'commission_merchants_money' => (float)sprintf("%.3f",$platformCommissionMoney * $set['commission_merchants_rate'] / 100), 'commission_promoter_rate' => $set['commission_promoter_rate'], - 'commission_promoter_money' => (float)sprintf("%.2f",$platformCommissionMoney * $set['commission_promoter_rate'] / 100), + 'commission_promoter_money' => (float)sprintf("%.3f",$platformCommissionMoney * $set['commission_promoter_rate'] / 100), 'commission_integral_release_rate' => $set['commission_integral_release_rate'], - 'commission_integral_release_money' => (float)sprintf("%.2f",$platformCommissionMoney * $set['commission_integral_release_rate'] / 100), + 'commission_integral_release_money' => (float)sprintf("%.3f",$platformCommissionMoney * $set['commission_integral_release_rate'] / 100), ]; // 减少商户金额 if (systemConfig('mer_lock_time')) {