规范order_type

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1312,6 +1312,7 @@ class OrderMerchantRepository extends BaseRepository
         }
         $order_sn = $order['order_sn'] ?? '';
         $order_id = $order['order_id'] ?? '';
+        $order_type = 10;
         //可分总佣金
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金，70%做业绩PV
@@ -1357,7 +1358,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $hongbao,
                 "addtime"       =>time(),
                 "status"        =>1,
-                "order_type"    =>1,
+                "order_type"    =>$order_type,
                 "order_id"      =>$order_id,
                 "mark"          =>"扫码消费获得赠送红包",
                 "desc"          =>'',
@@ -1385,7 +1386,7 @@ class OrderMerchantRepository extends BaseRepository
             $ins_data['settlement_time'] = 0;// 结算时间 真正到了结算时间会结算
             $ins_data['order_id'] = $order_id;
             $ins_data['pm'] = 1;
-            $ins_data['order_type'] = $order_id;
+            $ins_data['order_type'] = $order_type;
             $ins_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($ins_data);
             $user_score = Db::name('user')->where('uid', $order["uid"])->value('score');
@@ -1397,7 +1398,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $pv,
                 "addtime"       =>time(),
                 "status"        =>1,
-                "order_type"    =>1,
+                "order_type"    =>$order_type,
                 "order_id"      =>$order_id,
                 "mark"          =>"扫码消费获得赠送贡献值",
                 "desc"          =>'',
@@ -1412,7 +1413,7 @@ class OrderMerchantRepository extends BaseRepository
             /** @var StoreOrderRepository $StoreOrderRepository */
             $StoreOrderRepository = app()->make(StoreOrderRepository::class);
             // 用户获得pv值
-            $StoreOrderRepository->con_log_pv($order["uid"],$pv,$order_id,1,'扫码消费获得赠送PV值',1);
+            $StoreOrderRepository->con_log_pv($order["uid"],$pv,$order_id, $order_type,'扫码消费获得赠送PV值',1);
         } else {
             Db::name('log')->insert(['data' => '订单号：' . $order['order_sn'] . '付款额度较低或 商家、平台设置的返佣比例较低，积分和贡献值低于0.01无法入库 特此记录！']);
         }
@@ -1450,7 +1451,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $pv,
                 "addtime"       =>time(),
                 "status"        =>1,
-                "order_type"    =>1,
+                "order_type"    =>$order_type,
                 "order_id"      =>$order_id,
                 "mark"          =>"推广扫码消费获得赠送贡献值",
                 "desc"          =>'',
@@ -1475,7 +1476,7 @@ class OrderMerchantRepository extends BaseRepository
             $spread_data['source_type'] = 3;
             $spread_data['order_id'] = $order_id;
             $spread_data['pm'] = 1;
-            $spread_data['order_type'] = $order_id;
+            $spread_data['order_type'] = $order_type;
             $spread_data['settlement_time'] = date('Y-m-d H:i:s');
             Db::name('user_sign_score')->insertGetId($spread_data);
             Db::name('user')->where('uid', $top_data["spread_uid"])->inc('score',$jifen)->update();
@@ -1490,7 +1491,7 @@ class OrderMerchantRepository extends BaseRepository
                 'mark'=>"推荐人扫码消费赠送" . $tuijian_fugou . '复购金',//备注
                 'order_id'=>$order_id,//订单id
                 'surplus'=>0,//剩余
-                'order_type'=>0,//关联订单ID
+                'order_type'=>$order_type,//关联订单ID
                 'type'=>1,//复购金类型 :1赠送，2消耗
                 'settlement_time'=>date('Y-m-d H:i:s'),//添加时间,
                 'addtime'=>time(),
@@ -1645,6 +1646,7 @@ class OrderMerchantRepository extends BaseRepository
         $mer_jd = $getMerchantContribution['jd'];
         //跨店分佣
         $kd = 0.05;
+        $order_type = 10;
         /**
          * 各自的比例结束
          */
@@ -1659,7 +1661,7 @@ class OrderMerchantRepository extends BaseRepository
                     "number"  =>    $pv,
                     "addtime"       =>time(),
                     "status"        =>1,
-                    "order_type"    =>1,
+                    "order_type"    =>$order_type,
                     "order_id"      =>$order_id,
                     "mark"          =>"扫码消费获得赠送贡献值",
                     "desc"          =>'',
@@ -1716,7 +1718,7 @@ class OrderMerchantRepository extends BaseRepository
                 "number"  =>    $jd,
                 "addtime"       =>time(),
                 "status"        =>1,
-                "order_type"    =>2,
+                "order_type"    =>$order_type,
                 "order_id"      =>$order_id,
                 "mark"          =>"用户消费商家获得赠送京豆",
                 "desc"          =>'',
@@ -1768,7 +1770,7 @@ class OrderMerchantRepository extends BaseRepository
      * @param $commission_type
      * @param $order_sn
      */
-    public function add_bill($title, $number, $uid, $mark, $commission_type, $order_sn, $order_id = 0, $mer_id = 0, $source = 0, $status = 1, $type_shop = 0)
+    public function add_bill($title, $number, $uid, $mark, $commission_type, $order_sn, $order_id = 0, $mer_id = 0, $source = 0, $status = 1, $type_shop = 10)
     {
 //        $old_number=Db::name("user")->where("uid",$uid)->value("brokerage_price");
         if ($uid == 0 || $number == 0) {