diff --git a/api/controllers/wxapp/liche/User.php b/api/controllers/wxapp/liche/User.php index 0fdd2796..6a1335c7 100644 --- a/api/controllers/wxapp/liche/User.php +++ b/api/controllers/wxapp/liche/User.php @@ -22,6 +22,8 @@ class User extends Wxapp{ $this->load->model('auto/auto_brand_model'); $this->load->model('auto/auto_attr_model'); + $this->load->model('receiver/order/receiver_orders_model','orders_model'); + $this->load->model('app/liche/app_liche_orders_model'); } /** @@ -153,6 +155,12 @@ class User extends Wxapp{ if($count > 0){ throw new Exception("{$mobile}已被绑", API_CODE_FAIL); } + //更近意向金订单 + $order_rows = $this->orders_model->select(['mobile'=>$mobile],'','','id'); + $order_ids = implode(',',array_column($order_rows,'id')); + if($order_ids){ + $this->app_liche_orders_model->update(['uid'=>$this->session['uid']],["o_id in ($order_ids)"=>null,'uid'=>0]); + } } } else {//编辑其他信息 diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php index c83d6e19..fdfad81d 100644 --- a/api/controllers/wxapp/licheb/Cusorder.php +++ b/api/controllers/wxapp/licheb/Cusorder.php @@ -215,14 +215,6 @@ class Cusorder extends Wxapp{ if($inten_money){ $this->load->model('app/liche/app_liche_users_model'); $userinfo = $this->app_liche_users_model->get(['mobile'=>$mobile]); - if(!$userinfo){ - $add_user = [ - 'mobile' => $data['mobile'], - 'c_time' => time(), - ]; - $this->app_liche_users_model->add($add_user); - $userinfo = $this->app_liche_users_model->get(['mobile'=>$data['mobile']]); - } $this->orders_entity->c_intention($o_id,$userinfo,$inten_money); } diff --git a/api/controllers/wxapp/licheb/Cusorder2.php b/api/controllers/wxapp/licheb/Cusorder2.php index 84037249..2bb507b7 100644 --- a/api/controllers/wxapp/licheb/Cusorder2.php +++ b/api/controllers/wxapp/licheb/Cusorder2.php @@ -114,14 +114,6 @@ class Cusorder2 extends Wxapp{ //意向金订单 if($inten_money){ $userinfo = $this->app_liche_users_model->get(['mobile'=>$data['mobile']]); - if(!$userinfo){ - $add_user = [ - 'mobile' => $data['mobile'], - 'c_time' => time(), - ]; - $this->app_liche_users_model->add($add_user); - $userinfo = $this->app_liche_users_model->get(['mobile'=>$data['mobile']]); - } $this->orders_entity->c_intention($o_id,$userinfo,$inten_money); } return ['id'=>$o_id]; diff --git a/common/libraries/receiver/Orders_entity.php b/common/libraries/receiver/Orders_entity.php index f6181372..217f2df3 100644 --- a/common/libraries/receiver/Orders_entity.php +++ b/common/libraries/receiver/Orders_entity.php @@ -445,9 +445,10 @@ class Orders_entity{ //创建意向金订单 public function c_intention($oid,$userinfo,$money){ $this->order_row = $this->ci->orders_model->get(['id'=>$oid]); - if(!$this->order_row || !$userinfo){ + if(!$this->order_row){ return false; } + !$userinfo && $userinfo['id'] = 0; $p_row = $this->ci->app_liche_orders_model->get(['o_id'=>$this->order_row['id'],'uid'=>$userinfo['id'],'pid'=>0,'status>='=>0]); if(!$p_row){ $sid = create_order_no(350200,'liche',1,0);