Просмотр исходного кода

分红和会员下单规则修改

橙汁先生 1 год назад
Родитель
Сommit
a85b4c94d4

+ 80 - 12
app/common/repositories/store/order/StoreOrderRepository.php

@@ -985,11 +985,57 @@ class StoreOrderRepository extends BaseRepository
985
                         }else if(!empty($array_fzone_paytype['type'] == 'a1')){
985
                         }else if(!empty($array_fzone_paytype['type'] == 'a1')){
986
                             //生活 VR支付
986
                             //生活 VR支付
987
 
987
 
988
+                            $user_data = Db::name("user")->where("uid", $uid)->find();
989
+
988
                             $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
990
                             $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
989
 
991
 
990
                             if($vrpri >= 0){
992
                             if($vrpri >= 0){
991
                                 Db::name("user")->where("uid", $uid)->update(['vr'=>$vrpri]);
993
                                 Db::name("user")->where("uid", $uid)->update(['vr'=>$vrpri]);
992
                             }
994
                             }
995
+
996
+                            //给会员更改用户余额信息
997
+                            //业务员和以上推广的等级获得推广佣金
998
+                            $le_yw_amount = 0;
999
+                            //获赠的贡献值和积分
1000
+                            $gx_jf = 0;
1001
+                            $yj1 = 0;
1002
+                            if($array_fzone_paytype['price'] == 1180){
1003
+                                $pv = 1000;
1004
+                                $gx_jf = 700;
1005
+                                $yj1 = 100;
1006
+                                $le_yw_amount = 300;
1007
+                            }else if($array_fzone_paytype['price'] == 10620){
1008
+                                $pv = 9000;
1009
+                                $gx_jf = 6300;
1010
+                                $yj1 = 900;
1011
+                                $le_yw_amount = 2700;
1012
+                            }else if($array_fzone_paytype['price'] == 11800){
1013
+                                $pv = 10000;
1014
+                                $gx_jf = 7000;
1015
+                                $yj1 = 1000;
1016
+                                $le_yw_amount = 3000;
1017
+                            }else if($array_fzone_paytype['price'] == 9440){
1018
+                                $pv = 8000;
1019
+                                $gx_jf = 5600;
1020
+                                $yj1 = 800;
1021
+                                $le_yw_amount = 2400;
1022
+                            }else if($array_fzone_paytype['price'] == 2360){
1023
+                                $pv = 2000;
1024
+                                $gx_jf = 1400;
1025
+                                $yj1 = 200;
1026
+                                $le_yw_amount = 600;
1027
+                            }
1028
+
1029
+                            $ylj_pri = round($pv * 0.035,2);
1030
+                            //$pv = round($pv * 0.35,2);
1031
+
1032
+                            //分配养老金给消费者
1033
+                            //普通用户获取贡献值和pv3.5%养老金和积分
1034
+                            $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
1035
+                            $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
1036
+                            $jf_amount_mine = $user_data['score'] + $gx_jf;
1037
+
1038
+                            // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
993
                             $paystage_status = 1;
1039
                             $paystage_status = 1;
994
                             //修改订单状态
1040
                             //修改订单状态
995
                             $orderdatas = Db::name("store_order")->where("order_id", $_order->order_id)->update(['paid'=>1,'pay_time'=> date('Y-m-d H:i:s'),'status'=>0]);
1041
                             $orderdatas = Db::name("store_order")->where("order_id", $_order->order_id)->update(['paid'=>1,'pay_time'=> date('Y-m-d H:i:s'),'status'=>0]);
@@ -1010,8 +1056,30 @@ class StoreOrderRepository extends BaseRepository
1010
                             $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
1056
                             $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
1011
 
1057
 
1012
                             //会员专区,给用户升级判断
1058
                             //会员专区,给用户升级判断
1013
-                            //Db::name("store_order")->where("uid", $uid)->where()->select();
1059
+                            $orderList = Db::name("store_order")->where("uid", $uid)->where("mer_id",496)->where("status", "in", [0, 1, 2, 3])->select();
1060
+                            // 初始化总和变量
1061
+                            $totalPayPrice = 0;
1062
+
1063
+                            // 遍历查询结果
1064
+                            foreach ($orderList as $order) {
1065
+
1014
 
1066
 
1067
+                                // 累加 pay_price
1068
+                                $totalPayPrice += $order['pay_price'];
1069
+                            }
1070
+                            $userdata = Db::name("user")->where("uid", $uid)->find();
1071
+
1072
+                            if($totalPayPrice >= 1180 && $totalPayPrice < 11800){
1073
+
1074
+                                if( $userdata['user_group'] <= 1){
1075
+                                    Db::name("user")->where("uid", $uid)->update(["user_group"=>2]);
1076
+                                }
1077
+
1078
+                            }else if($totalPayPrice >= 11800){
1079
+                                if( $userdata['user_group'] <= 2){
1080
+                                    Db::name("user")->where("uid", $uid)->update(["user_group"=>3]);
1081
+                                }
1082
+                            }
1015
 
1083
 
1016
 
1084
 
1017
                         }
1085
                         }
@@ -9199,8 +9267,8 @@ class StoreOrderRepository extends BaseRepository
9199
                     if($spread_data['user_group'] == 1){
9267
                     if($spread_data['user_group'] == 1){
9200
                         //给推广者分配佣金
9268
                         //给推广者分配佣金
9201
 
9269
 
9202
-                        $yj_amount_90 = round($pv * 0.03,2) * 0.9;
9203
-                        $fgj_amount_10 = round($pv * 0.03,2) * 0.1;//推广者的佣金抽10%到个人复购金
9270
+                        $yj_amount_90 = round($pv * 0.21,2) * 0.9;
9271
+                        $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
9204
 
9272
 
9205
                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
9273
                         $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
9206
                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
9274
                         $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -9208,8 +9276,8 @@ class StoreOrderRepository extends BaseRepository
9208
 
9276
 
9209
                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
9277
                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
9210
 
9278
 
9211
-                        $con = $spread_data['contribute'] + round($pv * 0.03,2);
9212
-                        $score = $spread_data['score'] + round($pv * 0.03,2);
9279
+                        $con = $spread_data['contribute'] + round($pv * 0.21,2);
9280
+                        $score = $spread_data['score'] + round($pv * 0.21,2);
9213
 
9281
 
9214
                         //贡献值和积分
9282
                         //贡献值和积分
9215
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
9283
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
@@ -9217,8 +9285,8 @@ class StoreOrderRepository extends BaseRepository
9217
                         //推广养老金
9285
                         //推广养老金
9218
                         //推广佣金
9286
                         //推广佣金
9219
                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
9287
                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
9220
-                        $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
9221
-                        $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
9288
+                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
9289
+                        $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
9222
 
9290
 
9223
 
9291
 
9224
 
9292
 
@@ -9310,8 +9378,8 @@ class StoreOrderRepository extends BaseRepository
9310
 
9378
 
9311
             $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
9379
             $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
9312
 
9380
 
9313
-            $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
9314
-            $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
9381
+            // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
9382
+            $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分1",1);
9315
 
9383
 
9316
             //查询下单用户上级身份(2.0新表用户)
9384
             //查询下单用户上级身份(2.0新表用户)
9317
             $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
9385
             $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
@@ -9431,7 +9499,7 @@ class StoreOrderRepository extends BaseRepository
9431
                 if($spread_data['user_group'] == 1){
9499
                 if($spread_data['user_group'] == 1){
9432
 
9500
 
9433
                     //获取贡献值和积分和佣金
9501
                     //获取贡献值和积分和佣金
9434
-                    $gx_jf = $spread_data['contribute'] + round($pv * 0.03,2);
9502
+                    $gx_jf = $spread_data['contribute'] + round($pv * 0.21,2);
9435
 
9503
 
9436
 
9504
 
9437
 
9505
 
@@ -9444,8 +9512,8 @@ class StoreOrderRepository extends BaseRepository
9444
 
9512
 
9445
 
9513
 
9446
                     //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
9514
                     //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
9447
-                    $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
9448
-                    $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
9515
+                    $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
9516
+                    $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
9449
                     //推广佣金
9517
                     //推广佣金
9450
                     $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
9518
                     $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
9451
                 }
9519
                 }

+ 11 - 11
app/controller/api/Notify.php

@@ -291,8 +291,8 @@ class Notify
291
                                         if($spread_data['user_group'] == 1){
291
                                         if($spread_data['user_group'] == 1){
292
                                             //给推广者分配佣金
292
                                             //给推广者分配佣金
293
                                             // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
293
                                             // $ylj_amount = $spread_data['annuity'] + round($pv * 0.3,2);
294
-                                            $yj_amount_90 = round($pv * 0.03,2) * 0.9;
295
-                                            $fgj_amount_10 = round($pv * 0.03,2) * 0.1;//推广者的佣金抽10%到个人复购金
294
+                                            $yj_amount_90 = round($pv * 0.21,2) * 0.9;
295
+                                            $fgj_amount_10 = round($pv * 0.21,2) * 0.1;//推广者的佣金抽10%到个人复购金
296
 
296
 
297
                                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
297
                                             $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
298
                                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
298
                                             $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
@@ -300,8 +300,8 @@ class Notify
300
 
300
 
301
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
301
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(['brokerage_price'=>$yj_amount,'fugou'=>$fgj_amount]);
302
 
302
 
303
-                                            $con = $spread_data['contribute'] + round($pv * 0.03,2);
304
-                                            $score = $spread_data['score'] + round($pv * 0.03,2);
303
+                                            $con = $spread_data['contribute'] + round($pv * 0.21,2);
304
+                                            $score = $spread_data['score'] + round($pv * 0.21,2);
305
 
305
 
306
                                             //贡献值和积分
306
                                             //贡献值和积分
307
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
307
                                             //Db::name('user')->where('uid',$spread_data['uid'])->update(["contribute"=>$con,"score"=>$score]);
@@ -310,8 +310,8 @@ class Notify
310
 
310
 
311
                                             //推广佣金
311
                                             //推广佣金
312
                                             $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
312
                                             $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
313
-                                            $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
314
-                                            $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
313
+                                            $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
314
+                                            $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
315
 
315
 
316
 
316
 
317
 
317
 
@@ -394,7 +394,7 @@ class Notify
394
 
394
 
395
                                 //分配养老金给消费者
395
                                 //分配养老金给消费者
396
                                 //普通用户获取贡献值和pv3.5%养老金和积分
396
                                 //普通用户获取贡献值和pv3.5%养老金和积分
397
-                                //$ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
397
+                                $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
398
                                 $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
398
                                 $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
399
                                 $jf_amount_mine = $user_data['score'] + $gx_jf;
399
                                 $jf_amount_mine = $user_data['score'] + $gx_jf;
400
 
400
 
@@ -403,7 +403,7 @@ class Notify
403
 
403
 
404
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
404
                                 $this->bill_user_log($user_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$group_order['group_order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
405
 
405
 
406
-                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
406
+                                //$this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
407
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
407
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
408
 
408
 
409
 
409
 
@@ -532,7 +532,7 @@ class Notify
532
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.01,2),$store_order_data['mer_id']);
532
                                         // $this->bill_user_log($user_data['spread_uid'],round($pv * 0.01,2),$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.round($pv * 0.01,2),$store_order_data['mer_id']);
533
 
533
 
534
                                         //获取贡献值和积分和佣金
534
                                         //获取贡献值和积分和佣金
535
-                                        $gx_jf = $spread_data['contribute'] + round($pv * 0.03,2);
535
+                                        $gx_jf = $spread_data['contribute'] + round($pv * 0.21,2);
536
 
536
 
537
                                         //$yj111 = $spread_data['brokerage_price'] + $yj1;
537
                                         //$yj111 = $spread_data['brokerage_price'] + $yj1;
538
 
538
 
@@ -545,8 +545,8 @@ class Notify
545
 
545
 
546
 
546
 
547
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
547
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
548
-                                        $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
549
-                                        $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
548
+                                        $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
549
+                                        $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
550
                                         //推广佣金
550
                                         //推广佣金
551
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
551
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id']);
552
                                     }
552
                                     }

+ 72 - 9
app/controller/api/store/merchant/Taskorder.php

@@ -563,9 +563,18 @@ class Taskorder extends BaseController
563
 
563
 
564
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
564
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
565
 
565
 
566
-        $week_record = 139200;
566
+        $week_record = 45500 + 1400;
567
+
568
+
569
+
570
+
567
         $stock_comm = round($week_record * 0.05 ,2);
571
         $stock_comm = round($week_record * 0.05 ,2);
568
 
572
 
573
+
574
+        // $team_small_big_amount = $this->getbig_samll_datas(17);//下标0是大部门,下标1是小部门
575
+        // var_dump($team_small_big_amount);return;
576
+
577
+
569
         //获取股权分红的人
578
         //获取股权分红的人
570
 
579
 
571
         // $GetAllUserPackNum = db::name("old_user_stock")->sum("pack");//计算所有用户的份数总和
580
         // $GetAllUserPackNum = db::name("old_user_stock")->sum("pack");//计算所有用户的份数总和
@@ -610,6 +619,8 @@ class Taskorder extends BaseController
610
 
619
 
611
 
620
 
612
         //               Db::name("old_user_weekaward")->insert($week_data);
621
         //               Db::name("old_user_weekaward")->insert($week_data);
622
+
623
+        //$this->bill_user_log111111($v['user_id'],"股权分佣", $stock_comm,"股权明细入账");//股权分佣明细2.0系统
613
         //           }
624
         //           }
614
 
625
 
615
         //     }
626
         //     }
@@ -797,9 +808,9 @@ class Taskorder extends BaseController
797
 
808
 
798
 
809
 
799
 
810
 
800
-                $datauser = db::name("user")->where("uid",$v)->find();
801
-                var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得双区分红佣金:" . $my_weight_money);//可获得的双区分红佣金
802
-                var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得的小区分红佣金:" . $my_mix_money);//可获得的小区(业绩小的部分)分红佣金
811
+                //$datauser = db::name("user")->where("uid",$v)->find();
812
+//var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得双区分红佣金:" . $my_weight_money);//可获得的双区分红佣金
813
+//var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得的小区分红佣金:" . $my_mix_money);//可获得的小区(业绩小的部分)分红佣金
803
 
814
 
804
                 // $in_money += $my_weight_money;
815
                 // $in_money += $my_weight_money;
805
                 // var_dump("//////");
816
                 // var_dump("//////");
@@ -810,6 +821,7 @@ class Taskorder extends BaseController
810
 
821
 
811
                 # code...
822
                 # code...
812
                 // $res = Db::name("user")->where("id",$v)->inc("total_amount_old",$all_award)->save();
823
                 // $res = Db::name("user")->where("id",$v)->inc("total_amount_old",$all_award)->save();
824
+
813
                 //Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
825
                 //Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
814
 
826
 
815
                 //$this->releaseTobeAmount1($v,$all_award,$output);//根据冻结金和提现额度来计算佣金的发放
827
                 //$this->releaseTobeAmount1($v,$all_award,$output);//根据冻结金和提现额度来计算佣金的发放
@@ -832,6 +844,10 @@ class Taskorder extends BaseController
832
 
844
 
833
 
845
 
834
                 Db::name("old_user_weekaward")->insert($week_data);
846
                 Db::name("old_user_weekaward")->insert($week_data);
847
+
848
+
849
+                $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
850
+
835
                 //}
851
                 //}
836
             }
852
             }
837
 
853
 
@@ -856,6 +872,49 @@ class Taskorder extends BaseController
856
 //     return [$mondayStart, $sundayEnd];
872
 //     return [$mondayStart, $sundayEnd];
857
 // }
873
 // }
858
 
874
 
875
+    //添加平台分佣2.0系统收益明细日志(养老金金额)
876
+    public function bill_user_log111111($uid,$name,$num,$mark){
877
+
878
+        $con_data = Db::name('user')->where("uid",$uid)->find();
879
+        //如果是会员专区就即刻到账
880
+
881
+        Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
882
+
883
+
884
+        $bill = [
885
+            'uid'=>$uid,
886
+            'link_id'=>0,//关联订单id
887
+            'pm'=>1,//0:支出,1:获得
888
+            'title'=>$name,//账单标题
889
+            'category'=>'now_money',//明细种类
890
+            'type'=>'commission',//明细类型
891
+            'number'=>$num,//明细数字
892
+            'balance'=>0,//剩余
893
+            'mark'=>$mark,//备注
894
+            'create_time'=>date('Y-m-d H:i:s'),//添加时间
895
+            'status'=>1,//0待确定,1有效,-1无效
896
+            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
897
+            //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
898
+            //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
899
+            'order_sn'=>0,//订单号
900
+            'tripartite'=>0,//
901
+            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
902
+            'mer_id'=>0,//商户id
903
+            'source'=>0,//1线下 0线上
904
+            'order_type'=>1,//1自营  2 第三方  订单类型
905
+            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
906
+            'gzc'=>3,//养老金是否已进入公证处log表0:未进入。1:已进入
907
+            'take_time'=>'',//结算时间
908
+            'district_id'=>'',//
909
+            'street_id'=>'',//
910
+            'month'=>'',//月份
911
+
912
+
913
+        ];
914
+
915
+        Db::name('user_bill')->insert($bill);
916
+    }
917
+
859
 //     //上周
918
 //     //上周
860
     public function getWeekStartEnd()
919
     public function getWeekStartEnd()
861
     {
920
     {
@@ -1237,14 +1296,18 @@ class Taskorder extends BaseController
1237
     public function getbig_samll_datas($user_id) {
1296
     public function getbig_samll_datas($user_id) {
1238
 
1297
 
1239
         $subordinate_members = Db::name('user')
1298
         $subordinate_members = Db::name('user')
1240
-            ->alias('u')
1241
-            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
1242
-            ->where("u.spread_uid", $user_id)
1243
-            ->where("so.mer_id", 496)
1244
-            ->group('u.uid')
1299
+            // ->alias('u')
1300
+            // ->join('store_order so', 'u.uid = so.uid', 'LEFT')
1301
+            ->where("spread_uid", $user_id)
1302
+            // ->where("so.mer_id", 496)
1303
+            // ->group('u.uid')
1245
 
1304
 
1246
             ->select();
1305
             ->select();
1247
 
1306
 
1307
+
1308
+        //var_dump($subordinate_members);
1309
+
1310
+
1248
         // 单独写一个方法获取大小部门的数据
1311
         // 单独写一个方法获取大小部门的数据
1249
         $arr_team = [];
1312
         $arr_team = [];
1250
         foreach ($subordinate_members as $k => $v) {
1313
         foreach ($subordinate_members as $k => $v) {

+ 42 - 20
app/controller/api/store/merchant/Taskorderlianc.php

@@ -235,33 +235,53 @@ class Taskorderlianc extends BaseController
235
         Db::name("old_user_log")->insert($inser_data);
235
         Db::name("old_user_log")->insert($inser_data);
236
     }
236
     }
237
 
237
 
238
+    //添加推广佣金/养老金日志(养老金金额)
239
+    public function bill_user_log($uid,$name,$num,$mark){
240
+
241
+        $con_data = Db::name('user')->where("uid",$uid)->find();
242
+        //如果是会员专区就即刻到账
243
+
244
+        Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
245
+
246
+
247
+        $bill = [
248
+            'uid'=>$uid,
249
+            'link_id'=>0,//关联订单id
250
+            'pm'=>1,//0:支出,1:获得
251
+            'title'=>$name,//账单标题
252
+            'category'=>'now_money',//明细种类
253
+            'type'=>'commission',//明细类型
254
+            'number'=>$num,//明细数字
255
+            'balance'=>0,//剩余
256
+            'mark'=>$mark,//备注
257
+            'create_time'=>date('Y-m-d H:i:s'),//添加时间
258
+            'status'=>1,//0待确定,1有效,-1无效
259
+            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
260
+            //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
261
+            //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
262
+            'order_sn'=>0,//订单号
263
+            'tripartite'=>0,//
264
+            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
265
+            'mer_id'=>0,//商户id
266
+            'source'=>0,//1线下 0线上
267
+            'order_type'=>1,//1自营  2 第三方  订单类型
268
+            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
269
+            'gzc'=>3,//养老金是否已进入公证处log表0:未进入。1:已进入
270
+            'take_time'=>'',//结算时间
271
+            'district_id'=>'',//
272
+            'street_id'=>'',//
273
+            'month'=>'',//月份
238
 
274
 
239
 
275
 
240
-    public function lst2(){
241
-
242
-        //die;
243
-        // if($orderInfo['pay_type'] == 1) {
244
-        //校验是否升级
245
-        //$goods_of_info1 = $this->user_of_goods->where("order_id",$orderInfo['id'])->find();
246
-        // if($goods_of_info1['is_update'] == 2) {
247
-        // echo 123;
248
-        $orderInfo=[
249
-            'num'=>1,
250
-            'gb_num'=>1,
251
-            'price'=>10620,
252
-            'id'=>852,//user_of_good的id
253
         ];
276
         ];
254
-        $goods_of_info1 = Db::name("old_user_of_goods")->where("id", 852)->find();//用户的订单价格表
255
-        return $this->member_update($orderInfo,$goods_of_info1,609);
256
-        //}
257
-//}
258
-        // var_dump($orderInfo);die;
259
-        return;
260
 
277
 
278
+        Db::name('user_bill')->insert($bill);
279
+    }
261
 
280
 
262
 
281
 
263
 
282
 
264
 
283
 
284
+    public function lst2(){
265
 
285
 
266
 
286
 
267
 
287
 
@@ -277,7 +297,7 @@ class Taskorderlianc extends BaseController
277
         return;
297
         return;
278
 
298
 
279
 
299
 
280
-        $week_record = 7000;
300
+        $week_record = 45500;
281
 
301
 
282
         $originator_award = round(($week_record * 0.05),2);
302
         $originator_award = round(($week_record * 0.05),2);
283
 
303
 
@@ -338,6 +358,8 @@ class Taskorderlianc extends BaseController
338
                 //$this->releaseTobeAmount($v,$award,$output);根据冻结金和提现额度来计算佣金的发放
358
                 //$this->releaseTobeAmount($v,$award,$output);根据冻结金和提现额度来计算佣金的发放
339
 
359
 
340
                 if($res) {
360
                 if($res) {
361
+                    $this->bill_user_log($v,"联创分佣",$award,"联创分佣明细入账");//联创分佣明细2.0系统
362
+
341
                     $$count  = $count +1;
363
                     $$count  = $count +1;
342
                     $this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
364
                     $this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
343
                     //入账
365
                     //入账

+ 34 - 15
app/controller/api/store/order/StoreOrder.php

@@ -458,7 +458,8 @@ class StoreOrder extends BaseController
458
         $array_fzone_paytype = json_decode($fzone_paytype,true);
458
         $array_fzone_paytype = json_decode($fzone_paytype,true);
459
 
459
 
460
 
460
 
461
-
461
+        //会员专区升级产生的user_of_goods订单ID赋值
462
+        $getuserofgoodsid = 1;
462
 
463
 
463
         if(!empty($array_fzone_paytype['type'])){
464
         if(!empty($array_fzone_paytype['type'])){
464
             if(!empty($array_fzone_paytype['type'] == 'b1')){
465
             if(!empty($array_fzone_paytype['type'] == 'b1')){
@@ -511,22 +512,40 @@ class StoreOrder extends BaseController
511
                 if($vrpri < 0){
512
                 if($vrpri < 0){
512
                     return app('json')->fail("支付失败,VR不足!");
513
                     return app('json')->fail("支付失败,VR不足!");
513
                 }
514
                 }
515
+                //return app('json')->fail(123);
516
+                //检查在旧表中是否有上级
517
+                if($userdatas['spread_old'] != 0){
518
+                    $sf = Db::name('old_user_jbp')->where('id',$userdatas['spread_old'])->find();
519
+                    if(!empty($sf)){
520
+                        //检查用户在旧表中是否与上级,有的话就是升级权限,要新增一个user_of_goods的表
521
+                        $data1['user_id']=$uid;
522
+                        $data1['goods_list_id']=0;
523
+                        $data1['status']=0;
524
+                        $data1['spread_id']=$userdatas['invite_id_od'];
525
+                        $data1['node_id']=$userdatas['spread_old'];
526
+                        $data1['money']= $array_fzone_paytype['price'];
527
+                        $data1['order_id']=10;
528
+                        $data1['server_id']=$userdatas['server_id_old'];
529
+                        $data1['pay_gb']=0;
530
+                        $data1['pay_vr']= $array_fzone_paytype['price'];
531
+                        $data1['pay_bt']=0;
532
+
533
+                        //return app('json')->fail("333");
534
+
535
+                        $sfe=  Db::name('old_user_of_goods')->insertGetId($data1);
536
+
537
+
538
+
539
+                        if($sfe){
540
+                            $getuserofgoodsid = $sfe;
541
+                        }
542
+
543
+                    }
544
+
545
+                }
514
 
546
 
515
-                //检查用户在旧表中是否与上级,有的话就是升级权限,要新增一个user_of_goods的表
516
-                $data1['user_id']=$uid;
517
-                $data1['goods_list_id']=0;
518
-                $data1['status']=0;
519
-                $data1['spread_id']=$userdatas['invite_id_old'];
520
-                $data1['node_id']=$userdatas['spread_id_old'];
521
-                $data1['money']= $array_fzone_paytype['price'];
522
-                $data1['order_id']=10;
523
-                $data1['server_id']=$userdatas['server_id_old'];
524
-                $data1['pay_gb']=0;
525
-                $data1['pay_vr']= $array_fzone_paytype['price'];
526
-                $data1['pay_bt']=0;
527
 
547
 
528
 
548
 
529
-                $getuserofgoodsid =  Db::name('old_uesr_of_goods')->insertGetId($data1);
530
 
549
 
531
                 //Db::getLastInsID();
550
                 //Db::getLastInsID();
532
 
551
 
@@ -543,7 +562,7 @@ class StoreOrder extends BaseController
543
 
562
 
544
 
563
 
545
         //end
564
         //end
546
-
565
+        //$getuserofgoodsid= 1;
547
 
566
 
548
         makeLock()->lock();
567
         makeLock()->lock();
549
         try {
568
         try {