init

www/protected/controllers/ROrderController.php

@@ -248,25 +248,21 @@ class ROrderController extends AdminController{
 
             $fin_price = round($fin_price,2)*100;
             $orderId = rtrim(trim($orderId),',');
-            if ($status == -2){
-                if ($remark == '1'){
+            if ($status == -2) {
+                if ($remark == '1') {//退单 全额
                     //已出发 已上门 订单
-                    $res = self::feedbackOrder(1,$order->OrderNo,$orderId,$fin_price);
-                } else {
-                    $res = self::feedbackOrder(1,$order->OrderNo,$orderId,0);
+                    $res = self::feedbackOrder(1, $order->OrderNo, $orderId, $fin_price);
+                } else {//退单   不退钱
+                    $res = self::feedbackOrder(1, $order->OrderNo, $orderId, 0);
                 }
-
                 $flag = 1;
-            } else if($status == 2 &&$order->booking_time != $booking_time){
-                //2  确认申请退款状态变更成已处理 为修改订单  此时修改订单预约时间
+            } else if($status == 2 ){//不退单
                 $res = self::feedbackOrder(0,$order->OrderNo,$orderId,0);
-                if($res){
-                    $res = self::feedbackOrderRemaker(0,$order->OrderNo,$orderId,0,$order->booking_time);
-                    $flag = 1;
-                }
+                $flag = 1;
+            }
 
-            } else if($status == 2 &&$order->booking_time == $booking_time){//不退单 没有修改
-                $res = self::feedbackOrder(0,$order->OrderNo,$orderId,0);
+            if( $order->booking_time != $booking_time){
+                $res = self::feedbackOrderRemaker(0,$order->OrderNo,$orderId,0,$order->booking_time);
                 $flag = 1;
             }