diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerUtils.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerUtils.java
index bc463ee054..21250e6492 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerUtils.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerUtils.java
@@ -99,7 +99,7 @@ public class TaxiPassengerUtils {
      * @return
      */
     public static String formatLong(double d) {
-        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.UP);
+        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.HALF_UP);
         double num = bg.doubleValue();
         if (Math.round(num) - num == 0) {
             return String.valueOf((long) num);
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
index 9049284df8..668a2ab344 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
@@ -56,6 +56,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     private double mOrderStartStationLat = 0;
     private double mOrderStartStationLng = 0;
     private volatile  int mTtsLessThan200Tip = 0;//离终点200米提示播报
+    private OrderQueryRespBean.Result mCurrentOrder = null;
 
     public static OCHTaxiBeingServerdOrdersFragment newInstance(Activity activity, OCHTaxiFragment taxiFragment) {
         mActivity = activity;
@@ -153,6 +154,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     public void updateCurrentOrderStatusChanged(OrderQueryRespBean.Result order) {
         if (order == null) return;
         if (order.orderStatus == OrderStatusEnum.JourneyCompleted.getCode()) {
+            mCurrentOrder = null;
             isHaveBeingOrder(false);
             return;
         }
@@ -186,14 +188,9 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
             GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
             background.setColor(Color.parseColor("#4D1D5EF3"));
             mOrderServerStatus.setClickable(false);
-//            String strHtml3 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
-//                    + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "<big></font></b>";
+
             mTitleTV2.setText("送乘客至");
-//            mStationTv2.setText(order.endSiteAddr);
             mStationTv2.setText(order.endSiteAddr);
-//            String strHtml4 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 公里，</font>"
-//                    + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
-//            mDistanceAndTime.setText(Html.fromHtml(strHtml4));
         } else if (OrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) {
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点");
             mContentModule2.setVisibility(View.GONE);
@@ -267,9 +264,6 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         + "<font color=\"#CAD6FF\"> 用车</font>";
             }
             mOrderOtherContent3.setText(Html.fromHtml(strHtml1));
-//            String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 公里，</font>"
-//                    + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
-//            mDistanceAndTime.setText(Html.fromHtml(strHtml2));
             mOrderStartStationLat = order.startSiteGcjPoint.get(1);
             mOrderStartStationLng = order.startSiteGcjPoint.get(0);
         }
@@ -374,9 +368,11 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
     public void onOrderStatusChanged(OrderQueryRespBean.Result order) {
         int status = order.orderStatus;
         CallerLogger.INSTANCE.d(M_TAXI + TAG, "status==" + status);
+        mCurrentOrder = order;
         mActivity.runOnUiThread(() -> {
             if (status == OrderStatusEnum.None.getCode() || status == OrderStatusEnum.Cancel.getCode() || status == OrderStatusEnum.JourneyCompleted.getCode()) {
                 isHaveBeingOrder(false);
+                mCurrentOrder = null;
             } else {
                 isHaveBeingOrder(true);
             }
@@ -393,6 +389,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case Cancel:
+                        mCurrentOrder = null;
                         mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.VISIBLE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_cancel));
@@ -416,6 +413,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case ArriveAtEndStation:
+                        mCurrentOrder = null;
                         mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.GONE);
                         showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip));
@@ -424,6 +422,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                         setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint);
                         break;
                     case JourneyCompleted:
+                        mCurrentOrder = null;
                         mTtsLessThan200Tip = 0;
                         mOrderCancel.setVisibility(View.GONE);
                         showNotice("感谢您使用蘑菇智行,再见~");
@@ -486,6 +485,11 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
 
 
     public void onCurrentOrderCancelDone() {
+        //去除起终点
+        if (mCurrentOrder != null){
+            setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,mCurrentOrder.startSitePoint);
+            setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,mCurrentOrder.endSitePoint);
+        }
         //提交取消订单后的回调
         TipToast.tip("订单取消成功");
         //更新界面
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java
index fcf2146edd..fc8747b6cd 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/OchTaxiUtils.java
@@ -99,7 +99,7 @@ public class OchTaxiUtils {
      * @return
      */
     public static String formatLong(double d) {
-        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.UP);
+        BigDecimal bg = new BigDecimal(d).setScale(2, RoundingMode.HALF_UP);
         double num = bg.doubleValue();
         if (Math.ceil(num) - num == 0) {
             return String.valueOf((long) num);