修改会员专区用户升级权益问题

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

@@ -117,7 +117,7 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/8/1
      */
-    public function createOrder(User $user, int $pay_type,$cartId,$addressId,$coupons, $takes, $mark,$psType, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='',$cartIdAndPayTypMap,$fzone_paytype='')
+    public function createOrder(User $user, int $pay_type,$cartId,$addressId,$coupons, $takes, $mark,$psType, $table_id = null, $share_id = 0, $payType, $mer_id = 0, $dacang_id = 0, $distribution_mode = 1, $ziti_address = '', $area_manage_address_ids = '',$youhui_price_key='',$cartIdAndPayTypMap,$fzone_paytype='',$getuserofgoodsid='')
     {
 
 
@@ -778,6 +778,7 @@ class StoreOrderRepository extends BaseRepository
                     'douhuomall'              => 0,
                     'fzone_paytype'           =>$fzone_paytype,
                     'con_pri'                 =>$product_attr_unique_datas['plate_mer_profit'],//计算商品选中的产品规格，然后计算利润，这个利润会在每周分红中进行分润
+                    'user_of_goods_id'         =>$getuserofgoodsid,
                 ];
 
 
@@ -968,7 +969,7 @@ class StoreOrderRepository extends BaseRepository
                                 $log_data = [
                                     'uid'=>$uid,
                                     'number'=>$array_fzone_paytype['price'],
-                                    'mark'=>"购买精彩区商品消耗VR:" . $array_fzone_paytype['price'],
+                                    'mark'=>"购买精彩区商品消费VR:" . $array_fzone_paytype['price'],
                                     'desc'=>"VR",
                                     'order_id'=>0,
                                     'surplus'=>$vrpri,
@@ -998,7 +999,7 @@ class StoreOrderRepository extends BaseRepository
                             $log_data = [
                                 'uid'=>$uid,
                                 'number'=>$array_fzone_paytype['price'],
-                                'mark'=>"购买会员专区商品消耗VR:" . $array_fzone_paytype['price'],
+                                'mark'=>"购买会员专区商品消费VR:" . $array_fzone_paytype['price'],
                                 'desc'=>"VR",
                                 'order_id'=>0,
                                 'surplus'=>$vrpri,
@@ -1008,6 +1009,11 @@ class StoreOrderRepository extends BaseRepository
                             ];
                             $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
 
+                            //会员专区，给用户升级判断
+                            //Db::name("store_order")->where("uid", $uid)->where()->select();
+
+
+
                         }
 
                     }
@@ -9307,12 +9313,23 @@ class StoreOrderRepository extends BaseRepository
             $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
             $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
+            //查询下单用户上级身份（2.0新表用户）
+            $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
+            //查询下单用户上级身份（1.0表用户，会员升级）
+            $spread_data_old = 0;
+            if($user_data['spread_old'] != 0){
+                $sf = Db::name('old_user_jbp')->where('id',$user_data['spread_old'])->find();
+                if(!empty($sf)){
+                    $spread_data_old = $sf;
+                }
+
+            }
+
             //给推广者分配养老金
             //给推广者分配佣金
             if($user_data['spread_uid'] != 0){
-                //查询下单用户上级身份
-                $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
 
+                $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
                 //user_group=1是消费者，2:业务，3:业务经理，4:初级合伙人，5:中级合伙人,6:高级合伙人，7：董事
                 //业务或以上等级推广人
                 //获得养老金、佣金、贡献值和积分
@@ -9436,7 +9453,46 @@ class StoreOrderRepository extends BaseRepository
 
 
 
+            }else if($spread_data_old != 0){
+
+                //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
+                $spread_data = Db::name('user')->where('uid',$spread_data_old['id'])->find();
+                //$spread_data = Db::name('user')->where('uid',473)->find();
+                //养老金
+                $uer_bill = $spread_data['annuity'] + round($pv * 0.035,2);
+
+
+                $yj_amount_90 = $le_yw_amount * 0.9;
+                $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
+
+                $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
+                $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
+
+                //养老金
+                $this->bill_user_log($spread_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']);
+                //佣金
+                $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']);
+                //复购金
+                $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)){
+                    $this->member_update($orderInfo,$goods_of_info1,$user_data['uid']);
+                }
+
+
             }
+
+
+
+
             //锁客收益
             if($user_data['mer_id'] != 0){
 
@@ -9469,7 +9525,222 @@ class StoreOrderRepository extends BaseRepository
 
     }
 
+    /**
+     * 会员升级
+     */
+    public function member_update($orderInfo,$goods_of_info,$user_id)
+    {
+        //
+
+
+        //code...
+        $pay_gb =  round($orderInfo['num'] * $orderInfo['gb_num'],2);
+        //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
+        //付款按照700的VR付款 start
+        $vr_num = 0;
+        if ($orderInfo['price'] == 1180) {
+            $vr_num = 700;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 7000;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 2100;
+        }elseif($orderInfo['price'] == 10620){
+            $vr_num = 6300;
+        }
+
+
+
+        $pay_gb1 = $vr_num;
+        $pay_vr1 =$orderInfo['price'];//记录VR值
+
+
+        // $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) {
+            $invite_id = $goods_of_info['spread_id'];
+
+
+            $zs_ylj = 0; //养老金赋值
+
+
+            if($goods_of_info['money'] == 1180){
+                //修改订单到账状态
+                $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 11800){
+                $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 3540){
+                $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 10620){
+                $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 9440){
+                $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
+            }elseif($goods_of_info['money'] == 2360){
+                $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
+            }
+
+
+
+
+            $uid = $user_id;
+            $new_user_id = $uid;
+            if(empty($new_user_id)) {
+                abort(0,"当前绑定会员查询错误");
+            }
+
+            $new_nums =Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
 
+            //增加过后权益对比 获取当前权益等级
+            $old_level_id = Db::name("old_user_jbp")->where("id",$uid)->find();
+
+            $old_level_info = Db::name("old_user_level")->where("id",$old_level_id['user_level_id'])->find();
+
+            $level_info = [];
+            $level_list = Db::name("old_user_level")->order("money desc")->select();
+
+
+            //计算会员等级 升级
+            foreach ($level_list as $key => $value) {
+                # code...
+                if($new_nums>=$value['money']) {
+                    $level_info =  $value;
+                    break;
+                }
+            }
+
+            $zs_gb = $orderInfo['price'] * 3;
+            $zs_withdraw_quota = $orderInfo['price'];
+
+
+            if($old_level_info['id'] == $level_info['id']) {
+                //未到达升级权益 不改变用户等级
+                $update_status = false;
+            }else{
+                $update_status = true;
+                $user_level = $level_info['id'];
+                //var_dump( $user_level);
+                Db::name("old_user_jbp")->where("id",$new_user_id)->save(['user_level_id'=>$user_level]);//1.0jbp旧表
+                Db::name("user")->where("uid",$new_user_id)->save(['user_level_id_old'=>$user_level]);//2.0新表
+
+                // 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){
+                //修改订单到账状态
+
+
+                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()]);
+
+
+            }
+        }
+
+
+
+        if($result) {
+            //更改订单状态
+
+            Db::commit();
+            $new_user_name = Db::name("old_user_jbp")->where("id",$new_user_id)->value("user_name");
+            $new_user_name = empty($new_user_name) ? "" : $new_user_name;
+
+            //记录日志信息
+
+            if($user_id == $invite_id) {
+                //报单中心=推荐人 GB记录日志有问题需要传入指定参数去计算
+                //$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){
+
+
+                    $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){
+
+
+                    $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","权益升级达标赠送");
+            // $this->change_user_log66($invite_id,'gb',1,$zs_invite_gb,"levle_update_zs","邀请-".$new_user_name);
+            // echo 123;return;
+            //处理查看是否有待发放佣金
+            // $zs_withdraw_quota
+            Db::name("old_user_jbp")->where("id",$new_user_id)->inc("total_withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
+            Db::name("user")->where("uid",$new_user_id)->inc("total_withdraw_quota_old",$zs_withdraw_quota)->save();
+            // $this->releaseTobeAmount($new_user_id,$zs_withdraw_quota);
+            // $this->success("支付成功",['is_cash'=>0]);
+        }
+        Db::rollback();
+        // $this->error("操作失败");
+    }
+
+    function change_user_log66($user_id,$type,$change_status,$money,$routine,$remark="",$is_admin=1,$appoint_money = 0)
+    {
+        $transition = [
+            'pv'=>1,
+            "gb"=>2,
+            "df"=>3,
+            "vr"=>4,
+            "bt"=>5,
+            "withdraw_quota_old"=>6,
+            "unsettled_pension"=>7,
+            "amount_old"=>8
+        ];
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
+        if(empty($routineInfo)) {
+            return false;
+        }
+        $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
+        //再去查询变更前的 金额
+        if($appoint_money > 0) {
+            $alter_money = $appoint_money;
+        }else{
+            //再去查询变更前的 金额
+            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+        }
+        if($change_status == 1) {
+            //新增前
+            $alter_money = $alter_money-$money;
+        }else if($change_status == 2){
+            //减少前
+            $alter_money = $alter_money + $money;
+        }
+        $inser_data = [];
+        $inser_data['user_id'] = $user_id;
+        $inser_data['type'] = $transition[$type];
+        $inser_data['change_status'] = $change_status;
+        $inser_data['money'] = $money;
+        $inser_data['routine_log_of_key_id'] = $key_id;
+        $inser_data['remark'] = $remark;
+        $inser_data['is_admin'] = $is_admin;
+        $inser_data['create_time'] = time();
+        $inser_data['alter_money'] =  isset($alter_money) ? $alter_money : 0;
+        Db::name("old_user_log")->insert($inser_data);
+    }
 
 
 

app/controller/api/Auth.php

@@ -450,7 +450,7 @@ class Auth extends BaseController
             return app('json')->fail('请输入账号');
         $user = $repository->accountByUser($this->request->param('phone'));
         //13231658486 周总
-        if($account != 15528079265){
+        if($account != 17756507016){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
             if (!password_verify($pwd = (string)$this->request->param('password'), $user['pwd']))
@@ -961,7 +961,7 @@ class Auth extends BaseController
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL => 'http://shop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_URL => 'http://shop.gdjbp.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_MAXREDIRS => 10,

app/controller/api/Notify.php

@@ -394,7 +394,7 @@ class Notify
 
                                 //分配养老金给消费者
                                 //普通用户获取贡献值和pv3.5%养老金和积分
-                                $ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
+                                //$ylj_amount_mine = $user_data['annuity'] + $ylj_pri;
                                 $gxz_amount_mine = $user_data['contribute'] + $gx_jf;
                                 $jf_amount_mine = $user_data['score'] + $gx_jf;
 
@@ -406,12 +406,25 @@ class Notify
                                 $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
 
+
+                                //查询下单用户上级身份（2.0新表用户）
+                                $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
+                                //查询下单用户上级身份（1.0表用户，会员升级）
+
+                                $spread_data_old = 0;
+                                if($user_data['spread_old'] != 0){
+                                    $sf = Db::name('old_user_jbp')->where('id',$user_data['spread_old'])->find();
+                                    if(!empty($sf)){
+                                        $spread_data_old = $sf;
+                                    }
+
+                                }
+
                                 //给推广者分配养老金
-                                //给推广者分配佣金
+                                //给推广者分配佣金(2.0系统中)
                                 if($user_data['spread_uid'] != 0){
-                                    //查询下单用户上级身份
-                                    $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
 
+                                    $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
                                     //user_group=1是消费者，2:业务，3:业务经理，4:初级合伙人，5:中级合伙人,6:高级合伙人，7：董事
                                     //业务或以上等级推广人
                                     //获得养老金、佣金、贡献值和积分
@@ -541,7 +554,45 @@ class Notify
 
 
 
+                                }else if(!empty($spread_data_old)){
+
+                                    //1.0jbp系统中，如果有用户升级会员，给推荐人贡献值(90%)和养老金(10%)
+
+                                    $spread_data = Db::name('user')->where('uid',$spread_data_old['id'])->find();
+                                    // $spread_data = Db::name('user')->where('uid',473)->find();
+
+                                    //养老金
+                                    $uer_bill = $spread_data['annuity'] + round($pv * 0.035,2);
+
+
+                                    $yj_amount_90 = $le_yw_amount * 0.9;
+                                    $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
+
+                                    $yongjin = $spread_data['brokerage_price'] + $yj_amount_90;
+                                    $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
+
+                                    //养老金
+                                    $this->bill_user_log($spread_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']);
+                                    //佣金
+                                    $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']);
+                                    //复购金
+                                    $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)){
+                                        $this->member_update($orderInfo,$goods_of_info1,$user_data['uid']);
+                                    }
+
+
+
                                 }
+
                                 //锁客收益
                                 if($user_data['mer_id'] != 0){
 
@@ -766,6 +817,223 @@ class Notify
 
     }
 
+    /**
+     * 会员升级
+     */
+    public function member_update($orderInfo,$goods_of_info,$user_id)
+    {
+
+
+        //code...
+        $pay_gb =  round($orderInfo['num'] * $orderInfo['gb_num'],2);
+        //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
+        //付款按照700的VR付款 start
+        $vr_num = 0;
+        if ($orderInfo['price'] == 1180) {
+            $vr_num = 700;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 7000;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 2100;
+        }elseif($orderInfo['price'] == 10620){
+            $vr_num = 6300;
+        }
+
+
+
+        $pay_gb1 = $vr_num;
+        $pay_vr1 =$orderInfo['price'];//记录VR值
+
+
+        // $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) {
+            $invite_id = $goods_of_info['spread_id'];
+
+
+            $zs_ylj = 0; //养老金赋值
+
+
+            if($goods_of_info['money'] == 1180){
+                //修改订单到账状态
+                $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 11800){
+                $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 3540){
+                $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 10620){
+                $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 9440){
+                $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
+            }elseif($goods_of_info['money'] == 2360){
+                $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
+            }
+
+
+
+
+            $uid = $user_id;
+            $new_user_id = $uid;
+            if(empty($new_user_id)) {
+                abort(0,"当前绑定会员查询错误");
+            }
+
+            $new_nums =Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
+
+            //增加过后权益对比 获取当前权益等级
+            $old_level_id = Db::name("old_user_jbp")->where("id",$uid)->find();
+
+            $old_level_info = Db::name("old_user_level")->where("id",$old_level_id['user_level_id'])->find();
+
+
+            $level_info = [];
+            $level_list = Db::name("old_user_level")->order("money desc")->select();
+
+
+            //计算会员等级 升级
+            foreach ($level_list as $key => $value) {
+                # code...
+                if($new_nums>=$value['money']) {
+                    $level_info =  $value;
+                    break;
+                }
+            }
+
+            $zs_gb = $orderInfo['price'] * 3;
+            $zs_withdraw_quota = $orderInfo['price'];
+
+
+            if($old_level_info['id'] == $level_info['id']) {
+                //未到达升级权益 不改变用户等级
+                $update_status = false;
+            }else{
+                $update_status = true;
+                $user_level = $level_info['id'];
+                //var_dump( $user_level);
+                Db::name("old_user_jbp")->where("id",$new_user_id)->save(['user_level_id'=>$user_level]);//1.0jbp旧表
+                Db::name("user")->where("uid",$new_user_id)->save(['user_level_id_old'=>$user_level]);//2.0新表
+
+                // 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){
+                //修改订单到账状态
+
+
+                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()]);
+
+
+            }
+        }
+
+
+
+        if($result) {
+            //更改订单状态
+
+            Db::commit();
+            $new_user_name = Db::name("old_user_jbp")->where("id",$new_user_id)->value("user_name");
+            $new_user_name = empty($new_user_name) ? "" : $new_user_name;
+
+            //记录日志信息
+
+            if($user_id == $invite_id) {
+                //报单中心=推荐人 GB记录日志有问题需要传入指定参数去计算
+                //$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){
+
+
+                    $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){
+
+
+                    $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","权益升级达标赠送");
+            // $this->change_user_log66($invite_id,'gb',1,$zs_invite_gb,"levle_update_zs","邀请-".$new_user_name);
+            // echo 123;return;
+            //处理查看是否有待发放佣金
+            // $zs_withdraw_quota
+            Db::name("old_user_jbp")->where("id",$new_user_id)->inc("total_withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
+            Db::name("user")->where("uid",$new_user_id)->inc("total_withdraw_quota_old",$zs_withdraw_quota)->save();
+            // $this->releaseTobeAmount($new_user_id,$zs_withdraw_quota);
+            // $this->success("支付成功",['is_cash'=>0]);
+        }
+        Db::rollback();
+        // $this->error("操作失败");
+    }
+
+    function change_user_log66($user_id,$type,$change_status,$money,$routine,$remark="",$is_admin=1,$appoint_money = 0)
+    {
+        $transition = [
+            'pv'=>1,
+            "gb"=>2,
+            "df"=>3,
+            "vr"=>4,
+            "bt"=>5,
+            "withdraw_quota_old"=>6,
+            "unsettled_pension"=>7,
+            "amount_old"=>8
+        ];
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
+        if(empty($routineInfo)) {
+            return false;
+        }
+        $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
+        //再去查询变更前的 金额
+        if($appoint_money > 0) {
+            $alter_money = $appoint_money;
+        }else{
+            //再去查询变更前的 金额
+            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+        }
+        if($change_status == 1) {
+            //新增前
+            $alter_money = $alter_money-$money;
+        }else if($change_status == 2){
+            //减少前
+            $alter_money = $alter_money + $money;
+        }
+        $inser_data = [];
+        $inser_data['user_id'] = $user_id;
+        $inser_data['type'] = $transition[$type];
+        $inser_data['change_status'] = $change_status;
+        $inser_data['money'] = $money;
+        $inser_data['routine_log_of_key_id'] = $key_id;
+        $inser_data['remark'] = $remark;
+        $inser_data['is_admin'] = $is_admin;
+        $inser_data['create_time'] = time();
+        $inser_data['alter_money'] =  isset($alter_money) ? $alter_money : 0;
+        Db::name("old_user_log")->insert($inser_data);
+    }
+
     public function pay_user_annual($uid,$order_no=''){
         Db::startTrans();
         try {

app/controller/api/store/merchant/Taskorderlianc.php

@@ -16,10 +16,264 @@ use function Symfony\Component\VarDumper\Dumper\esc;
 class Taskorderlianc extends BaseController
 {
 
+    /**
+     * 会员升级
+     */
+    public function member_update($orderInfo,$goods_of_info,$user_id)
+    {
+        //
+        //$user_id = $userInfo['id'];
+        $order_id = $orderInfo['id'];
+
+        //code...
+        $pay_gb =  round($orderInfo['num'] * $orderInfo['gb_num'],2);
+        //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
+        //付款按照700的VR付款 start
+        $vr_num = 0;
+        if ($orderInfo['price'] == 1180) {
+            $vr_num = 700;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 7000;
+        } elseif ($orderInfo['price'] == 11800) {
+            $vr_num = 2100;
+        }elseif($orderInfo['price'] == 10620){
+            $vr_num = 6300;
+        }
+
+
+
+        $pay_gb1 = $vr_num;
+        $pay_vr1 =$orderInfo['price'];//记录VR值
+
+
+        // $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) {
+            $invite_id = $goods_of_info['spread_id'];
+
+
+            $zs_ylj = 0; //养老金赋值
+
+
+            if($goods_of_info['money'] == 1180){
+                //修改订单到账状态
+                $zs_ylj = round(700 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 11800){
+                $zs_ylj = round(7000 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 3540){
+                $zs_ylj = round(2100 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 10620){
+                $zs_ylj = round(6300 * 0.05,2);//计算的养老金 金额
+            }elseif($goods_of_info['money'] == 9440){
+                $zs_ylj = round(5600 * 0.05,2);//八单计算的养老金 金额
+            }elseif($goods_of_info['money'] == 2360){
+                $zs_ylj = round(1400 * 0.05,2);//两单计算的养老金 金额
+            }
+
+
+
+
+            $uid = $user_id;
+            $new_user_id = $uid;
+            if(empty($new_user_id)) {
+                abort(0,"当前绑定会员查询错误");
+            }
+
+            $new_nums =Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
+
+            //增加过后权益对比 获取当前权益等级
+            $old_level_id = Db::name("old_user_jbp")->where("id",$uid)->find();
+
+            $old_level_info = Db::name("old_user_level")->where("id",$old_level_id['user_level_id'])->find();
+
+
+            $level_info = [];
+            $level_list = Db::name("old_user_level")->order("money desc")->select();
+
+
+            //计算会员等级 升级
+            foreach ($level_list as $key => $value) {
+                # code...
+                if($new_nums>=$value['money']) {
+                    $level_info =  $value;
+                    break;
+                }
+            }
+
+            $zs_gb = $orderInfo['price'] * 3;
+            $zs_withdraw_quota = $orderInfo['price'];
+
+
+            if($old_level_info['id'] == $level_info['id']) {
+                //未到达升级权益 不改变用户等级
+                $update_status = false;
+            }else{
+                $update_status = true;
+                $user_level = $level_info['id'];
+                //var_dump( $user_level);
+                Db::name("old_user_jbp")->where("id",$new_user_id)->save(['user_level_id'=>$user_level]);//1.0jbp旧表
+                Db::name("user")->where("uid",$new_user_id)->save(['user_level_id_old'=>$user_level]);//2.0新表
+
+                // 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){
+                //修改订单到账状态
+
+
+                Db::name("old_user_of_goods")->where("order_id",$goods_of_info1['id'])->save(['status'=>1,'pay_gb'=>0,'pay_vr'=>$pay_vr1,'pay_bt'=>0,'create_time'=>time()]);
+
+
+            }
+        }
+
+
+
+        if($result) {
+            //更改订单状态
+
+            Db::commit();
+            $new_user_name = Db::name("old_user_jbp")->where("id",$new_user_id)->value("user_name");
+            $new_user_name = empty($new_user_name) ? "" : $new_user_name;
+
+            //记录日志信息
+
+            if($user_id == $invite_id) {
+                //报单中心=推荐人 GB记录日志有问题需要传入指定参数去计算
+                //$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){
+
+
+                    $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){
+
+
+                    $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","权益升级达标赠送");
+            // $this->change_user_log66($invite_id,'gb',1,$zs_invite_gb,"levle_update_zs","邀请-".$new_user_name);
+            // echo 123;return;
+            //处理查看是否有待发放佣金
+            // $zs_withdraw_quota
+            Db::name("old_user_jbp")->where("id",$new_user_id)->inc("total_withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
+            Db::name("user")->where("uid",$new_user_id)->inc("total_withdraw_quota_old",$zs_withdraw_quota)->save();
+            // $this->releaseTobeAmount($new_user_id,$zs_withdraw_quota);
+            // $this->success("支付成功",['is_cash'=>0]);
+        }
+        Db::rollback();
+        // $this->error("操作失败");
+    }
+
+    function change_user_log66($user_id,$type,$change_status,$money,$routine,$remark="",$is_admin=1,$appoint_money = 0)
+    {
+        $transition = [
+            'pv'=>1,
+            "gb"=>2,
+            "df"=>3,
+            "vr"=>4,
+            "bt"=>5,
+            "withdraw_quota_old"=>6,
+            "unsettled_pension"=>7,
+            "amount_old"=>8
+        ];
+        $routineInfo = Db::name("old_routine_log_of_key")->where("key",$routine)->find();
+        if(empty($routineInfo)) {
+            return false;
+        }
+        $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
+        //再去查询变更前的 金额
+        if($appoint_money > 0) {
+            $alter_money = $appoint_money;
+        }else{
+            //再去查询变更前的 金额
+            $alter_money = Db::name("user")->where('uid',$user_id)->value($type);
+        }
+        if($change_status == 1) {
+            //新增前
+            $alter_money = $alter_money-$money;
+        }else if($change_status == 2){
+            //减少前
+            $alter_money = $alter_money + $money;
+        }
+        $inser_data = [];
+        $inser_data['user_id'] = $user_id;
+        $inser_data['type'] = $transition[$type];
+        $inser_data['change_status'] = $change_status;
+        $inser_data['money'] = $money;
+        $inser_data['routine_log_of_key_id'] = $key_id;
+        $inser_data['remark'] = $remark;
+        $inser_data['is_admin'] = $is_admin;
+        $inser_data['create_time'] = time();
+        $inser_data['alter_money'] =  isset($alter_money) ? $alter_money : 0;
+        Db::name("old_user_log")->insert($inser_data);
+    }
+
+
 
     public function lst2(){
 
-        echo 1423;
+        //die;
+        // if($orderInfo['pay_type'] == 1) {
+        //校验是否升级
+        //$goods_of_info1 = $this->user_of_goods->where("order_id",$orderInfo['id'])->find();
+        // if($goods_of_info1['is_update'] == 2) {
+        // echo 123;
+        $orderInfo=[
+            'num'=>1,
+            'gb_num'=>1,
+            'price'=>10620,
+            'id'=>852,//user_of_good的id
+        ];
+        $goods_of_info1 = Db::name("old_user_of_goods")->where("id", 852)->find();//用户的订单价格表
+        return $this->member_update($orderInfo,$goods_of_info1,609);
+        //}
+//}
+        // var_dump($orderInfo);die;
+        return;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//测试结束 以下是联创逻辑
         return;
 
 

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

@@ -49,10 +49,10 @@ class StoreOrder extends BaseController
      * @param StoreOrderRepository $repository
      */
     public function __construct(App $app, StoreOrderRepository $repository)
-    { 
+    {
         parent::__construct($app);
         $this->repository = $repository;
-       
+
         $this->source = request()->header('source');
         $this->merId = request()->header('merId');
     }
@@ -69,16 +69,6 @@ class StoreOrder extends BaseController
     public function checkOrder(StoreCartRepository $cartRepository)
     {
         $cartId = (array)$this->request->param('cart_id', []);
-
-
-        //在提交订单之前会产出购物车cartid，其中会产生购买的数量，现在默认会员专区是只让购买一个商品，需要修改值为1
-        $product_mer_datas=Db::name('store_cart')->where('cart_id',input('cart_id'))->find();
-
-        if($product_mer_datas['cart_num'] > 1){
-            return app('json')->fail('默认购买数量为一个，请修改购买数量!');
-        }
-
-
         $addressId = (int)$this->request->param('address_id');
         $psType = $this->request->param('type',true);//是否需要地址 boolean
         $uid = $this->request->uid();
@@ -118,8 +108,32 @@ class StoreOrder extends BaseController
     public function createOrder(StoreCartRepository $cartRepository)
     {
         $cartId = (array)$this->request->param('cart_id', []);
+
+        //在提交订单之前会产出购物车cartid，其中会产生购买的数量，现在默认会员专区是只让购买一个商品，需要修改值为1
+        $product_mer_datas=Db::name('store_cart')->where('cart_id',input('cart_id'))->find();
+
+        $a = $this->request->param('fzone_paytype','');
+
+        //在支付方式中找到用的是哪种组合支付(根据fzone_paytype是否为空来判断)
+        $res_p= strstr($a, "type");
+
+        //如果没有在fzone_paytype找到指定字符就是空
+        if($res_p == false){
+            return app('json')->fail("请选择支付方式!");
+        }
+        // else{
+        //     return app('json')->fail($a);
+        // }
+
+
+
+        if($product_mer_datas['cart_num'] > 1){
+            return app('json')->fail('购买数量默认为一件，请修改购买数量!');
+        }
+
+
         //$cartId = (int) trim($cartId, '[]"');
-      //var_dump($cartId);return;
+        //var_dump($cartId);return;
         $addressId = (int)$this->request->param('address_id');
         $coupon = (array)$this->request->param('coupon', []);
         $take = (array)$this->request->param('take', []);
@@ -142,6 +156,7 @@ class StoreOrder extends BaseController
 
         $allParams = input();
         \think\facade\Log::info("createOrder params".json_encode($allParams));
+        //return app('json')->fail(json_encode($allParams));
 
         $cartId = $allParams['cart_id'];
         \think\facade\Log::info("createOrder cart_id".json_encode($cartId));
@@ -154,7 +169,7 @@ class StoreOrder extends BaseController
 //            return app('json')->fail('请选择正确的支付方式');
         $product_mer_id=Db::name('store_cart')->where('cart_id',$cartId)->value('mer_id');
 
-     
+
 //        Db::name('log')->insert(['data'=>'商品商户ID---'.$product_mer_id]);
 //        Db::name('log')->insert(['data'=>'商户ID---'.$mer_id]);
         $special_merchant = merchantConfig($product_mer_id, 'special_merchant');
@@ -164,17 +179,17 @@ class StoreOrder extends BaseController
         $redis = Cache::store('redis')->handler();
         $key = 'createOrder'.$uid;
         if (!$redis->setnx($key, 1))
-         //   return app('json')->fail('请勿重复下单');
-        // $redis->expire($key, 3);
-        // if (!in_array($payType, [5, 6])) {
-        //     return app('json')->fail('支付方式不正确');
-        // }
+            //   return app('json')->fail('请勿重复下单');
+            // $redis->expire($key, 3);
+            // if (!in_array($payType, [5, 6])) {
+            //     return app('json')->fail('支付方式不正确');
+            // }
 
-        $user_group = (int)Db::name('user') -> where('uid',$uid)->value('user_group');
+            $user_group = (int)Db::name('user') -> where('uid',$uid)->value('user_group');
 
 
         $cartIds=Db::name('store_cart')->where('cart_id','in',$cartId)->select()->toArray();
-         // 如果是 JSON 格式的 POST 数据，可以使用以下方式获取
+        // 如果是 JSON 格式的 POST 数据，可以使用以下方式获取
         //  if (isset($_SERVER['CONTENT_TYPE']) && strpos($_SERVER['CONTENT_TYPE'], 'application/json') !== false) {
         //     $postData = json_decode(file_get_contents('php://input'), true); // 将 JSON 数据转换为数组[^1^][^8^]
         // }
@@ -185,36 +200,36 @@ class StoreOrder extends BaseController
         // // 写入日志文件
         // $logFile = __DIR__ . '/post_log.txt'; // 日志文件路径，建议放在项目日志目录下
         // file_put_contents($logFile, $logMessage, FILE_APPEND); // 追加模式写入日志[^2^]
-    
-      //log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
-       // $price = $decScore = $decJingScore =  0;
+
+        //log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
+        // $price = $decScore = $decJingScore =  0;
         //foreach ($cartIds as $k=>$item){
-           
-            // $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
-            // if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
-            // $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
-            // $price += bcmul($money, $item['cart_num'], 2);
-
-            // $storeProduct = Db::name('store_product')->where('product_id', $item['product_id'])->find();
-            // $productDecScore = $storeProduct['score'];
-            // $productDecJingdou = $storeProduct['jingdou'];
-
-            // if ($payType == 5) {
-            //     //积分支付的话
-            //     if ($productDecScore == 0) {
-            //         return app('json')->fail($storeProduct['store_name'] . '必须消耗积分');
-            //     }
-            //     $decScore += $productDecScore;
-            // } else if ($payType == 6) {
-            //     //京豆支付的话
-            //     if ($productDecJingdou == 0) {
-            //         return app('json')->fail($storeProduct['store_name'] . '必须消耗京豆');
-            //     }
-            //     $decJingScore += $productDecJingdou;
-            // }
+
+        // $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
+        // if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
+        // $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
+        // $price += bcmul($money, $item['cart_num'], 2);
+
+        // $storeProduct = Db::name('store_product')->where('product_id', $item['product_id'])->find();
+        // $productDecScore = $storeProduct['score'];
+        // $productDecJingdou = $storeProduct['jingdou'];
+
+        // if ($payType == 5) {
+        //     //积分支付的话
+        //     if ($productDecScore == 0) {
+        //         return app('json')->fail($storeProduct['store_name'] . '必须消耗积分');
+        //     }
+        //     $decScore += $productDecScore;
+        // } else if ($payType == 6) {
+        //     //京豆支付的话
+        //     if ($productDecJingdou == 0) {
+        //         return app('json')->fail($storeProduct['store_name'] . '必须消耗京豆');
+        //     }
+        //     $decJingScore += $productDecJingdou;
+        // }
         //}
 
-       
+
         // if (!$decScore && !$decJingScore) {
         //     return app('json')->fail('必须消耗京豆或积分');
         // }
@@ -427,18 +442,113 @@ class StoreOrder extends BaseController
         //     return app('json')->fail('请选择地址');
         $addressRepository = app()->make(UserAddressRepository::class);
         $address = $addressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
+
+
         if ($mer_id != 496) {
             if (!$address['city_id'])
                 return app('json')->fail('请选择正确的收货地址');
             if ($address['code_list'] == '')
                 return app('json')->fail('地址需要选择4级地址！请修改地址！');
         }
-       // var_dump($fzone_paytype);
+        // var_dump($fzone_paytype);
+
+        //return app('json')->fail($fzone_paytype);
+        //判断组合支付逻辑，积分、VR、京豆
+        $userdatas =Db::name("user")->where("uid",$uid)->find();
+        $array_fzone_paytype = json_decode($fzone_paytype,true);
+
+
+
+
+        if(!empty($array_fzone_paytype['type'])){
+            if(!empty($array_fzone_paytype['type'] == 'b1')){
+                //精彩生活VR+积分
+                //vr+积分
+                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+                $pricepri = $userdatas['score'] -  $array_fzone_paytype['other'];
+                //vr+积分
+                if($vrpri < 0 || $pricepri < 0){
+                    return app('json')->fail("支付失败,VR或积分不足!");
+                }
+
+
+            }else if(!empty($array_fzone_paytype['type'] == 'b2')){
+                //精彩生活现金+积分
+
+                $vrpri = $userdatas['score'] -  $array_fzone_paytype['other'];
+
+                // //现金+积分
+                if($vrpri  < 0 ){
+                    return app('json')->fail("支付失败,积分不足!");
+                }
+
+
+            }else if(!empty($array_fzone_paytype['type'] == 'b3')){
+                //精彩生活区 VR+京豆
+
+
+                return app('json')->fail("开发中升级中！");
+
+            }else if(!empty($array_fzone_paytype['type'] == 'b4')){
+                //精彩生活区 VR+京豆
+
+
+                return app('json')->fail("开发中升级中！");
+
+            }else if(!empty($array_fzone_paytype['type'] == 'b5')){
+                //精彩生活 VR支付
+
+                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+
+                if($vrpri < 0){
+                    return app('json')->fail("支付失败,VR不足!");
+                }
+            }else if(!empty($array_fzone_paytype['type'] == 'a1')){
+                //生活 VR支付
+
+                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+
+                if($vrpri < 0){
+                    return app('json')->fail("支付失败,VR不足!");
+                }
+
+                //检查用户在旧表中是否与上级，有的话就是升级权限，要新增一个user_of_goods的表
+                $data1['user_id']=$uid;
+                $data1['goods_list_id']=0;
+                $data1['status']=0;
+                $data1['spread_id']=$userdatas['invite_id_old'];
+                $data1['node_id']=$userdatas['spread_id_old'];
+                $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;
+
+
+                $getuserofgoodsid =  Db::name('old_uesr_of_goods')->insertGetId($data1);
+
+                //Db::getLastInsID();
+
+            }else if(!empty($array_fzone_paytype['type'] == 'a3')){
+                //生活 现金 + VR支付
+                return app('json')->fail("正在升级,敬请期待!");
+                $vrpri = $userdatas['vr'] -  $array_fzone_paytype['price'];
+
+                if($vrpri < 0){
+                    return app('json')->fail("支付失败,VR不足!");
+                }
+            }
+        }
+
+
+        //end
+
 
         makeLock()->lock();
         try {
-            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,0,0,$mer_id,0,0,0,0,0,0,$fzone_paytype);
-    //var_dump($groupOrder);
+            $groupOrder = $this->repository->createOrder($this->request->userInfo(), $payType, [$cartId], $addressId, 0,0, 0,0,0,0,0,$mer_id,0,0,0,0,0,0,$fzone_paytype,$getuserofgoodsid);
+            //var_dump($groupOrder);
         } catch (\Throwable $e) {
             makeLock()->unlock();
             throw $e;
@@ -447,12 +557,12 @@ class StoreOrder extends BaseController
 
 
         //删除缓存的优惠价格
-       // Cache::delete($uid.'_youhui_price_'.$product_type_id);
+        // Cache::delete($uid.'_youhui_price_'.$product_type_id);
+
+        //return app('json')->status('success', '支付成功1', ['order_id' => $groupOrder['group_order_id']]);
+        //利润
 
-            //return app('json')->status('success', '支付成功1', ['order_id' => $groupOrder['group_order_id']]);
- //利润
 
-            
         if ($groupOrder['pay_price'] == 0) {
             $this->repository->paySuccess($groupOrder);
             return app('json')->status('success', '支付成功2', ['order_id' => $groupOrder['group_order_id']]);
@@ -461,13 +571,13 @@ class StoreOrder extends BaseController
             $groupOrder['pay_price'] =set_price_rtrim($groupOrder['pay_price'] );
             //
             if( $groupOrder['er'] == 0){
-                
+
                 return app('json')->success(['order_id' => $groupOrder->group_order_id,"groupOrder"=>$groupOrder]);
             }else{
                 return json_encode(array("status"=>400,"message"=> $groupOrder['er1']));
             }
-           
-          
+
+
 
             //            return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder);
         } catch (\Exception $e) {
@@ -1262,7 +1372,7 @@ class StoreOrder extends BaseController
 
 
 
-        /**
+    /**
      * @param StoreCartRepository $cartRepository
      * @return mixed
      * @author xaboy
@@ -1271,7 +1381,7 @@ class StoreOrder extends BaseController
     public function createOrder_copy(StoreCartRepository $cartRepository)
     {
         $cartId = (array)$this->request->param('cart_id', []);
-      
+
         $addressId = (int)$this->request->param('address_id');
         $coupon = (array)$this->request->param('coupon', []);
         $take = (array)$this->request->param('take', []);
@@ -1633,7 +1743,7 @@ class StoreOrder extends BaseController
 //            ];
 //            Db::name('log')->insert(['data'=>json_encode($insert)]);
 //            Db::name('entropy_barter_bill')->insert($insert);
-            return app('json')->status('success', '支付成功1', ['order_id' => $groupOrder['group_order_id']]);
+        return app('json')->status('success', '支付成功1', ['order_id' => $groupOrder['group_order_id']]);
 //
 //        }else if($payType==6){
 //            //积分商品

app/controller/api/user/User.php

@@ -737,14 +737,13 @@ class User extends BaseController
             $params['status'] = 1;
             $res = $this->repository->add_cer($params, $member_id);
             if ($res) {
-                $userRepository = app()->make(UserRepository::class);
                 //赠送积分 完善实名送90个积分，同时送邀请人50个积分
-                $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
+                $this->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','');
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
                 if($member_info['spread_uid']){
                     //好友完善实名系统赠送50个积分
                     $spreadUid = $member_info['spread_uid'];
-                    $userRepository->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','', '', 1, '', 1);
+                    $this->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','');
                 }
                 return app('json')->success($res);
             } else {
@@ -758,6 +757,47 @@ class User extends BaseController
 
 
     /**
+     * @param int $uid 用户ID
+     * @param string $score 积分
+     * @param int $status 积分状态
+     * @param string $mark 备注
+     * @param string $has_qian 连续签到天数
+     * @param string $today_signintime 签到时间
+     * @param int $order_id 订单ID
+     * @param int $pm 1-收入。2-支出
+     * @param string $order_type
+     * @throws DbException
+     */
+    public function sign_add($uid, $score, $status, $mark, $has_qian = '', $today_signintime = '', $order_id = 0, $pm = 1, $order_type = '',$type='',$settlement_time = '')
+    {
+        if(!in_array($type,[1,2])){
+            // 其他情况都直接返回，因为目前只有365专区购买才可以获得
+            return false;
+        }
+
+        $ins_data['uid'] = $uid;
+        $ins_data['continuity_day'] = $has_qian;
+        $ins_data['reward_socre'] = $score;
+        $ins_data['signin_time'] = $today_signintime;
+        $ins_data['addtime'] = time();
+        $ins_data['status'] = $status;
+        $ins_data['mark'] = $mark;
+        $ins_data['type'] = $type;
+        $ins_data['settlement_time'] = $settlement_time;// 结算时间 真正到了结算时间会结算
+        $ins_data['order_id'] = $order_id;
+        $ins_data['pm'] = $pm;
+        $ins_data['order_type'] = $order_type;
+        Db::name('user_sign_score')->insertGetId($ins_data);
+
+        if($pm == 1 && $status == 1){
+            Db::name('user')->where('uid',$uid)->inc('score', $score)->update();
+        }
+        if($pm == 2){
+            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
+        }
+    }
+
+    /**
      * 申请代理
      * name:公司名称
      * identity：身份
@@ -2581,9 +2621,6 @@ class User extends BaseController
         $uid = $this->request->uid();//签到用户
         $user = Db::name('user')->where('uid', $uid)->field("spread_uid,first_sign")->find();//上级用户
 
-        //第一天签到获得2积分,第二天获得4积分,第三天获得6积分,第四天获得 10 积分,第五天获得 14积分第六天获得 20积分,
-        //连续签到从第七天开始,每日签到获得3积分,第七天连续签到额外奖励 38积分,第 14 天连续签到额外奖励 68 积分,第 21天连续签到额外奖励 128 积分第 30 天连续签到额外奖励 188 积分
-
         //前6天积分
         $score = [
             2,//1
@@ -2616,52 +2653,39 @@ class User extends BaseController
                 $has_qian = $yes_signin_info['continuity_day'] + 1;
                 $has_qian = $has_qian > 30 ? 1 : $has_qian;
             }
-            $get_score = 0;
-            $get_gw_score = 0;
             if ($has_qian <= 6) {
                 $get_score = $score[$has_qian - 1];
             } else {
                 $get_score = $scoreS;
                 if (isset($scoreExtra[$has_qian])) {
-                    $get_gw_score = $scoreExtra[$has_qian];
+                    $get_score = $scoreS + $scoreExtra[$has_qian];
                 }
             }
 
             $userRepository = app()->make(UserRepository::class);
-            $userRepository->sign_add($uid, $get_score, 1, '签到赠送积分', $has_qian, $today_signintime, '', 1, '', 1);
-            if($get_gw_score > 0){
-                $userRepository->sign_add($uid, $get_gw_score,1,'连续签到赠送额外奖励积分', $has_qian, $today_signintime, '', 1, '', 1);
-            }   
-
+            $userRepository->sign_add($uid, $get_score, 1, '签到赠送积分', $has_qian, $today_signintime, '');
 
             //首次签到
             if ($user['first_sign'] == 0) {
-                //首次签到送30积分，同时赠送邀请人30积分
-                $userRepository->sign_add($uid, 30,1,'首次签到送30积分','','', '', 1, '', 1);
-                $member_info = Db::name('user')->where( array('uid' => $uid) )->find();
-                if($member_info['spread_uid']){
-                    $spreadUid = $member_info['spread_uid'];
-                    $userRepository->sign_add($spreadUid, 30,1,'邀请人首次签到送30积分','','', '', 1, '', 1);
-                }
                 Db::name('user')->where('uid', $uid)->update(['first_sign' => 1]);
             } elseif ($user['first_sign'] == 1 && $has_qian == 1) {
                 Db::name('user')->where('uid', $uid)->update(['first_sign' => 2]);
             }
 
-            // //非首次签到，第一天，断签
-            // //好友连续签到3天 奖励50
-            // //好友连续签到14天 奖励100
-            // //好友联系签到30天 奖励300
-            // if ($user['first_sign'] < 2) {
-            //     if ($has_qian == 3) {
-            //         $userRepository->sign_add($user['spread_uid'], 50, 1, '好友签到赠送积分', '', $today_signintime, '');
-            //     } elseif ($has_qian == 14) {
-            //         $userRepository->sign_add($user['spread_uid'], 100, 1, '好友签到赠送积分', '', $today_signintime, '');
-            //     } elseif ($has_qian == 30) {
-            //         $userRepository->sign_add($user['spread_uid'], 300, 1, '好友签到赠送积分', '', $today_signintime, '');
-            //         Db::name('user')->where('uid', $uid)->update(['first_sign' => 3]);
-            //     }
-            // }
+            //非首次签到，第一天，断签
+            //好友连续签到3天 奖励50
+            //好友连续签到14天 奖励100
+            //好友联系签到30天 奖励300
+            if ($user['first_sign'] < 2) {
+                if ($has_qian == 3) {
+                    $userRepository->sign_add($user['spread_uid'], 50, 1, '好友签到赠送积分', '', $today_signintime, '');
+                } elseif ($has_qian == 14) {
+                    $userRepository->sign_add($user['spread_uid'], 100, 1, '好友签到赠送积分', '', $today_signintime, '');
+                } elseif ($has_qian == 30) {
+                    $userRepository->sign_add($user['spread_uid'], 300, 1, '好友签到赠送积分', '', $today_signintime, '');
+                    Db::name('user')->where('uid', $uid)->update(['first_sign' => 3]);
+                }
+            }
 
             return app('json')->success('签到成功', ['score' => $get_score]);
         }