diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 4090c49a..79ad9821 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -106,6 +106,8 @@ class Orders extends HD_Controller $deposit = $row['deposit']; $jsondata = $row['jsondata'] ? json_decode($row['jsondata'], true) : array(); $row['price_discount'] = $money_json['price_discount']; + $sale_price = $money_json['price_discount'] ? $row['price']-$money_json['price_discount'] : $row['price']; + $row['sale_price'] = number_format($sale_price,2); $row['info_json'] = json_decode($row['info_json'], true); $row['status'] = intval($row['status']); $row['price'] = number_format($row['price'], 2); diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php index 146c4a38..47dcf989 100644 --- a/admin/views/receiver/orders/oinfo.php +++ b/admin/views/receiver/orders/oinfo.php @@ -24,8 +24,10 @@
diff --git a/api/controllers/wxapp/licheb/Cusorder.php b/api/controllers/wxapp/licheb/Cusorder.php index 45fdb4b8..c5511b90 100644 --- a/api/controllers/wxapp/licheb/Cusorder.php +++ b/api/controllers/wxapp/licheb/Cusorder.php @@ -183,18 +183,16 @@ class Cusorder extends Wxapp{ $info_json && $data['info_json'] = json_encode($info_json,JSON_UNESCAPED_UNICODE); $finance_row && $data['finance_id'] = $finance_row['id']; //获取金额json数据 + $orders_entity = new Orders_entity(); $money_json = [ 'price_car' => $car_row['price_car'], 'price_book' => $car_row['price_book'], 'price_insure' => $car_row['price_insure'], 'price_fine' => $car_row['price_fine'], 'price_discount' =>$disc_money ? $disc_money : 0, - 'price_intention' => $inten_money ? $inten_money : 0 + 'price_intention' => $inten_money ? $inten_money : 0, + 'price_finance' => $series_row['brand_id'] == 4 ? $orders_entity::PRICE_FINANCE_NZ : $orders_entity::PRICE_FINANCE ]; - if(!$payway){ - $orders_entity = new Orders_entity(); - $money_json['price_insure'] = $series_row['brand_id'] == 4 ? $orders_entity::PRICE_FINANCE_NZ : $orders_entity::PRICE_FINANCE; - } //获取挂牌价 if($series_row['brand_id']==3){ //狸车品牌写死挂牌费用0.01 测试用 $money_json['fee_carno'] = 0.01; diff --git a/api/controllers/wxapp/licheb/Cusorder2.php b/api/controllers/wxapp/licheb/Cusorder2.php index 0cc3fcf6..6288827e 100644 --- a/api/controllers/wxapp/licheb/Cusorder2.php +++ b/api/controllers/wxapp/licheb/Cusorder2.php @@ -223,9 +223,7 @@ class Cusorder2 extends Wxapp{ $money_json['price_fine'] = $car_row['price_fine']; $money_json['price_discount'] = $disc_money; $orders_entity = new Orders_entity(); - if(!$payway){ - $money_json['price_insure'] = $series_row['brand_id'] == 4 ? $orders_entity::PRICE_FINANCE_NZ : $orders_entity::PRICE_FINANCE; - } + $money_json['price_finance'] = $series_row['brand_id'] == 4 ? $orders_entity::PRICE_FINANCE_NZ : $orders_entity::PRICE_FINANCE; $data['money_json'] = json_encode($money_json,JSON_UNESCAPED_UNICODE); $result = $this->orders_model->update($data,['id'=>$row['id']]);