Просмотр исходного кода

更新备æ³çŠ传参不正确导致é‡导致发é放错误问题

hefei 1 год назад
Родитель
Сommit
214471e5b0
2 измененных файлов с 14 добавлено и 14 удалено
  1. 9 9
      app/common/repositories/store/order/StoreOrderRepository.php
  2. 5 5
      app/controller/api/Notify.php

+ 9 - 9
app/common/repositories/store/order/StoreOrderRepository.php

@@ -9274,7 +9274,7 @@ class StoreOrderRepository extends BaseRepository
9274
     }
9274
     }
9275
 
9275
 
9276
     //添加贡献值日志
9276
     //添加贡献值日志
9277
-    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1, $pv = 0)
9277
+    public function con_log($uid, $num, $order_id, $order_type, $mark, $status = -1)
9278
     {
9278
     {
9279
 
9279
 
9280
         $con_data = Db::name('user')->where("uid", $uid)->find();
9280
         $con_data = Db::name('user')->where("uid", $uid)->find();
@@ -9603,9 +9603,9 @@ class StoreOrderRepository extends BaseRepository
9603
                         //推广佣金
9603
                         //推广佣金
9604
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
9604
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
9605
                         // 贡献值
9605
                         // 贡献值
9606
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, $pv);
9606
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
9607
                         //积分
9607
                         //积分
9608
-                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分");
9608
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广精彩生活商品赠送积分");
9609
                     } else if ($spread_data['user_group'] > 1) {
9609
                     } else if ($spread_data['user_group'] > 1) {
9610
 
9610
 
9611
                         $ssf = bcmul($pv, $rate, 2);
9611
                         $ssf = bcmul($pv, $rate, 2);
@@ -9614,9 +9614,9 @@ class StoreOrderRepository extends BaseRepository
9614
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9614
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
9615
 
9615
 
9616
                         //贡献值
9616
                         //贡献值
9617
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "精彩生活区商品赠送贡献值");
9617
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送贡献值");
9618
                         //积分
9618
                         //积分
9619
-                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "精彩生活区商品赠送积分");
9619
+                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
9620
                         // //推广佣金
9620
                         // //推广佣金
9621
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
9621
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id'], 0);
9622
                         //养老金
9622
                         //养老金
@@ -9674,7 +9674,7 @@ class StoreOrderRepository extends BaseRepository
9674
             }
9674
             }
9675
 
9675
 
9676
             $this->bill_user_log($user_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
9676
             $this->bill_user_log($user_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
9677
-            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值", 1, $gx_jf);
9677
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值",1);
9678
             $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送PV值", 1);
9678
             $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送PV值", 1);
9679
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
9679
             $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
9680
 
9680
 
@@ -9703,7 +9703,7 @@ class StoreOrderRepository extends BaseRepository
9703
 
9703
 
9704
                 $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
9704
                 $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
9705
                 //贡献值
9705
                 //贡献值
9706
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, round($gx_jf, 2));
9706
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
9707
 
9707
 
9708
                 //养老金
9708
                 //养老金
9709
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
9709
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . round($pv * 0.035, 2), $store_order_data['mer_id']);
@@ -9718,7 +9718,7 @@ class StoreOrderRepository extends BaseRepository
9718
                 $yj_amount_90 = bcmul($yj1, 0.9, 2);
9718
                 $yj_amount_90 = bcmul($yj1, 0.9, 2);
9719
                 $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
9719
                 $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
9720
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
9720
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
9721
-                $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, bcmul($gx_jf, 0.3, 2));
9721
+                $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
9722
                 $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
9722
                 $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
9723
                 //推广佣金
9723
                 //推广佣金
9724
                 $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
9724
                 $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金' . $yj_amount_90, $store_order_data['mer_id']);
@@ -9731,7 +9731,7 @@ class StoreOrderRepository extends BaseRepository
9731
                 $yj_amount_90 = $le_yw_amount * 0.9;
9731
                 $yj_amount_90 = $le_yw_amount * 0.9;
9732
                 $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
9732
                 $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
9733
 
9733
 
9734
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1, round($gx_jf, 2));
9734
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
9735
                 //养老金
9735
                 //养老金
9736
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
9736
                 $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.035, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . bcmul($pv, 0.035, 2), $store_order_data['mer_id']);
9737
                 //佣金
9737
                 //佣金

+ 5 - 5
app/controller/api/Notify.php

@@ -421,7 +421,7 @@ class Notify
421
  
421
  
422
                                 $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送pv",1);
422
                                 $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送pv",1);
423
                                 // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
423
                                 // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
424
-                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1, $gx_jf);
424
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
425
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
425
                                 $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送积分",1);
426
 
426
 
427
 
427
 
@@ -537,7 +537,7 @@ class Notify
537
                                         $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
537
                                         $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
538
 
538
 
539
 
539
 
540
-                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($gx_jf,2));
540
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
541
 
541
 
542
                                         //养老金
542
                                         //养老金
543
                                         $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
543
                                         $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
@@ -571,7 +571,7 @@ class Notify
571
 
571
 
572
 
572
 
573
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
573
                                         //Db::name('user')->where('uid',$spread_data['uid'])->update(['contribute'=> $gx_jf,'score'=> $gx_jf,'brokerage_price'=> $yj_amount,'fugou'=>$fgj_amount]);
574
-                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($pv * 0.21,2));
574
+                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
575
                                         $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
575
                                         $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
576
                                         //推广佣金
576
                                         //推广佣金
577
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
577
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金'.$yj_amount_90,$store_order_data['mer_id']);
@@ -598,7 +598,7 @@ class Notify
598
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
598
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
599
 
599
 
600
 
600
 
601
-                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1, round($gx_jf,2));
601
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
602
                                     //养老金
602
                                     //养老金
603
                                     $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
603
                                     $this->bill_user_log($spread_data['uid'],round($pv * 0.035,2),$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.round($pv * 0.035,2),$store_order_data['mer_id']);
604
                                     //佣金
604
                                     //佣金
@@ -1546,7 +1546,7 @@ class Notify
1546
     }
1546
     }
1547
 
1547
 
1548
     //添加贡献值日志
1548
     //添加贡献值日志
1549
-    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1, $pv = 0){
1549
+    public function con_log($uid,$num,$order_id,$order_type,$mark,$status = -1){
1550
 
1550
 
1551
         $con_data = Db::name('user')->where("uid",$uid)->find();
1551
         $con_data = Db::name('user')->where("uid",$uid)->find();
1552
         //如果状态是1那就是即刻入账,
1552
         //如果状态是1那就是即刻入账,