Merge branch 'feature/ordrEnsurOptmz' into release/5.3

@@ -833,8 +833,8 @@ class CartModel
                     }
                     }
 
 
                     $result['message'] =  array(
                     $result['message'] =  array(
-                        $orderSubRes['data']['hintInfo']['productName'] . $orderSubRes['data']['hintInfo']['suffix'],
-                        $orderSubRes['data']['hintInfo']['lastLine']
+                        urlencode($orderSubRes['data']['hintInfo']['productName'] . $orderSubRes['data']['hintInfo']['suffix']),
+                        urlencode($orderSubRes['data']['hintInfo']['lastLine'])
                     );
                     );
                 }
                 }
 
 

@@ -696,8 +696,15 @@ class IndexController extends AbstractAction
                 // 提交成功清除Cookie
                 // 提交成功清除Cookie
                 $this->setCookie('order-info', null);
                 $this->setCookie('order-info', null);
 
 
+                if ($result['code'] === 409) {
+                    headers_sent() || header('Content-Type: application/json; charset=utf-8;');
+                    $result = json_encode($result);
+                    echo urldecode($result);
+                    exit;
+                } else {
                     $this->echoJson($result);
                     $this->echoJson($result);
                 }
                 }
+            }
         } else {
         } else {
             echo ' ';
             echo ' ';
         }
         }