修改回复回调问题

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -629,20 +629,20 @@ class OrderMerchantRepository extends BaseRepository
 
                 // $user = $userRepository->getOne($where);
                 $user = Db::name('user')->where($where)->find();
-                $order = (object)$order;
                 if($user){
                     $this->feidacang_fenyong($user, $order_data, 0);
                 }
                 $this->feidacang_fenyong_mer($user, $order_data, 0);
                 // 增加商户分润
-                $mer_fanyongbili = merchantConfig($order['mer_id'], 'base_commission');
+                $mer_fanyongbili = merchantConfig($order_data['mer_id'], 'base_commission');
                 if ($mer_fanyongbili == 0) {
                     $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
                 }
-                $commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);
+                $commission = bcmul($order_data['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);
                 $orderRepository = app()->make(StoreOrderRepository::class);
-                $orderRepository->con_log_fenrun($merchant['uid'],$commission,$order['order_id'],10,'扫码下单产生分润值',1);
+                $orderRepository->con_log_fenrun($merchant['uid'],$commission,$order_data['order_id'],10,'扫码下单产生分润值',1);
                 $user = $userRepository->getOne($where);
+                $order = (object)$order;
                 $this->doBind($user, $order, $flag);//锁客
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
                 // $this->doBroadcast($actuallyPaid, $mer_id);
@@ -1422,7 +1422,7 @@ class OrderMerchantRepository extends BaseRepository
 
         //用户推荐人可拿的养老金
         $user_yanglaojin = bcmul($pv, $yonghu_bili_tuijian, 2);
-        if ($user_yanglaojin >= 0.01) {
+        if ($user_yanglaojin >= 0.01 && !empty($top_data["spread_uid"])) {
             $mark = "推荐人扫码消费获得养老金" . $user_yanglaojin;
             $title = "养老金";
             $source = 1;
@@ -1435,7 +1435,7 @@ class OrderMerchantRepository extends BaseRepository
         //用户推荐人佣金
         $tuijian_yongjin = bcmul($pv, $yonghu_tuijian, 2);
         $tuijian_yongjin_90 = bcmul($tuijian_yongjin, '0.9', 2);
-        if ($tuijian_yongjin_90 >= 0.01) {
+        if ($tuijian_yongjin_90 >= 0.01 && !empty($top_data["spread_uid"])) {
             $mark = "推荐人扫码消费获得" . $tuijian_yongjin_90 . '佣金';
             $title = "佣金";
             $source = 1;
@@ -1445,7 +1445,7 @@ class OrderMerchantRepository extends BaseRepository
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
         }
         // 推荐人获得贡献值
-        if($pv >= 0.01){
+        if($pv >= 0.01 && !empty($top_data["spread_uid"])){
             $gongxian_data = [
                 "uid"           =>$top_data["spread_uid"],
                 "number"  =>    $pv,
@@ -1465,7 +1465,7 @@ class OrderMerchantRepository extends BaseRepository
 
         //推荐人获得积分
         $jifen = bcmul($pv, $yonghu_tuijian, 2);
-        if($jifen >= 0.01){
+        if($jifen >= 0.01 && !empty($top_data["spread_uid"])){
             $spread_data['uid'] = $top_data["spread_uid"];
             $spread_data['continuity_day'] = 0;
             $spread_data['reward_socre'] = $jifen;
@@ -1483,7 +1483,7 @@ class OrderMerchantRepository extends BaseRepository
         }
         //用户推荐人获得复购金佣金百分之10
         $tuijian_fugou = bcmul($tuijian_yongjin, $yonghu_fugou, 2);
-        if ($tuijian_fugou >= 0.01) {
+        if ($tuijian_fugou >= 0.01 && !empty($top_data["spread_uid"])) {
             $bill = [
                 'uid'=>$top_data["spread_uid"],
                 'number'=>$tuijian_fugou,//数量