分润修改

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

@@ -8878,14 +8878,18 @@ class StoreOrderRepository extends BaseRepository
 
 
     //添加贡献值日志
-    public function con_log($uid,$num,$order_id,$order_type,$mark){
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+        }
 
         $con = [
             'uid'=>$uid,
             'number'=>$num,//赠送数量
-            'status'=>-1,//红包状态
+            'status'=>$status,//红包状态
             'mark'=>$mark,//备注
             'desc'=>'',//描述
             'order_id'=>$order_id,//订单id
@@ -8899,10 +8903,14 @@ class StoreOrderRepository extends BaseRepository
         Db::name('user_sign_gongxian')->insert($con);
     }
 
-//添加积分日志
-    public function score_log($uid,$num,$order_id,$order_type,$mark){
+    //添加积分日志
+    public function score_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
 
         $score_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_score = Db::name('user')->where("uid",$uid)->update(['score'=>$score_data['score'] + $num]);
+        }
 
         $score = [
             'uid'=>$uid,
@@ -8910,7 +8918,7 @@ class StoreOrderRepository extends BaseRepository
             'reward_socre'=>$num,//积分数量
             'signin_time'=>0,//签到时间
             'source_uid'=>0,//赠送积分用户来源id
-            'status'=>-1,//积分状态1:有效，0:失效,1:待确认
+            'status'=>$status,//积分状态1:有效，0:失效,1:待确认
             'mark'=> $mark,//备注
             'order_id'=>$order_id,//订单id
             'pm'=>1,//1收入，2支出
@@ -8929,6 +8937,14 @@ class StoreOrderRepository extends BaseRepository
     public function bill_user_log($uid,$num,$order_id,$comm_order_type,$order_sn,$mark,$merid,$ds=1){
 
         $con_data = Db::name('user')->where("uid",$uid)->find();
+        //如果是会员专区就即刻到账
+        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->find();
+        if($order_from_mer['mer_id'] == 496 && $comm_order_type==3){
+            // Db::name('user')->where("order_id",$order_id)->find();
+            Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
+        }
+
+
         $name = '';
         if($comm_order_type==3){
             $name = '直推奖';
@@ -8971,12 +8987,18 @@ class StoreOrderRepository extends BaseRepository
     }
 
     //添加复购金
-    public function fugou_user_log($uid,$num,$order_id,$type_inc_des){
+    public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
+
+        $fugou_data = Db::name('user')->where("uid",$uid)->find();
+        //如果状态是1那就是即刻入账，
+        if($status == 1){
+            $con_data_fugoujin = Db::name('user')->where("uid",$uid)->update(['fugou'=>$fugou_data['fugou'] + $num]);
+        }
 
         $bill = [
             'uid'=>$uid,
             'number'=>$num,//数量
-            'status'=>1,//复购金状态1-有效 0-失效 -1待确认
+            'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
             'desc'=>"抽取佣金的10%作为复购金",//描述
             'order_id'=>$order_id,//订单id
@@ -9272,8 +9294,8 @@ class StoreOrderRepository extends BaseRepository
 
             $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']);
 
-            $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值");
-            $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分");
+            $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);
 
             //给推广者分配养老金
             //给推广者分配佣金
@@ -9310,9 +9332,9 @@ class StoreOrderRepository extends BaseRepository
                         //  Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.07,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                     }else if($spread_data['user_group'] == 3){
                         $con = $spread_data['contribute'] + round($pv * 0.09,2);
@@ -9320,9 +9342,9 @@ class StoreOrderRepository extends BaseRepository
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.09,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                     }else if($spread_data['user_group'] == 4){
@@ -9331,9 +9353,9 @@ class StoreOrderRepository extends BaseRepository
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.11,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                     }else if($spread_data['user_group'] == 5){
@@ -9342,9 +9364,9 @@ class StoreOrderRepository extends BaseRepository
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.13,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
                     }else if($spread_data['user_group'] == 6){
                         $con = $spread_data['contribute'] + round($pv * 0.15,2);
@@ -9352,9 +9374,9 @@ class StoreOrderRepository extends BaseRepository
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.15,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                     }else if($spread_data['user_group'] == 7){
@@ -9363,9 +9385,9 @@ class StoreOrderRepository extends BaseRepository
                         // Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $con,'score'=> $score,'brokerage_price'=> $yongjin,'annuity'=>$uer_bill,"fugou"=> $fgj_amount]);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
                         //积分
-                        $this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                        $this->score_log($spread_data['uid'],round($pv * 0.17,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
 
 
                     }
@@ -9374,7 +9396,7 @@ class StoreOrderRepository extends BaseRepository
                     //佣金
                     $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);
+                    $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
                 }
 
@@ -9391,12 +9413,12 @@ class StoreOrderRepository extends BaseRepository
 
                     $yj_amount = $spread_data['brokerage_price'] + $yj_amount_90;
                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
-                    $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
+                    $this->fugou_user_log($spread_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);
 
 
                     //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
-                    $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
-                    $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                    $this->con_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                    $this->score_log($spread_data['uid'],round($pv * 0.03,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
                     //推广佣金
                     $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']);
                 }
@@ -9420,7 +9442,7 @@ class StoreOrderRepository extends BaseRepository
 
                     $yj_amount = $merchant_data['brokerage_price'] + $yj_amount_90;
                     $fgj_amount = $merchant_data['fugou'] + $fgj_amount_10;
-                    $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1);
+                    $this->fugou_user_log($merchant_data['uid'],$fgj_amount_10,$store_order_data['order_id'],1,1);