规范order_type

app/common/repositories/movie/MovieRepository.php

@@ -750,7 +750,7 @@ class MovieRepository extends BaseRepository
         // 消费者 - 红包 - 老用户发红包奖励
         $user = Db::name("user")->where('uid', $orderinfo["uid"])->find();
         if ($user['is_old'] == 1) {
-            $storeOrderRepository->giveHongBao($orderinfo["uid"], $pv, $orderinfo['order_id'], '购买电影票赠送红包');
+            $storeOrderRepository->giveHongBao($orderinfo["uid"], $pv, $orderinfo['order_id'], '购买电影票赠送红包', -1,13);
         }
         // 积分
         $storeOrderRepository->score_log($orderinfo['uid'], $pv, $orderinfo['order_id'], 13, "购买电影票赠送积分");
@@ -779,7 +779,7 @@ class MovieRepository extends BaseRepository
 
             // 复购金-推广者的佣金抽10%到个人复购金
             $fgj_amount_10 = round(bcmul($pv, $rate, 2) * $movie_commission_rate_config['repurchase_directthrust_rate'], 2);
-            $storeOrderRepository->fugou_user_log($spread_data['uid'], $fgj_amount_10, $orderinfo['order_id'], 1);
+            $storeOrderRepository->fugou_user_log($spread_data['uid'], $fgj_amount_10, $orderinfo['order_id'], 1, -1, 13);
 
             // 积分
             $score = bcmul($pv, $rate, 2);
@@ -813,7 +813,7 @@ class MovieRepository extends BaseRepository
 
                 // 锁客复购金
                 $fgj_amount_10 = round(bcmul($pv, $movie_commission_rate_config['repurchase_lockpassenger_merid_rate'], 2) * $movie_commission_rate_config['repurchase_lockpassenger_rate'], 2);
-                $storeOrderRepository->fugou_user_log($merchant_uid, $fgj_amount_10, $orderinfo['order_id'], 1);
+                $storeOrderRepository->fugou_user_log($merchant_uid, $fgj_amount_10, $orderinfo['order_id'], 1, -1, 13);
             }
         }
     }

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

@@ -9365,7 +9365,7 @@ class StoreOrderRepository extends BaseRepository
         return $group;
     }
 
-    public function giveHongBao($uid, $pv, $order_id, $mark, $status = -1)
+    public function giveHongBao($uid, $pv, $order_id, $mark, $status = -1, $order_type = 0)
     {
         //添加红包
         $hongbao = bcmul($pv, 0.45, 2);
@@ -9374,7 +9374,7 @@ class StoreOrderRepository extends BaseRepository
             "number" => $hongbao,
             "addtime" => time(),
             "status" => $status,
-            "order_type" => 1,
+            "order_type" => $order_type,
             "order_id" => $order_id,
             "mark" => $mark,
             "desc" => '',
@@ -9595,7 +9595,7 @@ class StoreOrderRepository extends BaseRepository
                             "pension" => $num,//养老金额度
                             "out_trade_no" => $order_from_mer['order_sn'],//订单号
                             "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 2,//订单类型(2:)
+                            "order_type" => 0,//订单类型(2:)
                             "pay_time" => date('Y-m-d H:i:s'),
                             "create_time" => date('Y-m-d H:i:s'),
                             "update_time" => date('Y-m-d H:i:s'),
@@ -9656,7 +9656,7 @@ class StoreOrderRepository extends BaseRepository
     }
 
     //添加复购金
-    public function fugou_user_log($uid, $num, $order_id, $type_inc_des, $status = -1)
+    public function fugou_user_log($uid, $num, $order_id, $type_inc_des, $status = -1, $order_type = 0)
     {
 
         $fugou_data = Db::name('user')->where("uid", $uid)->find();
@@ -9673,7 +9673,7 @@ class StoreOrderRepository extends BaseRepository
             'desc' => "抽取佣金的10%作为复购金",//描述
             'order_id' => $order_id,//订单id
             'surplus' => 0,//剩余
-            'order_type' => 11,//关联订单ID
+            'order_type' => $order_type,//关联订单ID
             'type' => $type_inc_des,//复购金类型 :1赠送，2消耗
             'settlement_time' => date('Y-m-d H:i:s'),//添加时间,
             'addtime' => time(),
@@ -9715,14 +9715,14 @@ class StoreOrderRepository extends BaseRepository
 
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '消费获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 贡献值
-                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送贡献值");
-                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送PV值");
+                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买精彩生活商品赠送贡献值");
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买精彩生活商品赠送PV值");
                 if (!empty($user_data['is_old'])) {
                     // 红包
                     $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
                 }
                 // 积分
-                $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 11, "购买精彩生活商品赠送积分");
+                $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买精彩生活商品赠送积分");
 
                 //查询下单用户上级身份
                 $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
@@ -9741,9 +9741,9 @@ class StoreOrderRepository extends BaseRepository
                         //推广佣金
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         // 贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广精彩生活商品赠送积分");
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
                     } else if ($spread_data['user_group'] > 1) {
 
                         $ssf = bcmul($pv, $rate, 2);
@@ -9752,9 +9752,9 @@ class StoreOrderRepository extends BaseRepository
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活区商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
+                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 0, "推广精彩生活区商品赠送积分");
                         // //推广佣金
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
@@ -9812,9 +9812,9 @@ class StoreOrderRepository extends BaseRepository
             }
 
             $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']);
-            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送贡献值",1);
-            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送PV值", 1);
-            $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 11, "购买会员专区商品赠送积分", 1);
+            $this->con_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 0, "购买会员专区商品赠送贡献值",1);
+            $this->con_log_pv($user_data['uid'], $gx_jf, $store_order_data['order_id'], 0, "购买会员专区商品赠送PV值", 1);
+            $this->score_log($user_data['uid'], $gx_jf, $store_order_data['order_id'], 0, "购买会员专区商品赠送积分", 1);
 
             //查询下单用户上级身份（1.0表用户，会员升级）
             $spread_data_old = 0;
@@ -9839,9 +9839,9 @@ class StoreOrderRepository extends BaseRepository
                 $yj_amount_90 = $le_yw_amount * 0.9;
                 $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
 
-                $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送积分", 1);
                 //贡献值
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送贡献值", 1);
 
                 //养老金
                 $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']);
@@ -9856,8 +9856,8 @@ class StoreOrderRepository extends BaseRepository
                 $yj_amount_90 = bcmul($yj1, 0.9, 2);
                 $fgj_amount_10 = bcmul($yj1, 0.1, 2);//推广者的佣金抽10%到个人复购金
                 $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1, 1);
-                $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
-                $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送积分", 1);
+                $this->con_log($spread_data['uid'], bcmul($gx_jf, 0.3, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送贡献值", 1);
+                $this->score_log($spread_data['uid'], bcmul($gx_jf, $rate, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送积分", 1);
                 //推广佣金
                 $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id']);
             }
@@ -9869,7 +9869,7 @@ class StoreOrderRepository extends BaseRepository
                 $yj_amount_90 = $le_yw_amount * 0.9;
                 $fgj_amount_10 = $le_yw_amount * 0.1;//推广者的佣金抽10%到个人复购金
 
-                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 11, "推广会员专区商品赠送贡献值", 1);
+                $this->con_log($spread_data['uid'], round($gx_jf, 2), $store_order_data['order_id'], 0, "推广会员专区商品赠送贡献值", 1);
                 //养老金
                 $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']);
                 //佣金
@@ -9944,15 +9944,15 @@ class StoreOrderRepository extends BaseRepository
                 // 让利部分30%给消费者做养老金{$ylj_pri}
                 $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                 // 购买商贸区赠送贡献值
-                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区商品赠送贡献值");
                 // 购买商贸区赠送PV值
-                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
+                $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区赠送PV值");
                 if (!empty($user_data['is_old'])) {
                     // 红包
                     $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
                 }
                 // 积分
-                $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
+                $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区商品赠送积分");
                 $this->con_log_fenrun($merchantInfo['uid'],$concession_pri,$store_order_data['order_id'],0,'商贸区下单产生分润值');
 
                 if ($user_data['spread_uid'] != 0) {
@@ -9967,9 +9967,9 @@ class StoreOrderRepository extends BaseRepository
                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                         //贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广商贸区商品赠送贡献值");
                         //积分
-                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
+                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 0, "推广商贸区商品赠送积分");
                         //推广佣金
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
@@ -9988,9 +9988,9 @@ class StoreOrderRepository extends BaseRepository
                         //推广佣金
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         // 贡献值
-                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 12, "推广商贸区商品赠送贡献值");
+                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广商贸区商品赠送贡献值");
                         // 积分
-                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 12, "推广商贸区商品赠送积分");
+                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广商贸区商品赠送积分");
                     }
                 }
 

app/controller/api/Notify.php

@@ -89,11 +89,11 @@ class Notify
                                     $hf_refund_res = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refund_traits, $pay_type == '1' ? 2 : 1, $pay_wx, $key);
                                     Db::name('log')->insert(['data'=>'话费充值汇付支付撤销返回结果：'.json_encode($hf_refund_res)]);
                                     //把赠送出去的养老金 积分 贡献值 复购金 改为已失效
-                                    Db::name('user_bill')->where('order_sn', $order_data['order_no'])->update(['status'=> -1]);
-                                    Db::name('user_sign_score')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
-                                    Db::name('user_sign_gongxian')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
-                                    Db::name('user_sign_fugou')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
-                                    Db::name('user_sign_hongbao')->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_bill')->where('type_shop', 9)->where('order_sn', $order_data['order_no'])->update(['status'=> -1]);
+                                    Db::name('user_sign_score')->where('order_type', 9)->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_gongxian')->where('order_type', 9)->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_fugou')->where('order_type', 9)->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
+                                    Db::name('user_sign_hongbao')->where('order_type', 9)->where('order_id', $order_data['order_no'])->update(['status'=> 0]);
                                 }
                             }catch (\Exception $e) {
                                 Db::name('log')->insert(['data'=>'话费充值支付回调推送订单错误：'.$e->getFile().'：'.$e->getLine().'【'.$e->getMessage().'】']);
@@ -188,9 +188,9 @@ class Notify
                                     //Db::name('user')->where('uid',$user_data['uid'])->update(['annuity'=>$ylj_amount_mine,"contribute"=>$con,"score"=>$score]);
 
                                     $this->bill_user_log($user_data['uid'],$ylj_pri,$store_order_data['order_id'],5,$store_order_data['order_sn'],'消费获得养老金'.$ylj_pri,$store_order_data['mer_id'],0);
-                                    $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送pv");
-                                    $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送贡献值");
-                                    $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],11,"购买精彩生活商品赠送积分");
+                                    $this->con_log_pv($user_data['uid'],$pv,$store_order_data['order_id'],0,"购买精彩生活商品赠送pv");
+                                    $this->con_log($user_data['uid'],$pv,$store_order_data['order_id'],0,"购买精彩生活商品赠送贡献值");
+                                    $this->score_log($user_data['uid'],$pv,$store_order_data['order_id'],0,"购买精彩生活商品赠送积分");
                                     if (!empty($user_data['is_old'])) {
                                         // 红包
                                         $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买精彩生活商品赠送红包');
@@ -213,9 +213,9 @@ class Notify
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         // 贡献值
-                                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活商品赠送贡献值");
+                                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                                         //积分
-                                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广精彩生活商品赠送积分");
+                                        $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
                                     } else if ($spread_data['user_group'] > 1) {
 
                                         $ssf = bcmul($pv, $rate, 2);
@@ -224,9 +224,9 @@ class Notify
                                         $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                                         //贡献值
-                                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送贡献值");
+                                        $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活区商品赠送贡献值");
                                         //积分
-                                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广精彩生活区商品赠送积分");
+                                        $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 0, "推广精彩生活区商品赠送积分");
                                         // //推广佣金
                                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         //养老金
@@ -315,10 +315,10 @@ class Notify
  
                                 $this->bill_user_log($user_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']);
  
-                                $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送pv",1);
+                                $this->con_log_pv($user_data['uid'],$gx_jf,$store_order_data['order_id'],0,"购买会员专区商品赠送pv",1);
                                 // $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],11,"购买会员专区商品赠送贡献值",1);
-                                $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);
+                                $this->con_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],0,"购买会员专区商品赠送贡献值",1);
+                                $this->score_log($user_data['uid'],$gx_jf,$store_order_data['order_id'],0,"购买会员专区商品赠送积分",1);
 
 
                                 //查询下单用户上级身份（2.0新表用户）
@@ -430,10 +430,10 @@ class Notify
 
                                         }
 
-                                        $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                        $this->score_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],0,"推广会员专区商品赠送积分",1);
 
 
-                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                        $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],0,"推广会员专区商品赠送贡献值",1);
 
                                         //养老金
                                         $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']);
@@ -467,8 +467,8 @@ class Notify
 
 
                                         //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.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
-                                        $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分",1);
+                                        $this->con_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],0,"推广会员专区商品赠送贡献值",1);
+                                        $this->score_log($spread_data['uid'],round($pv * 0.3,2),$store_order_data['order_id'],0,"推广会员专区商品赠送积分",1);
                                         //推广佣金
                                         $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$store_order_data['order_sn'],'推广获得佣金',$store_order_data['mer_id']);
                                     }
@@ -494,7 +494,7 @@ class Notify
                                     $fgj_amount = $spread_data['fugou'] + $fgj_amount_10;
 
 
-                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值",1);
+                                    $this->con_log($spread_data['uid'],round($gx_jf,2),$store_order_data['order_id'],0,"推广会员专区商品赠送贡献值",1);
                                     //养老金
                                     $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']);
                                     //佣金
@@ -628,11 +628,11 @@ class Notify
                                     // 让利部分30%给消费者做养老金{$ylj_pri}
                                     $this->bill_user_log($user_data['uid'], $ylj_pri, $store_order_data['order_id'], 5, $store_order_data['order_sn'], '购买商贸区商品获得养老金' . $ylj_pri, $store_order_data['mer_id'], 0);
                                     // 购买商贸区赠送贡献值
-                                    $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送贡献值");
+                                    $this->con_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区商品赠送贡献值");
                                     // 购买商贸区赠送PV值
-                                    $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区赠送PV值");
+                                    $this->con_log_pv($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区赠送PV值");
                                     // 积分
-                                    $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 12, "购买商贸区商品赠送积分");
+                                    $this->score_log($user_data['uid'], $pv, $store_order_data['order_id'], 0, "购买商贸区商品赠送积分");
                                     if (!empty($user_data['is_old'])) {
                                         // 红包
                                         $this->giveHongBao($user_data['uid'], $pv, $store_order_data['order_id'], '购买商贸区商品赠送红包');
@@ -651,9 +651,9 @@ class Notify
                                             //推广佣金
                                             $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                             // 贡献值
-                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广商贸区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广商贸区商品赠送贡献值");
                                             //积分
-                                            $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 11, "推广商贸区商品赠送积分");
+                                            $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广商贸区商品赠送积分");
                                         } else if ($spread_data['user_group'] > 1) {
 
                                             $ssf = bcmul($pv, $rate, 2);
@@ -662,9 +662,9 @@ class Notify
                                             $this->fugou_user_log($spread_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
 
                                             //贡献值
-                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 11, "推广商贸区商品赠送贡献值");
+                                            $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广商贸区商品赠送贡献值");
                                             //积分
-                                            $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 11, "推广商贸区商品赠送积分");
+                                            $this->score_log($spread_data['uid'], $ssf, $store_order_data['order_id'], 0, "推广商贸区商品赠送积分");
                                             // //推广佣金
                                             $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                             //养老金
@@ -724,7 +724,7 @@ class Notify
                                                 "number" => $jd,
                                                 "addtime" => time(),
                                                 "status" => -1,
-                                                "order_type" => 2,
+                                                "order_type" => 0,
                                                 "order_id" => $store_order_data['order_id'],
                                                 "mark" => "线上用户消费商家获得京豆",
                                                 "desc" => '',
@@ -783,7 +783,8 @@ class Notify
                                             "mark" => "购买" . $wenan . "商品消费积分",
                                             "surplus" => $vrpri,
                                             "pm" => 2,
-                                            "source_type" => 5
+                                            "source_type" => 5,
+                                            "order_type" => 0,
                                         ];
                                         Db::name("user_sign_score")->insert($log_data);
                                     }else{
@@ -1482,7 +1483,7 @@ class Notify
             "number" => $hongbao,
             "addtime" => time(),
             "status" => $status,
-            "order_type" => 1,
+            "order_type" => 0,
             "order_id" => $order_id,
             "mark" => $mark,
             "desc" => '',
@@ -1691,7 +1692,7 @@ class Notify
                             "pension" => $num,//养老金额度
                             "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
                             "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
-                            "order_type" => 2,//订单类型(2:)
+                            "order_type" => 0,//订单类型(2:)
                             "pay_time" => date('Y-m-d H:i:s'),
                             "create_time" => date('Y-m-d H:i:s'),
                             "update_time" => date('Y-m-d H:i:s'),
@@ -1767,7 +1768,7 @@ class Notify
             'desc'=>"抽取佣金的10%作为复购金",//描述
             'order_id'=>$order_id,//订单id
             'surplus'=>0,//剩余
-            'order_type'=>11,//关联订单ID
+            'order_type'=>0,//关联订单ID
             'type'=>$type_inc_des,//复购金类型 :1赠送，2消耗
             'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
             'addtime'=>time(),