修改贡献值

app/common/repositories/store/order/StoreOrderRepository.php

@@ -982,7 +982,7 @@ class StoreOrderRepository extends BaseRepository
                             }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'a1')) {
-                            //生活 VR支付
+                            //会员专区 VR支付
 
                             $user_data = Db::name("user")->where("uid", $uid)->find();
 
@@ -9363,6 +9363,13 @@ class StoreOrderRepository extends BaseRepository
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->find();
 
+        //查询支付方式
+        $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+        $pay_type = 3;//默认是微信
+        if($array_fzone_paytype['note'] != "现金"){
+            $pay_type = 4;
+        }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if ($order_from_mer['mer_id'] == 496) {
@@ -9381,13 +9388,48 @@ class StoreOrderRepository extends BaseRepository
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
 
-                    } else {
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
-                    }
-                }
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
 
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
+                }
 
             }
 

app/controller/api/Auth.php

@@ -449,7 +449,7 @@ class Auth extends BaseController
         if (!$account)
             return app('json')->fail('请输入账号');
         $user = $repository->accountByUser($this->request->param('phone'));
-        //13231658486 周总
+        //13231658486 周总 张玉庭 13839803521 13083849831
         if($account != 15528079265){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
@@ -742,6 +742,13 @@ class Auth extends BaseController
         //积分
         $data['score']=set_price_rtrim($data['score']);
         //2025新增 贡献值，红包，京东，vr，复购金
+
+        if( $user['user_group'] <= 2 ){
+            $data['contribute'] =  $user['contribute'] + $user['per_contribute'];
+        }else{
+            $data['contribute'] =  $user['contribute'];
+        }
+
         $date['contribute']=set_price_rtrim($data['contribute']);//贡献值
         $data['repurchase_price']=set_price_rtrim($data['repurchase_price']);//复购余额
         $data['jingdou']=set_price_rtrim($data['jingdou']);//京豆

app/controller/api/Notify.php

@@ -1525,6 +1525,13 @@ class Notify
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->find();
 
+         //查询支付方式
+         $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+         $pay_type = 3;//默认是微信
+         if($array_fzone_paytype['note'] != "现金"){
+             $pay_type = 4;
+         }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if($order_from_mer['mer_id'] == 496){
@@ -1536,18 +1543,55 @@ class Notify
             //如果是会员区的养老金，查看是否有实名，如果实名就改变订单状态和user-bill的状态
             if($comm_order_type == 5){
 
+              
                 //当前用户是否有实名，然后改变user_bill和order_store的gzc状态
-                $get_cer_datas = Db::name('user_certification')->where("uid",$uid)->find();
-                if(!empty($get_cer_datas)){
-                    if(!empty($get_cer_datas['user_card'])){
+                $get_cer_datas = Db::name('user_certification')->where("uid", $uid)->find();
+                if (!empty($get_cer_datas)) {
+                    if (!empty($get_cer_datas['user_card'])) {
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>1]);
-                       
-                    }else{
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>0]);
-                    }
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
+
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
+
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
                 }
 
                 

app/controller/api/user/User.php

@@ -254,10 +254,18 @@ class User extends BaseController
             
            // $getteamscon = $this->getPerformance($user->uid);
 
-            $getcon = $this->getPerformance_getcon( $user->uid);
+            //$getcon = $this->getPerformance_getcon( $user->uid);
+
+            $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
 
             //我的团队贡献值
-            $data['team_gongxian_num'] = $getcon['common_nums_pv'] + $getcon['person_nums_pv'];
+            if( $con['user_group'] <= 2 ){
+                $data['team_gongxian_num'] =  $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            }else{
+                $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+            }
+
+           
 
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
@@ -1406,17 +1414,27 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 222;//593
+             $teamid = 17;//593
+
+//            // $ss=  $this->userupdates($teamid);
+//            // var_dump($ss);
+
+ //$team_userinfo_old_jbp22 = $this->getPerformance22(17);
+
+ //$datas_jbp = Db::name('user')->where("status",1)->select();
+
+ //var_dump( $team_userinfo_old_jbp22['person_nums_pv']);
+
+// foreach($datas_jbp as $k=>$v){
+//     $team_userinfo_old_jbp22 = $this->getPerformance22($v['uid']);
+//     var_dump("id:" . $v['uid'] . "  用户:" . $v['nickname'] . "    小部门贡献值 :" .  $team_userinfo_old_jbp22['person_nums_pv']);
+// }
 
-           // $ss=  $this->userupdates($teamid);
-           // var_dump($ss);
-    $team_userinfo_old_jbp22 = $this->getPerformance22($teamid);
- var_dump( $team_userinfo_old_jbp22);
  return;
-                $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
+//                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
 
-           //return;
-              var_dump($team_userinfo_old_jbp1);return;
+//            //return;
+//               var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -1437,7 +1455,7 @@ class User extends BaseController
         ];
 
         // 如果在旧系统中有数据
-       //if (!empty($datas_jbp)) {
+     
             $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
             $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
 
@@ -1494,7 +1512,7 @@ class User extends BaseController
             $data['common_nums'] = $team_userinfo_old_jbp1['person_nums'];
             $data['common_nums_pv'] = max($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
             $data['person_nums_pv'] = min($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
-       // }
+      
 return app("json")->success($data);
 // // 查询当前会员旗下的会员数据（分页）
 //         [$page, $limit] = $this->getPage();
@@ -3944,7 +3962,7 @@ return app("json")->success($data);
 
         $team_amount = 0;
         $person_amount = 0;
-        $user_id = 523; //598 523 536
+       // $user_id = 17; //598 523 536
         
         $result_big_team_arr = [];
         $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -3985,7 +4003,7 @@ return app("json")->success($data);
             //$get_teams_comm_pv = $this->getteampv($result_big_team_arr);
             $t_pv = $this->getteampv($result_big_team_arr);
             $get_teams_comm_pv =$t_pv['totalPv'];
-            var_dump($get_teams_comm_pv);echo "ttt";
+            //var_dump($get_teams_comm_pv);echo "ttt";
 
             //获取当前用户下面在2.0中的下级所有人数
             $get_teams_comm_num = count($result_big_team_arr);
@@ -4079,7 +4097,7 @@ return app("json")->success($data);
            // $get_teams_per_pv = $this->getteampv($result_small_team_arr);
            $t_pv = $this->getteampv($result_small_team_arr);
            $get_teams_per_pv =$t_pv['totalPv'];
-            var_dump(  $get_teams_per_pv);
+           //var_dump(  $get_teams_per_pv);
           
        
         
@@ -4229,7 +4247,7 @@ return app("json")->success($data);
             //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
             $b_s = $this->getparents_child_pv11($user_id,$team_amount,$person_amount,count($common_nums)+ $get_teams_comm_num,count($person_nums)+ $get_teams_per_num);
             
-            var_dump($b_s);
+            //var_dump($b_s);
             // var_dump($team_amount,$person_amount);
             // var_dump(count($common_nums)+ $get_teams_comm_num,count($person_nums)+ $get_teams_per_num);
             //var_dump( $b_s);echo "yyyyyyyyyyyyy";