扫码付款逻辑变更

app/command/PensionTasks.php

@@ -163,103 +163,103 @@ class PensionTasks extends Command
 
 
                 // 结算红包
-                $user_sign_hongbao_list = Db::name('user_sign_hongbao')
-                    ->where('status', -1)
-                    ->where('order_id', $offline['id'])
-                    ->whereIn('type', [1, 2])
-                    ->select()
-                    ->toArray();
-                foreach ($user_sign_hongbao_list as $user_sign_hongbao) {
-                    if($user_sign_hongbao['uid']){
-                        // 修改红包
-                        Db::name('user')
-                            ->where('uid', $user_sign_hongbao['uid'])
-                            ->inc('hongbao', (float)$user_sign_hongbao['number'])
-                            ->update();
-                        Db::name('user_sign_hongbao')
-                            ->where('status', -1)
-                            ->where('id', $user_sign_hongbao['id'])
-                            ->update([
-                                'status'          => 1,
-                                'settlement_time' => date('Y-m-d H:i:s')
-                            ]);
-                    }
-                }
+                // $user_sign_hongbao_list = Db::name('user_sign_hongbao')
+                //     ->where('status', -1)
+                //     ->where('order_id', $offline['id'])
+                //     ->whereIn('type', [1, 2])
+                //     ->select()
+                //     ->toArray();
+                // foreach ($user_sign_hongbao_list as $user_sign_hongbao) {
+                //     if($user_sign_hongbao['uid']){
+                //         // 修改红包
+                //         Db::name('user')
+                //             ->where('uid', $user_sign_hongbao['uid'])
+                //             ->inc('hongbao', (float)$user_sign_hongbao['number'])
+                //             ->update();
+                //         Db::name('user_sign_hongbao')
+                //             ->where('status', -1)
+                //             ->where('id', $user_sign_hongbao['id'])
+                //             ->update([
+                //                 'status'          => 1,
+                //                 'settlement_time' => date('Y-m-d H:i:s')
+                //             ]);
+                //     }
+                // }
 
 
-                // 结算积分
-                $user_sign_score_list = Db::name('user_sign_score')
-                    ->where('status', -1)
-                    ->where('order_id', $offline['id'])
-                    ->whereIn('type', [1, 2])
-                    ->select()
-                    ->toArray();
-                foreach ($user_sign_score_list as $user_sign_score) {
-                    if($user_sign_score['uid']){
-                        // 修改积分
-                        Db::name('user')
-                        ->where('uid', $user_sign_score['uid'])
-                        ->inc('score', (float)$user_sign_score['reward_socre'])
-                        ->update();
-                        Db::name('user_sign_score')
-                            ->where('status', -1)
-                            ->where('id', $user_sign_score['id'])
-                            ->update([
-                                'status'          => 1,
-                                'settlement_time' => date('Y-m-d H:i:s')
-                            ]);
-                    }
-                }
+                // // 结算积分
+                // $user_sign_score_list = Db::name('user_sign_score')
+                //     ->where('status', -1)
+                //     ->where('order_id', $offline['id'])
+                //     ->whereIn('type', [1, 2])
+                //     ->select()
+                //     ->toArray();
+                // foreach ($user_sign_score_list as $user_sign_score) {
+                //     if($user_sign_score['uid']){
+                //         // 修改积分
+                //         Db::name('user')
+                //         ->where('uid', $user_sign_score['uid'])
+                //         ->inc('score', (float)$user_sign_score['reward_socre'])
+                //         ->update();
+                //         Db::name('user_sign_score')
+                //             ->where('status', -1)
+                //             ->where('id', $user_sign_score['id'])
+                //             ->update([
+                //                 'status'          => 1,
+                //                 'settlement_time' => date('Y-m-d H:i:s')
+                //             ]);
+                //     }
+                // }
 
 
-                // 结算贡献值
-                $user_sign_gongxian_list = Db::name('user_sign_gongxian')
-                    ->where('status', -1)
-                    ->where('order_id', $offline['id'])
-                    ->whereIn('type', [1, 2])
-                    ->select()
-                    ->toArray();
-                foreach ($user_sign_gongxian_list as $user_sign_gongxian) {
-                    if($user_sign_gongxian['uid']){
-                        // 修改贡献值
-                        Db::name('user')
-                        ->where('uid', $user_sign_gongxian['uid'])
-                        ->inc('contribute', (float)$user_sign_gongxian['number'])
-                        ->update();
-                        Db::name('user_sign_gongxian')
-                        ->where('status', -1)
-                        ->where('id', $user_sign_gongxian['id'])
-                        ->update([
-                            'status'          => 1,
-                            'settlement_time' => date('Y-m-d H:i:s')
-                        ]);
-                    }
-                }
+                // // 结算贡献值
+                // $user_sign_gongxian_list = Db::name('user_sign_gongxian')
+                //     ->where('status', -1)
+                //     ->where('order_id', $offline['id'])
+                //     ->whereIn('type', [1, 2])
+                //     ->select()
+                //     ->toArray();
+                // foreach ($user_sign_gongxian_list as $user_sign_gongxian) {
+                //     if($user_sign_gongxian['uid']){
+                //         // 修改贡献值
+                //         Db::name('user')
+                //         ->where('uid', $user_sign_gongxian['uid'])
+                //         ->inc('contribute', (float)$user_sign_gongxian['number'])
+                //         ->update();
+                //         Db::name('user_sign_gongxian')
+                //         ->where('status', -1)
+                //         ->where('id', $user_sign_gongxian['id'])
+                //         ->update([
+                //             'status'          => 1,
+                //             'settlement_time' => date('Y-m-d H:i:s')
+                //         ]);
+                //     }
+                // }
 
-                // 结算佣金
-                $user_bill_list = Db::name('user_bill')
-                ->where('status', 0)
-                ->where('commission_type','<>', 5)
-                ->where([ 'link_id' => $offline['id'], 'order_sn' => $offline['order_sn']])
-                ->select()
-                ->toArray();
-                foreach ($user_bill_list as $user_bill) {
-                    if($user_bill['uid']){
-                        if ($user_bill['commission_type'] != 5) {
-                            if (in_array($user_bill['commission_type'], [7,12,19])) {
-                                Db::name("merchant")
-                                    ->where("mer_id", $user_bill['mer_id'])
-                                    ->inc('brokerage_price', (float)$user_bill['number'])
-                                    ->update();
-                            } else {
-                                Db::name('user')
-                                    ->where('uid', $user_bill['uid'])
-                                    ->inc('brokerage_price', (float)$user_bill['number'])
-                                    ->update();
-                            }
-                        }
-                    }
-                }
+                // // 结算佣金
+                // $user_bill_list = Db::name('user_bill')
+                // ->where('status', 0)
+                // ->where('commission_type','<>', 5)
+                // ->where([ 'link_id' => $offline['id'], 'order_sn' => $offline['order_sn']])
+                // ->select()
+                // ->toArray();
+                // foreach ($user_bill_list as $user_bill) {
+                //     if($user_bill['uid']){
+                //         if ($user_bill['commission_type'] != 5) {
+                //             if (in_array($user_bill['commission_type'], [7,12,19])) {
+                //                 Db::name("merchant")
+                //                     ->where("mer_id", $user_bill['mer_id'])
+                //                     ->inc('brokerage_price', (float)$user_bill['number'])
+                //                     ->update();
+                //             } else {
+                //                 Db::name('user')
+                //                     ->where('uid', $user_bill['uid'])
+                //                     ->inc('brokerage_price', (float)$user_bill['number'])
+                //                     ->update();
+                //             }
+                //         }
+                //     }
+                // }
 
 
             });

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

@@ -628,7 +628,10 @@ class OrderMerchantRepository extends BaseRepository
 
                 $user = $userRepository->getOne($where);
                 $order = (object)$order;
-                $this->feidacang_fenyong($user, $order_data, 0);
+                if($user){
+                    $this->feidacang_fenyong($user, $order_data, 0);
+                }
+                $this->feidacang_fenyong_mer($user, $order_data, 0);
                 $this->doBind($user, $order, $flag);//锁客
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
                 // $this->doBroadcast($actuallyPaid, $mer_id);
@@ -979,7 +982,6 @@ class OrderMerchantRepository extends BaseRepository
                 break;
             default:
                 return true;
-
         }
         $userOfflineRechargeRepository = app()->make(UserOfflineRechargeRepository::class);
         if (!$user['mer_id']) {
@@ -1306,18 +1308,14 @@ class OrderMerchantRepository extends BaseRepository
         $yonghu_bili_tuijian = '0.05';
         //用户推荐人，消费者的推荐人佣金
         $yonghu_tuijian = $this->getUserGroupRate($user['user_group']);
-
-        $getMerchantContribution = $this->getMerchantContribution($mer_fanyongbili);
-        //商家贡献值比例
-        $mer_gonxian = $getMerchantContribution['gonxian'];
-        //  商家京豆比例
-        $mer_jd = $getMerchantContribution['jd'];
-        //跨店分佣
-        $kd = 0.1;
+        //用户推荐人，消费者的推荐人复购金
+        $yonghu_fugou = '0.1';
         /**
          * 各自的比例结束
          */
 
+        // 用户---------------------------------------------------------------------------------------------------------------
+
         //用户可拿的养老金
         $user_yanglaojin = bcmul($divisible_commission, $yonghu_bili, 2);
         if ($user_yanglaojin >= 0.01) {
@@ -1331,23 +1329,25 @@ 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');
-        if($user["is_old"]==1 && $user["old_vip_limit"] < $old_vip_limit){
+        $old_vip_limit = Db::name('user_sign_hongbao')->where('uid',$order["uid"])->sum('number') ?? 0;
+        if($user["is_old"]==1){
             //添加红包
             $hongbao=bcmul($pv, $yonghu_hongbao, 2);
             $hongbao_data = [
                 "uid"           =>$order["uid"],
                 "number"  =>    $hongbao,
                 "addtime"       =>time(),
-                "status"        =>-1,
+                "status"        =>1,
                 "order_type"    =>1,
                 "order_id"      =>$order_id,
-                "mark"          =>"消费获得赠送红包",
+                "mark"          =>"扫码消费获得赠送红包",
                 "desc"          =>'',
                 "surplus"       =>$hongbao,
-                "type"          =>1
+                "type"          =>1,
+                'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_hongbao")->insert($hongbao_data);//添加记录
+            Db::name('user')->where('uid', $order["uid"])->inc('hongbao', (float)$hongbao)->update();
         }
 
         ///用户可以拿到PV等值的积分和贡献值
@@ -1358,36 +1358,42 @@ class OrderMerchantRepository extends BaseRepository
             $ins_data['reward_socre'] = $pv;
             $ins_data['signin_time'] = 0;
             $ins_data['addtime'] = time();
-            $ins_data['status'] = -1;
-            $ins_data['mark'] = "消费获得赠送积分";
+            $ins_data['status'] = 1;
+            $ins_data['mark'] = "扫码消费获得赠送积分";
             $ins_data['source_type'] = 3;
             $ins_data['settlement_time'] = 0;// 结算时间 真正到了结算时间会结算
             $ins_data['order_id'] = $order_id;
             $ins_data['pm'] = 1;
             $ins_data['order_type'] = $order_id;
+            $ins_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($ins_data);
+            Db::name('user')->where('uid', $order["uid"])->inc('score', (float)$pv)->update();
             //贡献值
             $gongxian_data = [
                 "uid"           =>$order["uid"],
                 "number"  =>    $pv,
                 "addtime"       =>time(),
-                "status"        =>-1,
+                "status"        =>1,
                 "order_type"    =>1,
                 "order_id"      =>$order_id,
-                "mark"          =>"消费获得赠送贡献值",
+                "mark"          =>"扫码消费获得赠送贡献值",
                 "desc"          =>'',
                 "surplus"       =>$pv,
-                "type"          =>1
+                "type"          =>1,
+                'settlement_time' => date('Y-m-d H:i:s')
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
+            Db::name('user')->where('uid', $order["uid"])->inc('contribute', (float)$pv)->update();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }
 
+        // 用户推荐人---------------------------------------------------------------------------------------------------------------
+
         //用户推荐人可拿的养老金
         $user_yanglaojin = bcmul($pv, $yonghu_bili_tuijian, 2);
         if ($user_yanglaojin >= 0.01) {
-            $mark = "推荐线下消费获得养老金" . $user_yanglaojin;
+            $mark = "推荐人扫码消费获得养老金" . $user_yanglaojin;
             $title = "养老金";
             $source = 1;
             $commission_type = 5;
@@ -1398,16 +1404,83 @@ class OrderMerchantRepository extends BaseRepository
 
         //用户推荐人佣金
         $tuijian_yongjin = bcmul($pv, $yonghu_tuijian, 2);
-        if ($tuijian_yongjin >= 0.01) {
-            $mark = "推荐线下消费获得" . $tuijian_yongjin . '佣金';
+        $tuijian_yongjin_90 = bcmul($tuijian_yongjin, '0.9', 2);
+        if ($tuijian_yongjin_90 >= 0.01) {
+            $mark = "推荐人扫码消费获得" . $tuijian_yongjin_90 . '佣金';
             $title = "佣金";
             $source = 1;
             $commission_type = 3;
-            $this->add_bill($title, $tuijian_yongjin, $top_data["spread_uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
+            $this->add_bill($title, $tuijian_yongjin_90, $top_data["spread_uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], $source, 1);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，佣金低于0.01无法入库 特此记录！']);
         }
 
+        //用户推荐人获得复购金佣金百分之10
+        $tuijian_fugou = bcmul($tuijian_yongjin, $yonghu_fugou, 2);
+        if ($tuijian_fugou >= 0.01) {
+            $bill = [
+                'uid'=>$top_data["spread_uid"],
+                'number'=>$tuijian_fugou,//数量
+                'status'=>-1,//复购金状态1-有效 0-失效 -1待确认
+                'mark'=>"推荐人扫码消费赠送" . $tuijian_fugou . '复购金',//备注
+                'order_id'=>$order_id,//订单id
+                'surplus'=>0,//剩余
+                'order_type'=>0,//关联订单ID
+                'type'=>1,//复购金类型 :1赠送，2消耗
+                'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
+                'addtime'=>time(),
+            ];
+            Db::name('user_sign_fugou')->insert($bill);
+        } else {
+            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的复购金比例较低，复购金低于0.01无法入库 特此记录！']);
+        }
+    }
+
+
+
+
+
+
+
+    //商户二维码收款商家返佣
+    public function feidacang_fenyong_mer($user, $order, $pay_status)
+    {
+        $userRepository = app()->make(UserRepository::class);
+        if ($pay_status == 1) {
+            return '';
+        }
+        $top_data = Db::name('user')->where('uid', $order['uid'])->field('spread_uid,mer_id')->find();
+        $mer_fanyongbili = merchantConfig($order['mer_id'], 'base_commission');
+        //如果商户返佣比例设置的是0怎查系统设设置的分佣比例
+        if ($mer_fanyongbili == 0) {
+            $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
+        }
+        //如果系统设置的是0就不执行！
+        if ($mer_fanyongbili == 0) {
+            Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . ' 订单因商家、平台没有设置返佣比例无任何奖励特此记录！']);
+            return '';
+        }
+        $order_sn = $order['order_sn'] ?? '';
+        $order_id = $order['order_id'] ?? '';
+        //可分总佣金
+        $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
+        $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
+
+        /**
+         * 各自的比例开始
+         */
+        $getMerchantContribution = $this->getMerchantContribution($mer_fanyongbili);
+        //商家贡献值比例
+        $mer_gonxian = $getMerchantContribution['gonxian'];
+        //  商家京豆比例
+        $mer_jd = $getMerchantContribution['jd'];
+        //跨店分佣
+        $kd = 0.1;
+        /**
+         * 各自的比例结束
+         */
+
+        // 商户---------------------------------------------------------------------------------------------------------------
 
         $mer_data = Db::name('merchant')->where('mer_id', $order['mer_id'])->field('uid,mer_id')->find();
         $userRepository = app()->make(UserRepository::class);
@@ -1431,7 +1504,7 @@ class OrderMerchantRepository extends BaseRepository
                 "type"          =>1
             ];
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
-            $merchant_user->contribute += $pv;
+            $merchant_user->contribute = $merchant_user->contribute + $pv;
             $merchant_user->save();
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
@@ -1453,14 +1526,14 @@ class OrderMerchantRepository extends BaseRepository
                 "surplus"       =>$jd,
                 "type"          =>1
             ];
-            $merchant_user->jingdou += $pv;
+            $merchant_user->jingdou = $merchant_user->jingdou + $pv;
             $merchant_user->save();
             Db::name("user_sign_jingdou")->insert($jd_data);//添加记录
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，贡献值低于0.01无法入库 特此记录！']);
         }
 
-        Db::name('log')->insert(['data' => 'PV:' . $pv .' mer_jd:'. $mer_jd.' mer_gonxian:'.$mer_gonxian]);
+        Db::name('log')->insert(['data' => 'PV:' . $pv .' mer_jd:'. $mer_jd.' mer_gonxian:'.$mer_gonxian.' jingdou:'.$merchant_user->jingdou.' contribute:'.$merchant_user->contribute]);
 
         //跨店
         $kd_yongjin = bcmul($divisible_commission, $kd, 2);
@@ -1479,6 +1552,16 @@ class OrderMerchantRepository extends BaseRepository
     }
 
 
+
+
+
+
+
+
+
+
+
+
     /**
      * 佣金加入账单
      * @param $title
@@ -1498,9 +1581,9 @@ class OrderMerchantRepository extends BaseRepository
         if ($commission_type != 5) {
             $promoter_rate_technology = systemConfig('promoter_rate_technology');
             if (floatval($promoter_rate_technology)) {
-                $number = $number - ($number * $promoter_rate_technology / 100);
+                // $number = $number - ($number * $promoter_rate_technology / 100);
                 // var_dump(=$number-$number*$promoter_rate_technology)
-                $mark .= ",扣除技术服务费" . $promoter_rate_technology . "%";
+                // $mark .= ",扣除技术服务费" . $promoter_rate_technology . "%";
             }
         }
 

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -16,6 +16,7 @@ use app\common\model\merchant\order\OrderMerchant;
 use app\common\repositories\BaseRepository;
 use think\facade\Db;
 use think\facade\Log;
+use app\common\repositories\merchant\order\OrderMerchantRepository;
 
 /**
  * 用户线下充值
@@ -156,16 +157,33 @@ class UserOfflineRechargeRepository extends BaseRepository
 
                     //同步用户部分------------------------------------
                     //同步红包
-                    Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    // Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
 
-                    //同步佣金
-                    Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    // //同步佣金
+                    // Db::name("user_sign_hongbao")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
 
-                    //同步积分
-                    Db::name("user_sign_score")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    // //同步积分
+                    // Db::name("user_sign_score")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+
+                    // //同步复购金
+                    // Db::name("user_sign_fugou")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
                     
-                    //同步贡献值
-                    Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+                    // //同步贡献值
+                    // Db::name("user_sign_gongxian")->where('order_id', $order->id)->update(['uid' => $unionUser->uid]);
+
+
+
+                    //同步后返佣
+                    $userRepository = app()->make(OrderMerchantRepository::class);
+                    $order_data = [
+                        'order_sn' => $order->out_trade_no,
+                        'order_id' => $order->id,
+                        'pay_price' => $order->money,
+                        'uid' => $unionUser->uid,
+                        'mer_id' => $order->mer_id
+                    ];
+                    $user = Db::name('user')->where('uid', $unionUser->uid)->find();
+                    $userRepository->feidacang_fenyong($user, $order_data, 0);
 
                     OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->update(['uid' => $unionUser->uid, 'binds' => 1]);
                 }

app/controller/api/user/User.php

@@ -284,7 +284,7 @@ class User extends BaseController
         if($user->uid>0){
             //已经入账京豆
             //$data['total_source']=$user->vr;//原件
-            $data['total_source'] = 0;//临时使用
+            $data['total_source'] = $user->jingdou;//临时使用
             //为生效京豆
             $data['no_total_source']=Db::name('user_sign_jingdou')->where('status', -1)->where('uid', $user->uid)->sum('number');;
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
@@ -295,7 +295,6 @@ class User extends BaseController
 
     }
     public function  jingdou_list(){
-        return;
         $pm = $this->request->param('pm');
 
         [$page, $limit] = $this->getPage();
@@ -311,10 +310,9 @@ class User extends BaseController
             $data = DB::name('user_sign_jingdou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
-        // if($pm==2){
-        //     $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
-        // }
+        if($pm==2){
+            $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+        }
         // $data['total'] =111;
 
         log::info("=======date==={$data}");