修复：支付成功未解冻推广、招商积分

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');
     }

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);
     }

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']),

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;

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')

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,[

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());
         }