diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php index 6445af53..2c5401b5 100644 --- a/common/libraries/receiver/Orders_v2_entity.php +++ b/common/libraries/receiver/Orders_v2_entity.php @@ -247,10 +247,11 @@ class Orders_v2_entity{ return false; } $pay_money = $this->ci->app_liche_orders_model->get(['o_id'=>$oid,'type'=>4,'status>='=>0]); //意向金订单 + $ht_money = $this->ci->app_liche_orders_model->sum('pay_price',['o_id'=>$oid,'type'=>6,'status>='=>0]); //后台添加车款 $money_json = json_decode($this->order_row['money_json'],true); $deposit_count = $this->ci->app_liche_orders_model->count(['o_id'=>$oid,'type'=>1,'status'=>1]); //定金已支付 - $need_pay_money = $money_json['price_book'] - $pay_money['total_price']; + $need_pay_money = $money_json['price_book'] - $pay_money['total_price'] - $ht_money['pay_price']; $res = false; if($need_pay_money > 0 && !$deposit_count){ $entrust_user = $this->entrust_user($this->order_row['id']); @@ -326,10 +327,16 @@ class Orders_v2_entity{ return false; } $to_srv_price = $srv_money; - if($this->order_row['payway']){ //全款 - $to_com_price = $total_price - $money_json['price_book']; - }else{ //分期 - $to_com_price = $total_price-$money_json['price_loan'] - $money_json['price_book']; + //后台添加车款 + $pay_row = $this->ci->app_liche_orders_model->sum('pay_price',['status'=>1,'type'=>6,'o_id'=>$oid]); + if($pay_row['pay_price']>=0 && $pay_row['pay_price']>=$money_json['price_book']){ + $to_com_price = $total_price - $pay_row['pay_price']; + }else{ + if($this->order_row['payway']){ //全款 + $to_com_price = $total_price - $money_json['price_book']; + }else{ //分期 + $to_com_price = $total_price-$money_json['price_loan'] - $money_json['price_book']; + } } $to_com_price = $to_com_price>0 ? $to_com_price : 0; $last_order = $this->ci->app_liche_orders_model->get(['status>='=>0,'type'=>3,'o_id'=>$oid]); @@ -469,17 +476,20 @@ class Orders_v2_entity{ $this->ci->app_liche_orders_model->delete(['o_id'=>$row['id'],'status'=>0,'pid!='=>0]); $userinfo = $this->ci->app_liche_users_model->get(['mobile'=>$row['mobile']],'id'); if(!$this->ci->app_liche_orders_model->count(['o_id'=>$row['id'],'type'=>1,'status'=>1])){ //不存在定金订单 - $int_order = $this->ci->app_liche_orders_model->get(['o_id'=>$row['id'],'type'=>4,'status'=>1]); //意向金订单 + $pay_row= $this->ci->app_liche_orders_model->sum('pay_price',['o_id'=>$row['id'],'type'=>1,'status'=>1]);//后台添加车款 $money_json = json_decode($new_data['money_json'],true); - if($int_order['pay_price']==$money_json['price_book']){ //意向金订单转支付订单、推送并且生成pfd - $this->ci->app_liche_orders_model->update(['type'=>1],['id'=>$int_order['id']]); - $this->ci->receiver_orders_v2_model->update(['order_time'=>date('Y-m-d H:i:s')],['id'=>$row['id']]); - //生成pdf - $this->create_pdf($row['id']); - $this->ci->load->library('qyrobot'); - $this->ci->qyrobot->deposit_notify_v3($row['id']); - }else{ - $this->add_book_order($row['id'],$userinfo['id']); + if($pay_row['pay_price']<$money_json['price_book']){ + $int_order = $this->ci->app_liche_orders_model->get(['o_id'=>$row['id'],'type'=>4,'status'=>1]); //意向金订单 + if($int_order['pay_price']==$money_json['price_book']){ //意向金订单转支付订单、推送并且生成pfd + $this->ci->app_liche_orders_model->update(['type'=>1],['id'=>$int_order['id']]); + $this->ci->receiver_orders_v2_model->update(['order_time'=>date('Y-m-d H:i:s')],['id'=>$row['id']]); + //生成pdf + $this->create_pdf($row['id']); + $this->ci->load->library('qyrobot'); + $this->ci->qyrobot->deposit_notify_v3($row['id']); + }else{ + $this->add_book_order($row['id'],$userinfo['id']); + } } } $this->add_order($row['id'],$userinfo['id']);