Просмотр исходного кода

Wesmiler 人人车 初始化项目 0816

APPLE 3 лет назад
Родитель
Сommit
298fa5fce1

+ 3 - 0
application/api/controller/v1/Taxi.php

@@ -170,11 +170,14 @@ class Taxi extends ApiController
         $count = model('common/TaxiOrder')->where('status','>=','2')->where(['is_free' => '1','user_id' =>  $user['id']])->count('id');
 
         // 创建订单
+        $driver = sys_config('', 'driver');
+        $divide = isset($driver['platform_divide'])? $driver['platform_divide'] : 0;
         $params = [
             'user_id'=> $user['id'],
             'category_id'=> isset($datas['category_id'])? $datas['category_id'] : 0,
             'order_no'=> get_order_no(),
             'price'=> isset($datas['price'])? $datas['price'] : 0.00,
+            'settle_price' => $divide>0 && $divide<=100? round($datas['price']*(100-$divide)/100, 2) : $datas['price'],
             'count'=> isset($datas['count'])? $datas['count'] : 0,
             'mobile'=> isset($datas['mobile'])? $datas['mobile'] : '',
             'depart'=> isset($datas['depart'])? $datas['depart'] : '',

+ 3 - 3
application/api/controller/v1/taxiUser/Order.php

@@ -194,8 +194,8 @@ class Order extends ApiController
             return IResponse::failure('您的车辆当前不可再接单,请先完成订单或联系客服');
         }
 
-        $driver = sys_config('', 'driver');
-        $divide = isset($driver['platform_divide'])? $driver['platform_divide'] : 0;
+        //$driver = sys_config('', 'driver');
+        //$divide = isset($driver['platform_divide'])? $driver['platform_divide'] : 0;
 
         // 写入数据
         Db::startTrans();
@@ -203,7 +203,7 @@ class Order extends ApiController
         $info['served'] = 1;
         $info['taxi_id'] = $taxi['id'];
         $info['taxi_uid'] = $taxiUser['id'];
-        $info['settle_price'] = $divide>0 && $divide<=100? round($info['price']*(100-$divide)/100, 2) : $info['price'];
+        //$info['settle_price'] = $divide>0 && $divide<=100? round($info['price']*(100-$divide)/100, 2) : $info['price'];
         if (!$info->save()) {
             Db::rollback();
             return IResponse::failure('接单失败');