diff --git a/admin/controllers/app/liche/Main.php b/admin/controllers/app/liche/Main.php index 0b67fa64..e6523c84 100644 --- a/admin/controllers/app/liche/Main.php +++ b/admin/controllers/app/liche/Main.php @@ -237,7 +237,7 @@ class Main extends HD_Controller $order = $this->receiver_orders_model->get(['id'=>$val['item_id']]); if($order && $order['brand_id']!=3){ if(!$p_row){ - $p_sid = create_order_no(350200,'liche',1,0); + $p_sid = create_order_no(350200,'liche'); $p_data = [ 'o_id' => $val['item_id'], 'uid' => $val['app_uid'], @@ -260,7 +260,7 @@ class Main extends HD_Controller $su_p_row = $this->app_liche_orders_model->get(['pid'=>$p_id,'type'=>$order_type]); if(!$su_p_row){ $money = $this->order_purchase_model->sum('total_price',['type'=>6,'app_uid'=>$val['app_uid'],'item_id'=>$val['item_id']]); - $sub_p_sid = create_order_no(350200,'liche',1,$order_type); + $sub_p_sid = create_order_no(350200,'liche'); $p_data = [ 'o_id' => $val['item_id'], 'uid' => $val['app_uid'], diff --git a/admin/controllers/app/liche/Order.php b/admin/controllers/app/liche/Order.php index 17c2ac54..e6787e65 100644 --- a/admin/controllers/app/liche/Order.php +++ b/admin/controllers/app/liche/Order.php @@ -162,7 +162,7 @@ class Order extends HD_Controller return $this->show_json(SYS_CODE_FAIL, '需支付金额必须大于0'); } $this->load->helper('order'); - $sid = create_order_no(350200,'liche',1,$row['type']); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $row['o_id'], 'sid' => $sid, diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index d767dc88..149fc2cb 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -871,7 +871,7 @@ class Orders extends HD_Controller } $p_row = $this->app_liche_orders_model->get(['pid'=>0,'o_id'=>$row['id']]); $this->load->helper('order'); - $sid = create_order_no(350200, 'liche', 1, $type); + $sid = create_order_no(350200, 'liche'); $data = [ 'o_id' => $row['id'], 'sid' => $sid, diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index 7f1eab07..77d8c4bb 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -905,7 +905,7 @@ class Orders extends HD_Controller $p_row = $this->app_liche_orders_model->get(['o_id'=>$row['o_id'],'pid'=>0,'status>='=>0]); $order_row = $this->receiver_orders_v2_model->get(['id' => $row['o_id']]); $this->load->helper('order'); - $sid = create_order_no(350200, 'liche', 1, 7); + $sid = create_order_no(350200, 'liche'); $pay_log = [ 'o_id' => $order_row['id'], 'sid' => $sid, @@ -1020,7 +1020,7 @@ class Orders extends HD_Controller $p_row = $this->app_liche_orders_model->get(['o_id'=>$row['o_id'],'pid'=>0,'status>='=>0]); $order_row = $this->receiver_orders_v2_model->get(['id' => $row['o_id']]); $this->load->helper('order'); - $sid = create_order_no(350200, 'liche', 1, 8); + $sid = create_order_no(350200, 'liche'); $pay_log = [ 'o_id' => $order_row['id'], 'sid' => $sid, @@ -1419,7 +1419,7 @@ class Orders extends HD_Controller $this->app_liche_orders_model->update(['status'=>-1],['o_id'=>$row['id'],'type'=>2,'status'=>0]); //未支付更新成无效订单 } $this->load->helper('order'); - $sid = create_order_no(350200, 'liche', 1, $type); + $sid = create_order_no(350200, 'liche'); $data = [ 'o_id' => $row['id'], 'sid' => $sid, diff --git a/api/controllers/wxapp/liche/Pay.php b/api/controllers/wxapp/liche/Pay.php index b4eaf221..f589b66c 100644 --- a/api/controllers/wxapp/liche/Pay.php +++ b/api/controllers/wxapp/liche/Pay.php @@ -140,7 +140,7 @@ class Pay extends Wxapp{ $total = $price ? $price : $need_pay; $sub_order = $this->app_liche_orders_model->get(['total_price'=>$total,'pid'=>$row['id'],'status'=>0]); //金额相同未支付订单 if(!$sub_order){ - $sid = create_order_no(350200,'liche',1,$row['type']); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $row['o_id'], 'sid' => $sid, diff --git a/common/libraries/receiver/Orders_entity.php b/common/libraries/receiver/Orders_entity.php index 5416b969..9cfa92d9 100644 --- a/common/libraries/receiver/Orders_entity.php +++ b/common/libraries/receiver/Orders_entity.php @@ -118,7 +118,7 @@ class Orders_entity{ $entrust_user = $this->entrust_user($this->order_row['id']); $p_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],'pid'=>0,'status>='=>0]); if(!$p_row){ - $sid = create_order_no(350200,'liche',1,0); + $sid = create_order_no(350200,'liche'); $add_data = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -139,7 +139,7 @@ class Orders_entity{ $res = false; $sub_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],'type'=>1,'status>='=>0]); if($pid && !$sub_row){ - $sid = create_order_no(350200,'liche',1,1); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -192,7 +192,7 @@ class Orders_entity{ $car_json = json_decode($order['car_json'],true); $color = isset($car_json['color']) ? $car_json['color'] : ''; - $sid = create_order_no(350200,'liche',1,2); + $sid = create_order_no(350200,'liche'); $jsondata['car'] = $car_json; if($color['jsondata']['img']){ $jsondata['cover'] = $color['jsondata']['img']; @@ -448,7 +448,7 @@ class Orders_entity{ $entrust_user = $this->entrust_user($oid); if($to_srv_price>0 && !$this->ci->app_liche_orders_model->count(['o_id'=>$this->order_row['id'],'type'=>2,'status>='=>0])){ $order_type = 2; - $sid = create_order_no(350200,'liche',1,$order_type); + $sid = create_order_no(350200,'liche'); $add_data[] = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -470,7 +470,7 @@ class Orders_entity{ $order_type = 3; $book_order = $this->ci->app_liche_orders_model->get(['status>='=>0,'type'=>1,'o_id'=>$this->order_row['id']]); $book_order['mch_id'] && $company['wx_mchid'] = $book_order['mch_id']; - $sid = create_order_no(350200,'liche',1,$order_type); + $sid = create_order_no(350200,'liche'); $add_data[] = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -504,7 +504,7 @@ class Orders_entity{ $p_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],"(uid={$uid} or entrust_uid={$uid})"=>null,'pid'=>0,'status>='=>0]); $entrust_user = $this->entrust_user($oid); if(!$p_row){ - $sid = create_order_no(350200,'liche',1,0); + $sid = create_order_no(350200,'liche'); $add_data = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -529,7 +529,7 @@ class Orders_entity{ $biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'company_id,srv_company_id'); $company = $this->ci->sys_company_model->get(['id'=>$biz['company_id']],'wx_mchid'); $mch_id = $company['wx_mchid']; - $sid = create_order_no(350200,'liche',1,4); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $this->order_row['id'], 'uid' => $uid, @@ -688,7 +688,7 @@ class Orders_entity{ 'o_id' => $this->order_row['id'], 'uid' => $p_row['uid'], 'entrust_uid' => $p_row['entrust_uid'], - 'sid' => create_order_no(350200,'liche',1,$order_type), + 'sid' => create_order_no(350200,'liche'), 'mch_id' => $srv_company ? $srv_company['wx_mchid'] : self::SRV_MCH_ID, 'pid' => $p_row['id'], 'brand_id' => $this->order_row['brand_id'], @@ -723,7 +723,7 @@ class Orders_entity{ 'o_id' => $this->order_row['id'], 'uid' => $p_row['uid'], 'entrust_uid' => $p_row['entrust_uid'], - 'sid' => create_order_no(350200,'liche',1,$order_type), + 'sid' => create_order_no(350200,'liche'), 'mch_id' => $company['wx_mchid'], 'pid' => $p_row['id'], 'brand_id' => $this->order_row['brand_id'], diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php index 6a47deda..7288e644 100644 --- a/common/libraries/receiver/Orders_v2_entity.php +++ b/common/libraries/receiver/Orders_v2_entity.php @@ -50,7 +50,7 @@ class Orders_v2_entity{ $p_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],'pid'=>0,'status>='=>0]); $entrust_user = $this->entrust_user($oid); if(!$p_row){ - $sid = create_order_no(350200,'liche',1,0); + $sid = create_order_no(350200,'liche'); $add_data = [ 'o_id' => $this->order_row['id'], 'entrust_uid' => $entrust_user['id'] ? $entrust_user['id'] : 0, @@ -73,7 +73,7 @@ class Orders_v2_entity{ if($pid && !$sub_row){ //获取微信商户号 $companys = $this->get_biz_mchid($this->order_row['biz_id'],$this->order_row['brand_id'],$this->order_row['if_local_bill']); - $sid = create_order_no(350200,'liche',1,4); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $this->order_row['id'], 'entrust_uid' => $entrust_user['id'] ? $entrust_user['id'] : 0, @@ -259,7 +259,7 @@ class Orders_v2_entity{ $entrust_user = $this->entrust_user($this->order_row['id']); $p_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],'pid'=>0,'status>='=>0]); if(!$p_row){ - $sid = create_order_no(350200,'liche',1,0); + $sid = create_order_no(350200,'liche'); $add_data = [ 'o_id' => $this->order_row['id'], 'sid' => $sid, @@ -286,7 +286,7 @@ class Orders_v2_entity{ $filed = 'id,wx_mchid,title,short,credit_code,wx_mchid,img_seal'; $companys['company'] = $this->ci->sys_company_model->get(['id'=>12],$filed); } - $sid = create_order_no(350200,'liche',1,1); + $sid = create_order_no(350200,'liche'); $sub_data = [ 'o_id' => $this->order_row['id'], 'sid' => $sid, @@ -378,7 +378,7 @@ class Orders_v2_entity{ $entrust_user = $this->entrust_user($oid); if($to_srv_price>0 && !$this->ci->app_liche_orders_model->count(['o_id'=>$this->order_row['id'],'type'=>2,'status>='=>0])){ $order_type = 2; - $sid = create_order_no(350200,'liche',1,$order_type); + $sid = create_order_no(350200,'liche'); $add_data[] = [ 'o_id' => $this->order_row['id'], 'uid' => $uid ? $uid : 0, @@ -402,7 +402,7 @@ class Orders_v2_entity{ $book_order['mch_id'] && $companys['company']['wx_mchid'] = $book_order['mch_id']; $book_order['company_id'] && $companys['company']['id'] = $book_order['company_id']; $order_type = 3; - $sid = create_order_no(350200,'liche',1,$order_type); + $sid = create_order_no(350200,'liche'); $add_data[] = [ 'o_id' => $this->order_row['id'], 'uid' => $uid ? $uid : 0,