Merge branch 'hotfix/unionData' into release/5.4.1

@@ -1078,6 +1078,9 @@ class CartModel
                 }
                 /* 检查联盟参数是否有效 */
                 $unionInfo = empty($unionKey) ? array() : json_decode($unionKey, true);
+                if (empty($unionKey) && !empty($_COOKIE['union_data'])){
+                    $unionKey = $_COOKIE['union_data'];
+                }
                 /* 模拟APP的User-Agent */
                 $userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;
             }