From b9cba1aaecf71c2a42fe9e94881356963560656f Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Wed, 3 Jan 2024 16:19:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=9C=AA=E8=A7=A3=E5=86=BB=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E3=80=81=E6=8B=9B=E5=95=86=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/platformCommission/RecordRepository.php | 2 +- .../admin/store/marketing/PlatformCommission.php | 14 ++++++++++++++ .../CommissionPartnerSettlementJob.php | 2 +- .../refundOrderHandle/HandleIntegralJob.php | 2 +- .../platformCommission/OrderAgreeRefundEvent.php | 2 +- .../platformCommission/OrderPaySuccessEvent.php | 2 +- app/listener/platformCommission/OrderTakeEvent.php | 7 +++++++ 7 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/common/repositories/store/platformCommission/RecordRepository.php b/app/common/repositories/store/platformCommission/RecordRepository.php index 981dea3..a6c9041 100644 --- a/app/common/repositories/store/platformCommission/RecordRepository.php +++ b/app/common/repositories/store/platformCommission/RecordRepository.php @@ -106,7 +106,7 @@ class RecordRepository extends BaseRepository{ ->order('create_time DESC') ->order('id DESC'); $count = $query->count(); - $list = $query->page($page,$limit)->select(); + $list = $query->page($page,$limit)->select()->toArray(); return compact('count','list'); } diff --git a/app/controller/admin/store/marketing/PlatformCommission.php b/app/controller/admin/store/marketing/PlatformCommission.php index 4eaa920..e2abf1b 100644 --- a/app/controller/admin/store/marketing/PlatformCommission.php +++ b/app/controller/admin/store/marketing/PlatformCommission.php @@ -96,6 +96,20 @@ class PlatformCommission extends BaseController{ $params = $this->request->params(['uid','mer_id']); $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']); + } return app('json')->success($data); } diff --git a/app/jobs/store/platformCommission/CommissionPartnerSettlementJob.php b/app/jobs/store/platformCommission/CommissionPartnerSettlementJob.php index ce35615..e5f148d 100644 --- a/app/jobs/store/platformCommission/CommissionPartnerSettlementJob.php +++ b/app/jobs/store/platformCommission/CommissionPartnerSettlementJob.php @@ -42,7 +42,7 @@ class CommissionPartnerSettlementJob implements JobInterface{ foreach($list as $singleInfo){ $userBillRepository->incBill($singleInfo['uid'], 'brokerage', 'commission_partner', [ 'link_id' => $singleInfo['cycle_id'], - 'status' => 0, + 'status' => 1, 'title' => '获得权重值分红', 'number' => $singleInfo['money'], 'mark' => $dateCycle. '时间内获得权重值分红,分红金额：' . floatval($singleInfo['money']), diff --git a/app/jobs/store/platformCommission/refundOrderHandle/HandleIntegralJob.php b/app/jobs/store/platformCommission/refundOrderHandle/HandleIntegralJob.php index 85b0729..ce2cbad 100644 --- a/app/jobs/store/platformCommission/refundOrderHandle/HandleIntegralJob.php +++ b/app/jobs/store/platformCommission/refundOrderHandle/HandleIntegralJob.php @@ -13,7 +13,7 @@ use think\facade\Log; class HandleIntegralJob implements JobInterface{ public function fire($job,$data){ try{ - Log::info("订单退款成功 - 抵扣积分退回 - 开始处理: ".var_export($data,1)); + // Log::info("订单退款成功 - 抵扣积分退回 - 开始处理: ".var_export($data,1)); // 获取订单商品信息 $orderProductInfo = StoreOrderProduct::field('uid,order_id,use_legumes_integral')->where('order_product_id',$data['order_product_id'])->find(); $useLegumesIntegral = $orderProductInfo->use_legumes_integral ?? 0; diff --git a/app/listener/platformCommission/OrderAgreeRefundEvent.php b/app/listener/platformCommission/OrderAgreeRefundEvent.php index 3036252..f88bba3 100644 --- a/app/listener/platformCommission/OrderAgreeRefundEvent.php +++ b/app/listener/platformCommission/OrderAgreeRefundEvent.php @@ -26,7 +26,7 @@ class OrderAgreeRefundEvent{ public function handle($data){ try{ $refund = $data['refund']; - // Log::info('订单进入退款成功 - 平台抽成相关处理 - 开始：'.var_export(['id' => $data['id']],1)); + Log::info('订单进入退款成功 - 平台抽成相关处理 - 开始：'.var_export(['id' => $data['id']],1)); $refundProductList = app()->make(StoreRefundProductRepository::class) ->getSearch([]) ->field('order_product_id,refund_price,refund_num,refund_legumes_integral') diff --git a/app/listener/platformCommission/OrderPaySuccessEvent.php b/app/listener/platformCommission/OrderPaySuccessEvent.php index 9bb7d07..31f07b4 100644 --- a/app/listener/platformCommission/OrderPaySuccessEvent.php +++ b/app/listener/platformCommission/OrderPaySuccessEvent.php @@ -18,7 +18,7 @@ class OrderPaySuccessEvent{ public function handle($groupOrder){ $groupOrder = $groupOrder['groupOrder']; try{ - // Log::info('支付成功 - 平台抽成处理 - 开始： '.var_export(['uid'=>$groupOrder->uid,'group_order_id'=>$groupOrder->group_order_id],1)); + Log::info('支付成功 - 平台抽成处理 - 开始： '.var_export(['uid'=>$groupOrder->uid,'group_order_id'=>$groupOrder->group_order_id],1)); $this->orderPaySuccessHandle($groupOrder); // 订单支付成功 触发购买商品升级 Queue::push(UserBrokerageLevelJob::class,[ diff --git a/app/listener/platformCommission/OrderTakeEvent.php b/app/listener/platformCommission/OrderTakeEvent.php index e66e45e..48c6c90 100644 --- a/app/listener/platformCommission/OrderTakeEvent.php +++ b/app/listener/platformCommission/OrderTakeEvent.php @@ -4,6 +4,7 @@ namespace app\listener\platformCommission; use app\common\model\store\platformCommission\LegumesLog; +use app\common\model\user\UserBill; use think\facade\Log; /** @@ -25,6 +26,12 @@ class OrderTakeEvent{ ],1)); // 分配豆豆解冻 LegumesLog::update(['status'=>1],['order_id'=>$order->order_id]); + // 解冻佣金 + UserBill::whereIn('type',['commission_promoter','commission_merchants'])->update(['status' => 1],[ + 'link_id' => $order->order_id, + 'category' => 'brokerage', + ]); + }catch(\Exception $e){ Log::info('订单进入待评价 - 平台抽成相关处理 - 错误： '.$e->getMessage()); }