s

www/protected/controllers/ROrderController.php

@@ -246,10 +246,8 @@ class ROrderController extends AdminController{
                 $res = self::feedbackOrder(0,$order->OrderNo,(string)$order->_id,$order->final_price);
                 $flag = 1;
             }
-
-
-
         }
+
         if(($order->status!=-1||$order->status!=-2)&&($status==-1||$status==-2)){
             foreach ($order->coupons as $user_coupon) {
                 $user_coupon = UserCoupon::get($user_coupon);
@@ -957,16 +955,14 @@ class ROrderController extends AdminController{
             $data['Remark'] = '修改预约时间'.date('Y-m-d H:i:s',$remark);
             $data['Sign'] = md5($orderId.$orderNo.$data['Remark'].$key);
         }else if(!$isCancel && empty($remark)){//不退单 没有修改信息
-            $data['Type'] = 'OrderRemark';
+            $data['Type'] = 'CancleOrder';
             $data['Sign'] = md5($isCancel.$orderId.$orderNo.$money.$key);
         }
         else {
             $data['Type'] = 'CancleOrder';
             $data['Sign'] = md5($isCancel.$orderId.$orderNo.$money.$key);
         }
-
-
-
+        
         $dat = '';
         foreach ($data as $key => $value) {
             $dat .= $key.'='.urlencode($value).'&';
@@ -986,7 +982,7 @@ class ROrderController extends AdminController{
         if ($res['ReturnCode'] == '00'){
             return true;
         } else {
-            return $res['ReturnCode'];
+            return false;
         }
     }