修改会员组合支付1.2

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

@@ -1031,9 +1031,9 @@ class StoreOrderRepository extends BaseRepository
                             //普通用户获取贡献值和pv3.5%养老金和积分
                             $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
                             $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
-                            $jf_amount_mine = $user_data['score'] + $gx_jf;
+                            $jf_amount_mine  = $user_data['score'] + $gx_jf;
 
-                            // Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
+                             Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
                             $paystage_status = 1;
                             //修改订单状态
                             $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,'distribution_mode'=>1]);
@@ -2231,12 +2231,50 @@ class StoreOrderRepository extends BaseRepository
                 //1:为会员专区,
 
 
-                $cartInfo['list'][$_k]['fzone_paytype']= [
 
-                    ['type'=>'a1','price'=>$orderpri,'other'=>0,'note'=>"VR"],//VR支付
-                    ['type'=>'a2','price'=>$orderpri,'other'=>0,'note'=>"现金"],//现金支付
-                    // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
-                ];
+              
+               
+                //throw new ValidateException($user_datas['vr']);
+                if($uid == 7){
+                //如果选择组合支付，查询当前用户名下的VR
+                $user_datas = Db::name('user')->where('uid',$uid)->find();
+
+                
+
+
+
+                    // 初始化VR支付金额和现金支付金额
+                    $vr_payment = 0;
+                    $cash_payment = 0;
+                    if($user_datas['vr'] < $orderpri){
+                        $vr_payment = abs($user_datas['vr'] - $orderpri);//abs是取绝对值
+                        $cash_payment = $orderpri - $vr_payment;
+                    }else{
+                        $cash_payment = $orderpri;//abs是取绝对值
+                        //$cash_payment = 0;
+                    }
+             
+
+
+
+
+
+                    $cartInfo['list'][$_k]['fzone_paytype']= [
+
+                        ['type'=>'a1','price'=>$orderpri,'other'=>0,'note'=>"VR"],//VR支付
+                        ['type'=>'a2','price'=>$orderpri,'other'=>0,'note'=>"现金"],//现金支付
+                         ['type'=>'a3','price'=>$vr_payment,'other'=> $cash_payment,'note'=>"现金+VR"],//现金支付
+                    ];
+                }else{
+                    $cartInfo['list'][$_k]['fzone_paytype']= [
+
+                        ['type'=>'a1','price'=>$orderpri,'other'=>0,'note'=>"VR"],//VR支付
+                        ['type'=>'a2','price'=>$orderpri,'other'=>0,'note'=>"现金"],//现金支付
+                        // ['type'=>'a3','price'=>$orderpri,'other'=>0,'note'=>"现金+VR"],//现金支付
+                    ];
+                }
+
+                
 
 
 

app/controller/api/Notify.php

@@ -405,7 +405,7 @@ class Notify
                                 $jf_amount_mine = $user_data['score'] + $gx_jf;
 
 
-                                //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
+                                Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,'contribute'=> $gxz_amount_mine,'score'=> $jf_amount_mine]);
 
                                 $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']);
 
@@ -419,7 +419,7 @@ class Notify
 
                                 $spread_data_old = 0;
                                 if($user_data['spread_old'] != 0){
-                                    $sf = Db::name('old_user_jbp')->where('id',$user_data['spread_old'])->find();
+                                    $sf = Db::name('old_user_jbp')->where('id',$user_data['invite_id_od'])->find();
                                     if(!empty($sf)){
                                         $spread_data_old = $sf;
                                     }
@@ -563,7 +563,7 @@ class Notify
 
 
 
-                                }else if(!empty($spread_data_old)){
+                                }else if($spread_data_old != 0){
 
                                     //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
 
@@ -587,14 +587,17 @@ class Notify
                                     //复购金
                                     $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
-
+       
                                     $orderInfo=[
                                         'num'=>1,
                                         'gb_num'=>1,
                                         'price'=>$store_product_data['price']
                                     ];
                                     $goods_of_info1 = Db::name("old_user_of_goods")->where("id", $store_order_data['user_of_goods_id'])->find();//用户的订单价格表
+
                                     if(!empty($goods_of_info1)){
+                                       // $spread_data = Db::name('test_log')->insert(['note'=>"goodsofinf22222o:".json_encode($goods_of_info1)]);
+
                                         $this->member_update($orderInfo,$goods_of_info1,$user_data['uid']);
                                     }
 
@@ -629,8 +632,86 @@ class Notify
                                 }
 
 
+                                $fzone_paytype = json_decode($store_order_data['fzone_paytype'],true);
+                                $user_data = Db::name('user')->where('uid',$store_order_data['uid'])->find();
+
+                                //会员专区的现金+VR支付
+                                if($fzone_paytype['type'] == 'a3'){
+                                  
+
+                                    $dev_vr = $user_data['vr'] - $fzone_paytype['other'];
+
+                                    if($dev_vr >= 0){
+                                        $user_data_dev_vr = Db::name('user')->where('uid',$store_order_data['uid'])->update(["vr"=>$dev_vr]);
+                                    
+                                        if($user_data_dev_vr){
+                                            //支出账号存到log日志
+                                            $log_data = [
+                                                'uid'=>$user_data['uid'],
+                                                'number'=>$fzone_paytype['other'],
+                                                'mark'=>"购买会员专区商品消费VR:" . $fzone_paytype['other'],
+                                                'desc'=>"VR",
+                                                'order_id'=>0,
+                                                'surplus'=>$dev_vr,
+                                                'order_type'=>0,
+                                                'type'=>2,
+                                                'addtime'=>time()
+                                            ];
+                                            $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
+                                        }
+                                    }else{
+                                        $log_data = [
+                                          
+                                            'note'=>"uid:" . $store_order_data['uid'] . " 购买会员专区商品消费VR:" .$fzone_paytype['other'] . " 用户消费前的VR余额:" .  $user_data['vr'] . "描述:" ."未扣成功!" . "备注:" . json_encode($fzone_paytype),
+                                           
+                                            'create_time'=>date("Y-m-d H:i:s",time())
+                                        ];
+                                        Db::name("test_log")->insert( $log_data);
+                                    }
+
+                                    
+                                }
+
+
                             }
 
+                            // if($store_order_data['mer_id'] == 496){
+
+                            //     $user_data = Db::name("user")->where("uid", $store_order_data['uid'])->find();
+                            //     $fzone_paytype = json_decode($store_order_data['fzone_paytype'],true);
+
+                            //     //会员专区的现金+VR支付
+                            //     if($fzone_paytype['type'] == 'a3'){
+                                  
+
+                            //         //会员专区，给用户升级判断
+                            //         $orderList = Db::name("store_order")->where("uid", $uid)->where("mer_id",496)->where("status", "in", [0, 1, 2, 3])->select();
+                            //         // 初始化总和变量
+                            //         $totalPayPrice = 0;
+
+                            //         // 遍历查询结果
+                            //         foreach ($orderList as $order) {
+
+
+                            //             // 累加 pay_price
+                            //             $totalPayPrice += $order['pay_price'];
+                            //         }
+                            //         $userdata = Db::name("user")->where("uid", $uid)->find();
+
+                            //         if($totalPayPrice >= 1180 && $totalPayPrice < 11800){
+
+                            //             if( $userdata['user_group'] <= 1){
+                            //                 Db::name("user")->where("uid", $uid)->update(["user_group"=>2]);
+                            //             }
+
+                            //         }else if($totalPayPrice >= 11800){
+                            //             if( $userdata['user_group'] <= 2){
+                            //                 Db::name("user")->where("uid", $uid)->update(["user_group"=>3]);
+                            //             }
+                            //         }
+                            //     }
+                            // }
+
                             //判断是否是精彩生活区的商品
                             if($store_order_data['mer_id'] == 439){
                                 //供应链的状态
@@ -866,7 +947,7 @@ class Notify
 
         // $result = Db::name("old_user_jbp")->where("id",$user_id)->dec("vr",$orderInfo['price'])->save();//1.0jbp旧表
         // Db::name("user")->where("uid",$user_id)->dec("vr",$orderInfo['price'])->save();//2.0新表
-
+    
 
         $result = true;
         if($result) {
@@ -876,23 +957,23 @@ class Notify
             $zs_ylj = 0; //养老金赋值
 
 
-            if($goods_of_info['money'] == 1180){
+            if($orderInfo['price'] == 1180){
                 //修改订单到账状态
                 $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 11800){
+            }elseif($orderInfo['price'] == 11800){
                 $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 3540){
+            }elseif($orderInfo['price'] == 3540){
                 $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 10620){
+            }elseif($orderInfo['price'] == 10620){
                 $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
-            }elseif($goods_of_info['money'] == 9440){
+            }elseif($orderInfo['price'] == 9440){
                 $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
-            }elseif($goods_of_info['money'] == 2360){
+            }elseif($orderInfo['price'] == 2360){
                 $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
             }
 
 
-
+          //  $spread_data = Db::name('test_log')->insert(['note'=>"price1:" . $orderInfo['price'] ." pri2:" .   $zs_ylj]);
 
             $uid = $user_id;
             $new_user_id = $uid;
@@ -938,29 +1019,20 @@ class Notify
                 // todo 同时改变他的权益
             }
 
+          
 
-
-            // Db::name("old_user_jbp")->where("id",$new_user_id)->inc("withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
-            // Db::name("user")->where("uid",$new_user_id)->save(['withdraw_quota_old'=>$zs_withdraw_quota]);//2.0新表
-
-            // 下发邀请人赠送的GB
-            // $zs_invite_gb = round($orderInfo['price']*0.3,2);
-            // //todo
-            // Db::name("old_user_jbp")->where("id",$invite_id)->inc("gb",$zs_invite_gb)->save();//1.0jbp旧表
-            // Db::name("user")->where("uid",$invite_id)->inc("score",$zs_invite_gb)->save();//2.0新表
-
-            //$old_have_pension = Db::name("old_user_jbp")->where("id",$invite_id)->value("have_pension");
-
+        
 
             //检查是不是订单价格是1180或者11800，更改VR
-            if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+            //if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
                 //修改订单到账状态
 
+               // $spread_data = Db::name('test_log')->insert(['note'=>"goodid:" . $goods_of_info['id'] .' money:'.$goods_of_info['money'].' pay_vr:'.$pay_vr1]);
 
-                Db::name("old_user_of_goods")->where("id",$goods_of_info['id'])->save(['status'=>1,'money'=>$goods_of_info['money'],'pay_gb'=>0,'pay_vr'=>$pay_vr1,'pay_bt'=>0,'create_time'=>time()]);
+                Db::name("old_user_of_goods")->where("id",$goods_of_info['id'])->save(['status'=>1,'money'=>$orderInfo['price'],'pay_gb'=>0,'pay_vr'=>$pay_vr1,'pay_bt'=>0,'create_time'=>time()]);
 
-
-            }
+               // $spread_data = Db::name('test_log')->insert(['note'=>"money:" . $goods_of_info['money'] ." pay_vr:" .   $pay_vr1]);
+           // }
         }
 
 
@@ -979,20 +1051,20 @@ class Notify
                 //$money = Db::name("old_user_jbp")->where("id",$user_id)->value("gb");
                 //$appoint_money = $money - $zs_invite_gb;
 
-                if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+                //if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
 
 
                     $this->change_user_log66($user_id,"vr",2,$pay_vr1,"declare_expend",'权益消费VR-'.$new_user_name);
 
-                }
+               // }
             }else{
 
-                if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
+               // if($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440  || $goods_of_info['money'] == 2360){
 
 
                     $this->change_user_log66($user_id,"vr",2,$pay_vr1,"declare_expend",'权益消费VR-'.$new_user_name);
 
-                }
+                //}
             }
             // $this->change_user_log66($new_user_id,'gb',1,$zs_gb,"levle_update_zs","权益升级达标赠送");
             $this->change_user_log66($new_user_id,'withdraw_quota_old',1,$zs_withdraw_quota,"levle_update_zs","权益升级达标赠送");

app/controller/api/store/order/StoreOrder.php

@@ -516,13 +516,13 @@ class StoreOrder extends BaseController
                // return app('json')->fail($userdatas['spread_old']);
                 //检查在旧表中是否有上级
                 if($userdatas['spread_old'] != 0){
-//return app('json')->fail(123);
-                   // return app('json')->fail($userdatas['spread_old']);
+
+               
                     //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
                     $sf = Db::name('old_user_jbp')->where('id',$userdatas['uid'])->find();//父级在旧表有注册
 
                    // $sf1 = Db::name('old_user_jbp')->where('id',$userdatas['id'])->find();
- //return app('json')->fail($userdatas['server_id_old']);
+ 
                     // 当前用户是在2.0注册的新用户，父级是在1.0
 
                     //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
@@ -540,7 +540,7 @@ class StoreOrder extends BaseController
                         $data1['pay_gb']=0;
                         $data1['pay_vr']= $array_fzone_paytype['price'];
                         $data1['pay_bt']=0;
-//return app('json')->fail(json_encode($data1));
+
                         //return app('json')->fail("333");
 
                         $sfe=  Db::name('old_user_of_goods')->insertGetId($data1);
@@ -560,12 +560,47 @@ class StoreOrder extends BaseController
 
             }else if(!empty($array_fzone_paytype['type'] == 'a3')){
                 //生活 现金 + VR支付
-                return app('json')->fail("正在升级,敬请期待!");
-                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+            
+                //检查在旧表中是否有上级
+                if($userdatas['spread_old'] != 0){
+
+               
+                    //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
+                    $sf = Db::name('old_user_jbp')->where('id',$userdatas['uid'])->find();//父级在旧表有注册
+
+ 
+                    // 当前用户是在2.0注册的新用户，父级是在1.0
+
+                    //当前用户在1.0中没有注册，但是父级在1.0系统中注册过。
+                    if(!empty($sf)){
+
+                        //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
+                        $data1['user_id']=$uid;
+                        $data1['goods_list_id']=0;
+                        $data1['status']=0;
+                        $data1['spread_id']=$sf['invite_id'];
+                        $data1['node_id']=$sf['spread'];
+                        $data1['money']= $array_fzone_paytype['price'];
+                        $data1['order_id']=10;
+                        $data1['server_id']=$userdatas['server_id_old'];
+                        $data1['pay_gb']=0;
+                        $data1['pay_vr']= $array_fzone_paytype['price'];
+                        $data1['pay_bt']=0;
+
+                        //return app('json')->fail("333");
+
+                        $sfe=  Db::name('old_user_of_goods')->insertGetId($data1);
+
+                        if($sfe){
+                            $getuserofgoodsid = $sfe;
+                        }
+                    }
+
 
-                if($vrpri < 0){
-                    return app('json')->fail("支付失败,VR不足!");
                 }
+
+               
+
             }else if(!empty($array_fzone_paytype['type'] == 'c1')){
                 //复购区 复购金支付
                 $fugoupri = $userdatas['fugou'] -  $array_fzone_paytype['price'];