s

www/protected/controllers/ROrderController.php

@@ -243,7 +243,7 @@ class ROrderController extends AdminController{
                 $res = self::feedbackOrder(0,$order->OrderNo,(string)$order->_id,'',$order->booking_time);
                 $flag = 1;
             } else if($status == 2 &&$order->booking_time == $booking_time){//不退单 没有修改
-                $res = self::feedbackOrder(1,$order->OrderNo,(string)$order->_id,$order->final_price);
+                $res = self::feedbackOrder(0,$order->OrderNo,(string)$order->_id,$order->final_price);
                 $flag = 1;
             }
 
@@ -956,7 +956,11 @@ class ROrderController extends AdminController{
             $data['Type'] = 'OrderRemark';
             $data['Remark'] = '修改预约时间'.date('Y-m-d H:i:s',$remark);
             $data['Sign'] = md5($orderId.$orderNo.$data['Remark'].$key);
-        } else {
+        }else if(!$isCancel && empty($remark)){//不退单 没有修改信息
+            $data['Type'] = 'OrderRemark';
+            $data['Sign'] = md5($isCancel.$orderId.$orderNo.$money.$key);
+        }
+        else {
             $data['Type'] = 'CancleOrder';
             $data['Sign'] = md5($isCancel.$orderId.$orderNo.$money.$key);
         }