扫码支付锁客

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

@@ -626,12 +626,14 @@ class OrderMerchantRepository extends BaseRepository
 
                 Merchant::getDB()->where('mer_id', $mer_id)->inc('sales', 1)->update();
 
-                $user = $userRepository->getOne($where);
+                // $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);
+                $user = $userRepository->getOne($where);
                 $this->doBind($user, $order, $flag);//锁客
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
                 // $this->doBroadcast($actuallyPaid, $mer_id);
@@ -840,9 +842,10 @@ class OrderMerchantRepository extends BaseRepository
             Db::name('order_merchant')->where('id', $order->id)->update(['binds' => 1, 'uid' => $user->uid]);
             //锁定商户
             if (!$user->mer_id) {
-                $user->mer_id = $order->mer_id;
-                $user->save();
-                
+                // $user->mer_id = $order->mer_id;
+                // $user->save();
+                Db::name('user')->where('uid', $user->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
+
                 $mer_fanyongbili = merchantConfig($order->mer_id, 'base_commission');
                 //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
                 if ($mer_fanyongbili == 0) {
@@ -860,13 +863,16 @@ class OrderMerchantRepository extends BaseRepository
                 $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
 
                 //商户锁客收益：PV的5%==14元X5%=0.7元 （加入到用户佣金，可以从用户佣金中提现，商户显示锁客收益总额）
+                $mer_data = Db::name('merchant')->where('mer_id', $order->mer_id)->field('uid,mer_id')->find();
+                $merchant_user = $userRepository->getOne(['uid' => $mer_data["uid"]]);
+
                 $suo_commission = bcmul($pv, '0.5', 2);
                 if ($suo_commission >= 0.01) {
                     $mark = "用户获得商户锁客收益" . $suo_commission . '佣金';
                     $title = "佣金";
                     $source = 1;
                     $commission_type = 3;
-                    $this->add_bill($title, $suo_commission, $user->uid, $mark, $commission_type, $order_sn, $order_id, $order->mer_id, $source, 1);
+                    $this->add_bill($title, $suo_commission, $merchant_user->uid, $mark, $commission_type, $order_sn, $order_id, $order->mer_id, $source, 1);
                 } else {
                     Db::name('log')->insert(['data' => '订单号：' . $order->order_sn . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
                 }
@@ -1330,7 +1336,7 @@ class OrderMerchantRepository extends BaseRepository
 
         // 用户可以拿到的红包 红包：如果是1.0的老用户 pv的45%放到红包里面。14*45%=6.3元。直至金额满足1.0平台当前用户身份为止就不在反红包了
         $old_vip_limit = Db::name('user_sign_hongbao')->where('uid',$order["uid"])->sum('number') ?? 0;
-        if($user["is_old"]==1){
+        if($user['is_old']==1 && $old_vip_limit >= $user['old_vip_limit']){
             //添加红包
             $hongbao=bcmul($pv, $yonghu_hongbao, 2);
             $hongbao_data = [

app/controller/api/Auth.php

@@ -961,7 +961,7 @@ class Auth extends BaseController
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL => 'http://shop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_URL => 'http://testshop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_MAXREDIRS => 10,
@@ -1376,8 +1376,7 @@ class Auth extends BaseController
         }
 
         $user = $repository->accountByUser($data['phone']);
-        if (!$user)
-            $user = $repository->registr($data['phone'], $data['password'],'MP',intval($data['spread']));
+        if (!$user) $user = $repository->registr($data['phone'], $data['password'],'MP',intval($data['spread']));
         $user = $repository->mainUser($user);
         $repository->bindSpread($user, intval($data['spread']));