话费调整

app/common/repositories/user/UserThirdRepository.php

@@ -747,7 +747,6 @@ class UserThirdRepository extends BaseRepository
     /**
      * 添加预估积分记录
      */
-//预估养老金
     public static function yuguJifen($price,$user_id,$order_sn,$type_shop)
     {
         if (empty($user_id)) {
@@ -775,14 +774,11 @@ class UserThirdRepository extends BaseRepository
 
             $sanfangfenpei=json_decode($systemvalueObj['value'],true);
             $inc_score = $gongxian = round($price*$sanfangfenpei['pv'],2);//pv=佣金的50%=积分=贡献值
-//            log::info("===========dddddddddddddddddddd");
 
 
             //每个表的统计值
             $jfzongwei=Db::name('user_sign_score')->where('status', -1)->where('uid', $user_id)->sum('reward_socre');
             $gxzongwei=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user_id)->sum('number');
-//            type_shop 1 拼多多 ，5淘宝
-//            log::info("==========={$jfzongwei}");
 
             $make="";
             if($type_shop==1){
@@ -817,26 +813,12 @@ class UserThirdRepository extends BaseRepository
                 ];
             log::info("{$make}==准备开始添加积分，贡献");
             Db::name("user_sign_score")->insert($data);//添加积分记录
-
             log::info("准备开始添加积分");
-//            $ins_data['uid'] = $user_id;
-//            $ins_data['reward_socre'] = $inc_score;
-//            $ins_data['addtime'] = time();
-//            $ins_data['status'] = -1;
-//            $ins_data['order_type'] = $type_shop;
-//            $ins_data['order_id'] = $order_sn;
-//            $ins_data['mark'] = "购买三方商品赠送积分";
-//            $ins_data['desc'] = '';
-//            $ins_data['surplus'] = $user_score + $inc_score;
-//            $ins_data['type'] = 1;
-//            $ins_data['pm'] = 1;
-//            $ins_data['source_type'] =3;
 
 
             //赠送贡献值
             $gongxian_data = [
                 "uid"           =>$user_id,
-//                "number"  =>    $inc_score,
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
                 "status"        =>-1,
@@ -847,21 +829,6 @@ class UserThirdRepository extends BaseRepository
                 "surplus"       =>$surplusgongxian+$gxzongwei,
                 "type"          =>1
             ];
-
-//            $gongxian_data['uid'] = $user_id;
-//            $gongxian_data['number'] = $inc_score;
-//            $gongxian_data['addtime'] = time();
-//            $gongxian_data['status'] = -1;
-//            $gongxian_data['order_type'] = $type_shop;
-//            $gongxian_data['order_id'] = $order_sn;
-//            $gongxian_data['mark'] = "购买三方商品赠送贡献值";
-//            $gongxian_data['desc'] = '';
-//            $gongxian_data['surplus'] = $user_score + $inc_score;
-//            $gongxian_data['type'] = 1;
-//            $gongxian_data['pm'] = 1;
-//            $gongxian_data['source_type'] =3;
-
-
             Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
             log::info("===添加完积分和贡献值");
 
@@ -895,51 +862,20 @@ class UserThirdRepository extends BaseRepository
                 ];
                 Db::name("user_sign_hongbao")->insert($hongbao_data);//添加贡献记录
                 log::info("===添加完红包奖励");
-
             }
 
 
-
             // 添加推荐奖励
             $zijiUser=Db::name("user")->where('uid',$user_id)->find();
             $sprerdUser= Db::name("user")->where('uid',$zijiUser['spread_uid'])->find();
             //不为空的时候进行添加推荐奖励
             if($sprerdUser){
-                //奖励推广佣金
+                //奖励推广
                 $yongjinbili=0;
-                //普通用户
-                if($sprerdUser["user_group"]==1){
-                    $yongjinbili=5;
-                }
-                //业务员
-                if($sprerdUser["user_group"]==2){
-                    $yongjinbili=7;
-                }
-                //业务经理
-                if($sprerdUser["user_group"]==3){
-                    $yongjinbili=9;
-                }
-                //初级合伙人
-                if($sprerdUser["user_group"]==4){
-                    $yongjinbili=11;
-                }
-                //中级合伙人
-                if($sprerdUser["user_group"]==5){
-                    $yongjinbili=13;
-                }
-                //高级合伙人
-                if($sprerdUser["user_group"]==6){
-                    $yongjinbili=15;
-                }
-                //懂事
-                if($sprerdUser["user_group"]==7){
-                    $yongjinbili=17;
-                }
+        
                 // @todo 用户身份比例
                 $yongjinbili = StoreOrderRepository::getUserGroupRate($sprerdUser['user_group']);
-
-                $tuiguanyongjin=round($yongjinbili*$inc_score/100,2);//按照身份获得佣金
-
+                $tuiguanyongjin=round($yongjinbili*$inc_score,2);//按照身份获得佣金
 
                 //添加推广积分
                 $tuijifendata = [
@@ -950,7 +886,7 @@ class UserThirdRepository extends BaseRepository
                     "order_type"    =>  $type_shop,
                     "order_id"      =>  $order_sn,
                     "mark"          =>  "推广消费从{$make}购买商品赠送积分",
-                    "surplus"       =>  $surplus,
+                    "surplus"       =>  $sprerdUser['score'] + $tuiguanyongjin,
                     "pm"            =>  1,
                     "source_type"   =>  4
                 ];
@@ -961,7 +897,6 @@ class UserThirdRepository extends BaseRepository
                 //添加推荐献值
                 $tuigangongxian_data = [
                     "uid"           =>$sprerdUser['uid'],
-//                    "number"  =>    $tuiguanyongjin,
                     "number"  =>    $gongxian,
                     "addtime"       =>time(),
                     "status"        =>-1,
@@ -969,15 +904,12 @@ class UserThirdRepository extends BaseRepository
                     "order_id"      =>$order_sn,
                     "mark"          =>"推广消费从{$make}购商品赠送贡献值",
                     "desc"          =>'',
-                    "surplus"       =>$surplusgongxian+$gxzongwei,
+                    "surplus"       => $sprerdUser['contribute'] + $gongxian,
                     "type"          =>1
                 ];
 
                 Db::name("user_sign_gongxian")->insert($tuigangongxian_data);//添加贡献记录
                 log::info("===添加完积分和贡献值");
-
-
-
             }
 
 

app/controller/api/store/service/Huafei.php

@@ -213,13 +213,13 @@ class Huafei extends BaseController
 			$order_sn,
 			$type_shop
 		);						
-		//复购金
-		$orderThird->yuguFugou(
-			$commissionMoney,
-			$uid,
-			$order_sn,
-			$type_shop
-		);	
+		// //复购金
+		// $orderThird->yuguFugou(
+		// 	$commissionMoney,
+		// 	$uid,
+		// 	$order_sn,
+		// 	$type_shop
+		// );	
 
 		//推送订单
 		$push = $this->pushOrder($order_sn, $phone, $money);