订单详情页优化地址修改联调

@@ -843,7 +843,7 @@ class HomeController extends AbstractAction
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
         //调用取消订单接口,返回订单取消状态
         //调用取消订单接口,返回订单取消状态
-        $data = OrderData::cancelOrderData($orderCode, $uid, $gender, $channel, $resons, $resonsid);
+        $data = OrderData::cancelOrderData($orderCode, $uid, $gender, $channel, '支付不成功', 1);
         //将取消状态返回至浏览器
         //将取消状态返回至浏览器
         if (!$data) {
         if (!$data) {
             $this->echoJson(array('message' => '取消订单失败'));
             $this->echoJson(array('message' => '取消订单失败'));
@@ -1114,8 +1114,8 @@ class HomeController extends AbstractAction
                 break;
                 break;
             }
             }
             //获取相关参数
             //获取相关参数
-            $order_code = $this->get('order_code', ''); //订单号
-            $address_id = $this->get('address_id', ''); //地址id
+            $order_code = $this->get('orderCode', ''); //订单号
+            $address_id = $this->get('addressId', ''); //地址id
             if (!$order_code || !$order_code) {
             if (!$order_code || !$order_code) {
                 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => '');
                 $result = array('code' => 400, 'message' => '缺失必填项', 'data' => '');
                 break;
                 break;

@@ -194,7 +194,6 @@ class OrderModel
     public static function orderDetail($orderCode, $uid, $sessionKey)
     public static function orderDetail($orderCode, $uid, $sessionKey)
     {
     {
         $result = array();
         $result = array();
-
         if (is_numeric($orderCode) && is_numeric($uid) && is_string($sessionKey)) {
         if (is_numeric($orderCode) && is_numeric($uid) && is_string($sessionKey)) {
             $orderDetail = OrderData::viewOrderData($orderCode, $uid, $sessionKey);
             $orderDetail = OrderData::viewOrderData($orderCode, $uid, $sessionKey);
             if (isset($orderDetail['data']['order_code'])) {
             if (isset($orderDetail['data']['order_code'])) {
@@ -210,13 +209,17 @@ class OrderModel
                 if (isset($orderDetail['data']['promo_code_amount'])) {
                 if (isset($orderDetail['data']['promo_code_amount'])) {
                     $result['promo_code_amount'] = self::filterOrderPrice($orderDetail['data']['promo_code_amount']); // 优惠码
                     $result['promo_code_amount'] = self::filterOrderPrice($orderDetail['data']['promo_code_amount']); // 优惠码
                 }
                 }
-
                 $result['yohoCoin'] = $orderDetail['data']['yoho_give_coin']; // YOHO币返回
                 $result['yohoCoin'] = $orderDetail['data']['yoho_give_coin']; // YOHO币返回
-
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号
                 $result['orderCount'] = $count; // 订单总件数
                 $result['orderCount'] = $count; // 订单总件数
                 $result['isPay'] = $orderDetail['data']['payment_status'] === 'Y';
                 $result['isPay'] = $orderDetail['data']['payment_status'] === 'Y';
+                //判断是否可以修改地址
+                $result['changeable'] = $orderDetail['data']['can_update_delivery_address'] == 'Y' ? 'true' : 'false';
+                //判断是否有关联订单
+                $result['relation'] = $orderDetail['data']['relate_order_code'] == 'Y' ? 'true' : 'false';
+                //修改地址跳转链接
+                $result['url'] = Helpers::url('/home/addressModify', array('orderCode' => $orderCode, 'relation' => $result['relation']));
             }
             }
             //相关金额（商品总金额，活动金额，运费，优惠券，YOHO币）
             //相关金额（商品总金额，活动金额，运费，优惠券，YOHO币）
             if (isset($orderDetail['data']['promotion_formulas']) && $orderDetail['data']['promotion_formulas']) {
             if (isset($orderDetail['data']['promotion_formulas']) && $orderDetail['data']['promotion_formulas']) {
@@ -229,21 +232,10 @@ class OrderModel
                 $result['isJit'] = true;
                 $result['isJit'] = true;
                 $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('orderCode' => $orderCode, 'sessionKey' => $sessionKey));
                 $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('orderCode' => $orderCode, 'sessionKey' => $sessionKey));
             }
             }
-            //判断是否可以修改地址
-            if (isset($orderDetail['data']['can_update_delivery_address']) && $orderDetail['data']['can_update_delivery_address'] == 'Y') {
-                $result['changeable'] = 'true';
-            }
-            //判断是否有关联订单
-//             $result['relation'] =$orderDetail['data']['relate_order_code'] == 'Y' ? 'true' : 'false';
-            $result['relation'] = 'true';
-            //测试
-             $result['changeable'] = 'true';
         }
         }
-        //修改地址跳转链接
-        $result['url'] =  Helpers::url('/home/addressModify', array('orderCode' => $orderCode, 'relation' =>  $result['relation'] ));
-
         //取消订单原因列表
         //取消订单原因列表
-        $result['cancelReason'] = OrderData::closeReasons();
+        $resons = OrderData::closeReasons();
+        $result['cancelReason'] = isset($resons['data']) ? $resons['data'] : '';
         return $result;
         return $result;
     }
     }