修复线下扫码问题

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

@@ -250,6 +250,7 @@ class OrderMerchantRepository extends BaseRepository
                 //若商家返佣比例不存在 则使用平台配置
                 $base_commission = merchantConfig(0, 'extension_one_rate');
             }
+            if($params['mer_id'] == 3425) $base_commission = 0;
             $merchant_data = Db::name('merchant')->where('mer_id', $params['mer_id'])->find();
             $is_dacang = 0;
             $avaiable = 0;

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -200,7 +200,7 @@ class UserOfflineRechargeRepository extends BaseRepository
                     $order = (object)$order;
                     $userRepository = app()->make(UserRepository::class);
                     $user = $userRepository->getOne(['uid' => $unionUser->uid]);
-                    $userRepository->doBind($user, $order, $flag);
+                    $OrderMerchantRepository->doBind($user, $order, $flag);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }